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

refactor: rename RenderOverlay classes

Browse Source
This commit is contained in:
Hannes Janetzek
2012-12-30 22:30:51 +01:00
parent 6c28a63cc1
commit f761be1999
7 changed files with 231 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/oscim/view/MapView.java
View File

@@ -37,6 +37,7 @@ import org.oscim.database.OpenResult;
import org.oscim.generator.JobQueue;
import org.oscim.generator.JobTile;
import org.oscim.generator.MapWorker;
import org.oscim.overlay.GenericOverlay;
import org.oscim.overlay.LabelingOverlay;
import org.oscim.overlay.Overlay;
import org.oscim.overlay.OverlayManager;
@@ -44,6 +45,7 @@ import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.GLView;
import org.oscim.renderer.TileGenerator;
import org.oscim.renderer.TileManager;
import org.oscim.renderer.overlays.ModelOverlay;
import org.oscim.theme.ExternalRenderTheme;
import org.oscim.theme.InternalRenderTheme;
import org.oscim.theme.RenderTheme;
@@ -183,9 +185,10 @@ public class MapView extends RelativeLayout {
enableRotation = true;
mOverlayManager.add(new LabelingOverlay(this));
//mOverlayManager.add(new GenericOverlay(this, new OverlayGrid(this)));
//mOverlayManager.add(new GenericOverlay(this, new GridOverlay(this)));
mOverlayManager.add(new GenericOverlay(this, new ModelOverlay(this)));
// mOverlayManager.add(new GenericOverlay(this, new OverlayTest(this)));
// mOverlayManager.add(new GenericOverlay(this, new TestOverlay(this)));
// ArrayList<OverlayItem> pList = new ArrayList<OverlayItem>();
// pList.add(new OverlayItem("title", "description", new GeoPoint(53.067221, 8.78767)));
@@ -494,7 +497,9 @@ public class MapView extends RelativeLayout {
mapWorker.interrupt();
try {
mapWorker.join();
// FIXME this hangs badly sometimes,
// just let it crash...
mapWorker.join(10000);
} catch (InterruptedException e) {
// restore the interrupted status
Thread.currentThread().interrupt();