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

Scale factor for short vertices improvements, fix #537

Browse Source
This commit is contained in:
Emux
2018-05-11 13:14:43 +03:00
parent 34023cdc95
commit 12cb34146c
4 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
vtm-android/src/org/oscim/android/MapView.java
View File

@@ -19,7 +19,6 @@
package org.oscim.android;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.Point;
import android.opengl.GLSurfaceView;
@@ -66,6 +65,8 @@ public class MapView extends GLSurfaceView {
protected GestureDetector mGestureDetector;
protected AndroidMotionEvent mMotionEvent;
private final Point mScreenSize = new Point();
public MapView(Context context) {
this(context, null);
}
@@ -93,8 +94,20 @@ public class MapView extends GLSurfaceView {
CanvasAdapter.dpi = (int) (metrics.scaledDensity * CanvasAdapter.DEFAULT_DPI);
if (!Parameters.CUSTOM_TILE_SIZE)
Tile.SIZE = Tile.calculateTileSize();
if (!Parameters.CUSTOM_COORD_SCALE)
MapRenderer.COORD_SCALE = MapRenderer.calculateCoordScale();
WindowManager windowManager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
Display display = windowManager.getDefaultDisplay();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2)
display.getSize(mScreenSize);
else {
mScreenSize.x = display.getWidth();
mScreenSize.y = display.getHeight();
}
if (!Parameters.CUSTOM_COORD_SCALE) {
if (Math.min(mScreenSize.x, mScreenSize.y) > 1080)
MapRenderer.COORD_SCALE = 4.0f;
}
/* Initialize the Map */
mMap = new AndroidMap(this);
@@ -175,8 +188,6 @@ public class MapView extends GLSurfaceView {
private boolean mRenderWait;
private boolean mPausing;
private final Point mScreenSize = new Point();
public AndroidMap(MapView mapView) {
super();
mMapView = mapView;
@@ -195,25 +206,12 @@ public class MapView extends GLSurfaceView {
@Override
public int getScreenWidth() {
return getScreenSize().x;
return mMapView.mScreenSize.x;
}
@Override
public int getScreenHeight() {
return getScreenSize().y;
}
@SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
private Point getScreenSize() {
Display display = mWindowManager.getDefaultDisplay();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2)
display.getSize(mScreenSize);
else {
mScreenSize.x = display.getWidth();
mScreenSize.y = display.getHeight();
}
return mScreenSize;
return mMapView.mScreenSize.y;
}
private final Runnable mRedrawCb = new Runnable() {