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

refactor: rename LayerManager -> Layers

Browse Source
This commit is contained in:
Hannes Janetzek 2013-09-03 04:42:08 +02:00
parent 870363bf2f
commit 4bc048dba2
7 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtm-android-example/src/org/oscim/android/test/MapActivity.java
View File

@ -31,17 +31,17 @@ public class MapActivity extends org.oscim.android.MapActivity {
MapTileLayer l = mMap.setBaseMap(tileSource); MapTileLayer l = mMap.setBaseMap(tileSource);
//mMap.setDebugSettings(new DebugSettings(false, false, true, false, false)); //mMap.setDebugSettings(new DebugSettings(false, false, true, false, false));
mMap.getLayerManager().add(new BuildingOverlay(mMap, l.getTileLayer())); mMap.getLayers().add(new BuildingOverlay(mMap, l.getTileLayer()));
mMap.getLayerManager().add(new LabelLayer(mMap, l.getTileLayer())); mMap.getLayers().add(new LabelLayer(mMap, l.getTileLayer()));
mMap.setTheme(InternalRenderTheme.DEFAULT); mMap.setTheme(InternalRenderTheme.DEFAULT);
//mMap.setTheme(InternalRenderTheme.TRONRENDER); //mMap.setTheme(InternalRenderTheme.TRONRENDER);
//mMap.getLayerManager().add(new BitmapTileLayer(mMap, HillShadeTiles.INSTANCE)); //mMap.getLayers().add(new BitmapTileLayer(mMap, HillShadeTiles.INSTANCE));
//mMap.setBackgroundMap(new BitmapTileLayer(mMap, StamenWaterTiles.INSTANCE)); //mMap.setBackgroundMap(new BitmapTileLayer(mMap, StamenWaterTiles.INSTANCE));
//mMap.setBackgroundMap(new BitmapTileLayer(mMap, MapQuestAerial.INSTANCE)); //mMap.setBackgroundMap(new BitmapTileLayer(mMap, MapQuestAerial.INSTANCE));
//mMap.getLayerManager().add(new GenericOverlay(mMap, new GridRenderLayer(mMap))); //mMap.getLayers().add(new GenericOverlay(mMap, new GridRenderLayer(mMap)));
mMapView.setClickable(true); mMapView.setClickable(true);
mMapView.setFocusable(true); mMapView.setFocusable(true);

2
vtm-gdx-html/src/org/oscim/gdx/client/SearchBox.java
View File

@ -186,7 +186,7 @@ public class SearchBox {
final TextBox searchField = new TextBox(); final TextBox searchField = new TextBox();
//searchField.setText("Bremen"); //searchField.setText("Bremen");
final PathOverlay mOverlay = new PathOverlay(map, 0xCC0000FF); final PathOverlay mOverlay = new PathOverlay(map, 0xCC0000FF);
map.getLayerManager().add(mOverlay); map.getLayers().add(mOverlay);
// We can add style names to widgets // We can add style names to widgets
searchButton.addStyleName("sendButton"); searchButton.addStyleName("sendButton");

12
vtm-gdx/src/org/oscim/gdx/GdxMap.java
View File

@ -97,16 +97,16 @@ public class GdxMap implements ApplicationListener {
mMap.setTheme(InternalRenderTheme.DEFAULT); mMap.setTheme(InternalRenderTheme.DEFAULT);
if (buildings) if (buildings)
mMap.getLayerManager().add( mMap.getLayers().add(
new BuildingOverlay(mMap, mMapLayer.getTileLayer())); new BuildingOverlay(mMap, mMapLayer.getTileLayer()));
if (labels) if (labels)
mMap.getLayerManager().add(new LabelLayer(mMap, mMap.getLayers().add(new LabelLayer(mMap,
mMapLayer.getTileLayer())); mMapLayer.getTileLayer()));
} }
if (tileGrid) if (tileGrid)
mMap.getLayerManager().add(new GenericOverlay(mMap, mMap.getLayers().add(new GenericOverlay(mMap,
new GridRenderLayer())); new GridRenderLayer()));
} }
@ -278,14 +278,14 @@ public class GdxMap implements ApplicationListener {
if (mGridLayer == null) { if (mGridLayer == null) {
mGridLayer = new GenericOverlay(mMap, new GridRenderLayer()); mGridLayer = new GenericOverlay(mMap, new GridRenderLayer());
mGridLayer.setEnabled(true); mGridLayer.setEnabled(true);
mMap.getLayerManager().add(mGridLayer); mMap.getLayers().add(mGridLayer);
} else { } else {
if (mGridLayer.isEnabled()) { if (mGridLayer.isEnabled()) {
mGridLayer.setEnabled(false); mGridLayer.setEnabled(false);
mMap.getLayerManager().remove(mGridLayer); mMap.getLayers().remove(mGridLayer);
} else { } else {
mGridLayer.setEnabled(true); mGridLayer.setEnabled(true);
mMap.getLayerManager().add(mGridLayer); mMap.getLayers().add(mGridLayer);
} }
} }
mMap.render(); mMap.render();

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

@ -299,7 +299,7 @@ public class MapEventLayer extends InputLayer {
printState("onDoubleTap"); printState("onDoubleTap");
// avoid onLongPress // avoid onLongPress
mMap.getLayerManager().cancelGesture(); mMap.getLayers().cancelGesture();
return true; return true;
} }

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

@ -310,7 +310,7 @@ public class GLRenderer {
//GL.glBindTexture(GL20.GL_TEXTURE_2D, 0); //GL.glBindTexture(GL20.GL_TEXTURE_2D, 0);
/* update layers */ /* update layers */
RenderLayer[] layers = mMap.getLayerManager().getRenderLayers(); RenderLayer[] layers = mMap.getLayers().getRenderLayers();
for (int i = 0, n = layers.length; i < n; i++) for (int i = 0, n = layers.length; i < n; i++)
layers[i].update(pos, changed, mMatrices); layers[i].update(pos, changed, mMatrices);

6
vtm/src/org/oscim/view/LayerManager.java → vtm/src/org/oscim/view/Layers.java
View File

@ -29,13 +29,13 @@ import org.oscim.layers.Layer;
import org.oscim.layers.overlay.Overlay.Snappable; import org.oscim.layers.overlay.Overlay.Snappable;
import org.oscim.renderer.RenderLayer; import org.oscim.renderer.RenderLayer;
public class LayerManager extends AbstractList<Layer> { public class Layers extends AbstractList<Layer> {
private final static String TAG = LayerManager.class.getName(); private final static String TAG = Layers.class.getName();
private final static boolean debugInput = false; private final static boolean debugInput = false;
private final CopyOnWriteArrayList<Layer> mLayerList; private final CopyOnWriteArrayList<Layer> mLayerList;
LayerManager() { Layers() {
mLayerList = new CopyOnWriteArrayList<Layer>(); mLayerList = new CopyOnWriteArrayList<Layer>();
} }

39
vtm/src/org/oscim/view/Map.java
View File

@ -14,15 +14,11 @@
*/ */
package org.oscim.view; package org.oscim.view;
import java.util.List;
import org.oscim.backend.Log; import org.oscim.backend.Log;
import org.oscim.core.BoundingBox; import org.oscim.core.BoundingBox;
import org.oscim.core.GeoPoint; import org.oscim.core.GeoPoint;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.layers.Layer;
import org.oscim.layers.MapEventLayer; import org.oscim.layers.MapEventLayer;
import org.oscim.layers.overlay.Overlay;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.tile.vector.MapTileLayer; import org.oscim.layers.tile.vector.MapTileLayer;
import org.oscim.layers.tile.vector.MapTileLoader; import org.oscim.layers.tile.vector.MapTileLoader;
@ -37,8 +33,7 @@ public abstract class Map {
private static final String TAG = Map.class.getName(); private static final String TAG = Map.class.getName();
//public static boolean enableClosePolygons; private final Layers mLayers;
private final LayerManager mLayerManager;
private final Viewport mViewport; private final Viewport mViewport;
private final MapPosition mMapPosition; private final MapPosition mMapPosition;
private final AsyncExecutor mAsyncExecutor; private final AsyncExecutor mAsyncExecutor;
@ -55,7 +50,7 @@ public abstract class Map {
mViewport = new Viewport(this); mViewport = new Viewport(this);
mMapPosition = new MapPosition(); mMapPosition = new MapPosition();
mLayerManager = new LayerManager(); mLayers = new Layers();
mAsyncExecutor = new AsyncExecutor(2); mAsyncExecutor = new AsyncExecutor(2);
// FIXME! // FIXME!
@ -63,7 +58,7 @@ public abstract class Map {
MapTileLoader.setDebugSettings(mDebugSettings); MapTileLoader.setDebugSettings(mDebugSettings);
mEventLayer = new MapEventLayer(this); mEventLayer = new MapEventLayer(this);
mLayerManager.add(0, mEventLayer); mLayers.add(0, mEventLayer);
} }
public MapEventLayer getEventLayer() { public MapEventLayer getEventLayer() {
@ -74,17 +69,17 @@ public abstract class Map {
mBaseLayer = new MapTileLayer(this); mBaseLayer = new MapTileLayer(this);
mBaseLayer.setTileSource(tileSource); mBaseLayer.setTileSource(tileSource);
mLayerManager.add(1, mBaseLayer); mLayers.add(1, mBaseLayer);
return mBaseLayer; return mBaseLayer;
} }
public void setBackgroundMap(BitmapTileLayer tileLayer) { public void setBackgroundMap(BitmapTileLayer tileLayer) {
mLayerManager.add(1, tileLayer); mLayers.add(1, tileLayer);
} }
public MapTileLayer setBaseMap(BitmapTileLayer tileLayer) { public MapTileLayer setBaseMap(BitmapTileLayer tileLayer) {
mLayerManager.add(1, tileLayer); mLayers.add(1, tileLayer);
return null; return null;
} }
@ -114,7 +109,7 @@ public abstract class Map {
} }
public void destroy() { public void destroy() {
mLayerManager.destroy(); mLayers.destroy();
mAsyncExecutor.dispose(); mAsyncExecutor.dispose();
} }
@ -174,7 +169,7 @@ public abstract class Map {
// get the current MapPosition // get the current MapPosition
changed |= mViewport.getMapPosition(mMapPosition); changed |= mViewport.getMapPosition(mMapPosition);
mLayerManager.onUpdate(mMapPosition, changed, mClearMap); mLayers.onUpdate(mMapPosition, changed, mClearMap);
mClearMap = false; mClearMap = false;
} }
@ -207,26 +202,12 @@ public abstract class Map {
updateMap(true); updateMap(true);
} }
/**
* @return Viewport
*/
public Viewport getViewport() { public Viewport getViewport() {
return mViewport; return mViewport;
} }
/** public Layers getLayers() {
* You can add/remove/reorder your Overlays using the List of return mLayers;
* {@link Overlay}. The first (index 0) Overlay gets drawn first, the one
* with the highest as the last one.
*
* @return ...
*/
public List<Layer> getOverlays() {
return this.getLayerManager();
}
public LayerManager getLayerManager() {
return mLayerManager;
} }
/** /**