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

API: remove setBackgroundMap, add setBaseMap(TileLayer)

Browse Source
This commit is contained in:
Hannes Janetzek 2014-05-04 21:48:13 +02:00
parent c9bd08dcdf
commit 9bd327cbe6
7 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-android-app

@ -1 +1 @@
Subproject commit aa5794db31bf2fc774bc091191f12d1978793c01 Subproject commit 2a18af29d54dc057f050cb7ce6d8189deffec9e8

2
vtm-android-example/src/org/oscim/android/test/OsmJsonMapActivity.java
View File

@ -49,7 +49,7 @@ public class OsmJsonMapActivity extends MapActivity {
mTileSource = new OsmWaterJsonTileSource(); mTileSource = new OsmWaterJsonTileSource();
mMap.setBackgroundMap(new BitmapTileLayer(mMap, new StamenToner())); mMap.setBaseMap(new BitmapTileLayer(mMap, new StamenToner()));
mMap.layers().add(new TileGridLayer(mMap)); mMap.layers().add(new TileGridLayer(mMap));
IRenderTheme theme = ThemeLoader.load(VtmThemes.OSMARENDER); IRenderTheme theme = ThemeLoader.load(VtmThemes.OSMARENDER);

2
vtm-playground/src/org/oscim/test/MeshTest.java
View File

@ -16,7 +16,7 @@ public class MeshTest extends GdxMapApp {
//VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); //VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource());
//mMap.setTheme(VtmThemes.DEFAULT); //mMap.setTheme(VtmThemes.DEFAULT);
mMap.setBackgroundMap(new BitmapTileLayer(mMap, new DefaultSources.StamenToner())); mMap.setBaseMap(new BitmapTileLayer(mMap, new DefaultSources.StamenToner()));
TileSource ts = new OSciMap4TileSource("http://opensciencemap.org/tiles/s3db"); TileSource ts = new OSciMap4TileSource("http://opensciencemap.org/tiles/s3db");
S3DBLayer tl = new S3DBLayer(mMap, ts); S3DBLayer tl = new S3DBLayer(mMap, ts);

2
vtm-playground/src/org/oscim/test/TileRenderTest.java
View File

@ -115,7 +115,7 @@ public class TileRenderTest extends GdxMap {
} }
} }
mMap.setBackgroundMap(new BitmapTileLayer(mMap, new DefaultSources.StamenToner())); mMap.setBaseMap(new BitmapTileLayer(mMap, new DefaultSources.StamenToner()));
mMap.layers().add(l); mMap.layers().add(l);
} }

2
vtm-playground/src/org/oscim/test/jeo/LayerTest.java
View File

@ -24,7 +24,7 @@ public class LayerTest extends GdxMap {
@Override @Override
public void createLayers() { public void createLayers() {
mMap.setBackgroundMap(new BitmapTileLayer(mMap, new StamenToner())); mMap.setBaseMap(new BitmapTileLayer(mMap, new StamenToner()));
mMap.layers().add(new TileGridLayer(mMap)); mMap.layers().add(new TileGridLayer(mMap));
mMap.addTask(new Runnable() { mMap.addTask(new Runnable() {

2
vtm-web-app/src/org/oscim/web/client/GwtMap.java
View File

@ -102,7 +102,7 @@ class GwtMap extends GdxMap {
else else
ts = new StamenToner(); ts = new StamenToner();
mMap.setBackgroundMap(new BitmapTileLayer(mMap, ts)); mMap.setBaseMap(new BitmapTileLayer(mMap, ts));
} else { } else {
TileSource ts = new OSciMap4TileSource(); TileSource ts = new OSciMap4TileSource();
l = mMap.setBaseMap(ts); l = mMap.setBaseMap(ts);

45
vtm/src/org/oscim/map/Map.java
View File

@ -24,7 +24,7 @@ import org.oscim.event.Gesture;
import org.oscim.event.GestureDetector; import org.oscim.event.GestureDetector;
import org.oscim.event.MotionEvent; import org.oscim.event.MotionEvent;
import org.oscim.layers.MapEventLayer; import org.oscim.layers.MapEventLayer;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.TileLayer;
import org.oscim.layers.tile.vector.OsmTileLayer; import org.oscim.layers.tile.vector.OsmTileLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
@ -88,7 +88,7 @@ public abstract class Map implements TaskQueue {
* register when the layer is added to the map and unregistered when * register when the layer is added to the map and unregistered when
* the layer is removed. * the layer is removed.
*/ */
private VectorTileLayer mBaseLayer; private TileLayer mBaseLayer;
protected boolean mClearMap = true; protected boolean mClearMap = true;
@ -124,23 +124,23 @@ public abstract class Map implements TaskQueue {
return mEventLayer; return mEventLayer;
} }
/**
* Create OsmTileLayer with given TileSource and
* set as base map (layer 1)
*
* TODO deprecate
*/
public VectorTileLayer setBaseMap(TileSource tileSource) { public VectorTileLayer setBaseMap(TileSource tileSource) {
// TODO cleanup previous baseLayer here? VectorTileLayer l = new OsmTileLayer(this);
l.setTileSource(tileSource);
mBaseLayer = new OsmTileLayer(this); setBaseMap(l);
mBaseLayer.setTileSource(tileSource); return l;
mLayers.add(1, mBaseLayer);
return mBaseLayer;
} }
public void setBackgroundMap(BitmapTileLayer tileLayer) { public TileLayer setBaseMap(TileLayer tileLayer) {
mLayers.add(1, tileLayer); mLayers.add(1, tileLayer);
} mBaseLayer = tileLayer;
return tileLayer;
public VectorTileLayer setBaseMap(BitmapTileLayer tileLayer) {
mLayers.add(1, tileLayer);
return null;
} }
/** /**
@ -156,17 +156,16 @@ public abstract class Map implements TaskQueue {
} }
public void setTheme(IRenderTheme theme) { public void setTheme(IRenderTheme theme) {
if (mBaseLayer == null) {
log.error("No base layer set");
throw new IllegalStateException();
}
if (theme == null) { if (theme == null) {
log.error("Invalid theme"); throw new IllegalArgumentException("Theme cannot be null.");
return; }
if (mBaseLayer == null) {
log.warn("No base layer set.");
} else if (mBaseLayer instanceof VectorTileLayer) {
((VectorTileLayer) mBaseLayer).setRenderTheme(theme);
} }
mBaseLayer.setRenderTheme(theme);
MapRenderer.setBackgroundColor(theme.getMapBackground()); MapRenderer.setBackgroundColor(theme.getMapBackground());
clearMap(); clearMap();