From 380b5e019d389d6c671ec26a3145f2404b2bc05c Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Wed, 27 Jun 2012 00:13:21 +0200 Subject: [PATCH] fix segv when switching map mode --- src/org/mapsforge/android/MapView.java | 2 +- src/org/mapsforge/android/glrenderer/DatabaseRenderer.java | 6 +++--- src/org/mapsforge/tilemap/TileMap.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/mapsforge/android/MapView.java b/src/org/mapsforge/android/MapView.java index a04a0ff0..290b3576 100644 --- a/src/org/mapsforge/android/MapView.java +++ b/src/org/mapsforge/android/MapView.java @@ -420,7 +420,7 @@ public class MapView extends GLSurfaceView { return true; } mMapFile = null; - clearAndRedrawMapView(); + // clearAndRedrawMapView(); Log.d(TAG, "loading mapfile failed"); return false; } diff --git a/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java b/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java index 243386d9..c3bcf921 100644 --- a/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java +++ b/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java @@ -205,13 +205,13 @@ public class DatabaseRenderer implements MapGenerator, RenderCallback, boolean closed = (wayNodes[0] == wayNodes[len - 2] && wayNodes[1] == wayNodes[len - 1]); - mSimplify = 2.5f; + mSimplify = 0.5f; if (closed) { if (mCurrentTile.zoomLevel < 14) - mSimplify = 1.5f; - else mSimplify = 0.5f; + else + mSimplify = 0.2f; if (tags.length == 1 && "water".equals(tags[0].value)) mSimplify = 0; diff --git a/src/org/mapsforge/tilemap/TileMap.java b/src/org/mapsforge/tilemap/TileMap.java index e58ee17a..27124e25 100755 --- a/src/org/mapsforge/tilemap/TileMap.java +++ b/src/org/mapsforge/tilemap/TileMap.java @@ -610,7 +610,7 @@ public class TileMap extends MapActivity implements ActionBar.OnNavigationListen if (mMapView.getMapFile() == null) startMapFilePicker(); } else { - mMapView.setMapFile(null); + mMapView.setMapFile(mMapView.getMapFile()); } }