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

fix segv when switching map mode

Browse Source
This commit is contained in:
Hannes Janetzek
2012-06-27 00:13:21 +02:00
parent 13e7a77531
commit 380b5e019d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/mapsforge/android/MapView.java
View File

@@ -420,7 +420,7 @@ public class MapView extends GLSurfaceView {
return true; return true;
} }
mMapFile = null; mMapFile = null;
clearAndRedrawMapView(); // clearAndRedrawMapView();
Log.d(TAG, "loading mapfile failed"); Log.d(TAG, "loading mapfile failed");
return false; return false;
} }

6
src/org/mapsforge/android/glrenderer/DatabaseRenderer.java
View File

@@ -205,13 +205,13 @@ public class DatabaseRenderer implements MapGenerator, RenderCallback,
boolean closed = (wayNodes[0] == wayNodes[len - 2] && boolean closed = (wayNodes[0] == wayNodes[len - 2] &&
wayNodes[1] == wayNodes[len - 1]); wayNodes[1] == wayNodes[len - 1]);
mSimplify = 2.5f; mSimplify = 0.5f;
if (closed) { if (closed) {
if (mCurrentTile.zoomLevel < 14) if (mCurrentTile.zoomLevel < 14)
mSimplify = 1.5f;
else
mSimplify = 0.5f; mSimplify = 0.5f;
else
mSimplify = 0.2f;
if (tags.length == 1 && "water".equals(tags[0].value)) if (tags.length == 1 && "water".equals(tags[0].value))
mSimplify = 0; mSimplify = 0;

2
src/org/mapsforge/tilemap/TileMap.java
View File

@@ -610,7 +610,7 @@ public class TileMap extends MapActivity implements ActionBar.OnNavigationListen
if (mMapView.getMapFile() == null) if (mMapView.getMapFile() == null)
startMapFilePicker(); startMapFilePicker();
} else { } else {
mMapView.setMapFile(null); mMapView.setMapFile(mMapView.getMapFile());
} }
} }