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

CanvasAdapter: add getScale method #92

Browse Source
This commit is contained in:
Emux
2017-09-11 13:05:22 +03:00
parent 5c2b404b3f
commit f81dff2365
13 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vtm/src/org/oscim/backend/CanvasAdapter.java
View File

@@ -210,6 +210,10 @@ public abstract class CanvasAdapter {
return new File(parentPath, pathName);
}
public static float getScale() {
return CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI;
}
protected static void init(CanvasAdapter adapter) {
g = adapter;
}

2
vtm/src/org/oscim/layers/LocationLayer.java
View File

@@ -25,7 +25,7 @@ public class LocationLayer extends Layer {
public final LocationRenderer locationRenderer;
public LocationLayer(Map map) {
this(map, CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI);
this(map, CanvasAdapter.getScale());
}
public LocationLayer(Map map, float scale) {

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

@@ -34,7 +34,7 @@ public class ScreenUtils {
* @return Value in PX according to screen density
*/
public static int getPixels(float dp) {
return (int) (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI * dp);
return (int) (CanvasAdapter.getScale() * dp);
}
public static class ClusterDrawable {
@@ -66,7 +66,7 @@ public class ScreenUtils {
mPaintBorder.setColor(foregroundColor);
mPaintBorder.setStyle(Paint.Style.STROKE);
mPaintBorder.setStrokeWidth(2.0f * CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI);
mPaintBorder.setStrokeWidth(2.0f * CanvasAdapter.getScale());
}
private void setText(String text) {

2
vtm/src/org/oscim/renderer/LocationRenderer.java
View File

@@ -73,7 +73,7 @@ public class LocationRenderer extends LayerRenderer {
private int mShowAccuracyZoom = SHOW_ACCURACY_ZOOM;
public LocationRenderer(Map map, Layer layer) {
this(map, layer, CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI);
this(map, layer, CanvasAdapter.getScale());
}
public LocationRenderer(Map map, Layer layer, float scale) {

4
vtm/src/org/oscim/scalebar/DefaultMapScaleBar.java
View File

@@ -1,7 +1,7 @@
/*
* Copyright 2010, 2011, 2012, 2013 mapsforge.org
* Copyright 2014 Ludwig M Brinckmann
* Copyright 2014-2016 devemux86
* Copyright 2014-2017 devemux86
* Copyright 2014 Erik Duisters
* Copyright 2014 Christian Pesch
*
@@ -49,7 +49,7 @@ public class DefaultMapScaleBar extends MapScaleBar {
private final Paint paintScaleTextStroke;
public DefaultMapScaleBar(Map map) {
this(map, CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI);
this(map, CanvasAdapter.getScale());
}
public DefaultMapScaleBar(Map map, float scale) {

2
vtm/src/org/oscim/theme/ThemeLoader.java
View File

@@ -53,7 +53,7 @@ public class ThemeLoader {
else
t = USE_ATLAS ? XmlAtlasThemeBuilder.read(theme, themeCallback) : XmlThemeBuilder.read(theme, themeCallback);
if (t != null)
t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1));
t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.getScale() - 1));
return t;
}
}

4
vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java
View File

@@ -169,8 +169,8 @@ public class XmlMapsforgeThemeBuilder extends DefaultHandler {
public XmlMapsforgeThemeBuilder(ThemeFile theme, ThemeCallback themeCallback) {
mTheme = theme;
mThemeCallback = themeCallback;
mScale = CanvasAdapter.scale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1);
mScale2 = CanvasAdapter.scale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1) * 0.5f;
mScale = CanvasAdapter.scale + (CanvasAdapter.getScale() - 1);
mScale2 = CanvasAdapter.scale + (CanvasAdapter.getScale() - 1) * 0.5f;
}
@Override

4
vtm/src/org/oscim/theme/XmlThemeBuilder.java
View File

@@ -169,8 +169,8 @@ public class XmlThemeBuilder extends DefaultHandler {
public XmlThemeBuilder(ThemeFile theme, ThemeCallback themeCallback) {
mTheme = theme;
mThemeCallback = themeCallback;
mScale = CanvasAdapter.scale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1);
mScale2 = CanvasAdapter.scale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1) * 0.5f;
mScale = CanvasAdapter.scale + (CanvasAdapter.getScale() - 1);
mScale2 = CanvasAdapter.scale + (CanvasAdapter.getScale() - 1) * 0.5f;
}
@Override

2
vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
View File

@@ -415,7 +415,7 @@ public class MapDatabase implements ITileDataSource {
if (queryParameters.queryZoomLevel > MapFileTileSource.MAX_ZOOM_LEVEL)
buffer = Tile.SIZE / 2;
else
buffer = (int) (16 * CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI + 0.5f);
buffer = (int) (16 * CanvasAdapter.getScale() + 0.5f);
xmin = -buffer;
ymin = -buffer;