xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Marker clustering improvements #312

Browse Source
This commit is contained in:
Emux
2017-03-04 17:17:24 +02:00
parent 4b30ca3242
commit 28961caa79
4 changed files with 141 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vtm/src/org/oscim/layers/marker/utils/ScreenUtils.java
View File

@@ -1,5 +1,6 @@
/*
* Copyright 2017 nebular
* Copyright 2017 devemux86
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -25,11 +26,6 @@ import org.oscim.backend.canvas.Paint;
*/
public class ScreenUtils {
/**
* https://developer.android.com/reference/android/util/DisplayMetrics.html#DENSITY_DEFAULT
*/
private static final float REFERENCE_DPI = 160;
/**
* Get pixels from DPs
*
@@ -37,7 +33,7 @@ public class ScreenUtils {
* @return Value in PX according to screen density
*/
public static int getPixels(float dp) {
return (int) (CanvasAdapter.dpi / REFERENCE_DPI * dp);
return (int) (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI * dp);
}
public static class ClusterDrawable {
@@ -64,15 +60,12 @@ public class ScreenUtils {
mPaintText.setTextSize(ScreenUtils.getPixels((int) (sizedp * 0.6666666)));
mPaintText.setColor(foregroundColor);
// NOT SUPPORTED on current backends (Feb 2017)
// mPaintText.setTextAlign(Paint.Align.CENTER);
mPaintCircle.setColor(backgroundColor);
mPaintCircle.setStyle(Paint.Style.FILL);
mPaintBorder.setColor(foregroundColor);
mPaintBorder.setStyle(Paint.Style.STROKE);
mPaintBorder.setStrokeWidth(2.0f);
mPaintBorder.setStrokeWidth(2.0f * CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI);
}
private void setText(String text) {
@@ -86,8 +79,11 @@ public class ScreenUtils {
canvas.drawCircle(halfsize, halfsize, halfsize, mPaintCircle);
// fill
canvas.drawCircle(halfsize, halfsize, halfsize, mPaintBorder);
// draw the number, the centering is not perfect without a measureText or alignment
canvas.drawText(mText, halfsize * 0.6f, halfsize + (halfsize >> 1), mPaintText);
// draw the number at the center
canvas.drawText(mText,
(canvas.getWidth() - mPaintText.getTextWidth(mText)) * 0.5f,
(canvas.getHeight() + mPaintText.getTextHeight(mText)) * 0.5f,
mPaintText);
}
public Bitmap getBitmap() {