add TileSource.Builders

This commit is contained in:
Hannes Janetzek
2014-09-11 20:11:29 +02:00
parent 67336e0c93
commit a97b3283a0
18 changed files with 276 additions and 131 deletions

View File

@@ -14,6 +14,8 @@
*/
package org.oscim.android.test;
import static org.oscim.tiling.source.bitmap.DefaultSources.OPENSTREETMAP;
import org.oscim.android.MapActivity;
import org.oscim.android.MapView;
import org.oscim.android.cache.TileCache;
@@ -22,7 +24,6 @@ import org.oscim.layers.TileGridLayer;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.renderer.MapRenderer;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.bitmap.DefaultSources;
import android.os.Bundle;
@@ -33,7 +34,7 @@ public class BitmapTileMapActivity extends MapActivity {
protected BitmapTileLayer mBitmapLayer;
public BitmapTileMapActivity() {
mTileSource = new DefaultSources.OpenStreetMap();
mTileSource = OPENSTREETMAP.build();
}
public BitmapTileMapActivity(TileSource tileSource) {

View File

@@ -16,6 +16,8 @@
*/
package org.oscim.android.test;
import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
import java.util.ArrayList;
import java.util.List;
@@ -27,19 +29,18 @@ import org.oscim.layers.marker.ItemizedLayer.OnItemGestureListener;
import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerItem.HotspotPlace;
import org.oscim.layers.marker.MarkerSymbol;
import org.oscim.tiling.source.bitmap.DefaultSources;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.widget.Toast;
public class MarkerOverlayActivity extends BitmapTileMapActivity
implements OnItemGestureListener<MarkerItem> {
implements OnItemGestureListener<MarkerItem> {
private MarkerSymbol mFocusMarker;
public MarkerOverlayActivity() {
super(new DefaultSources.StamenToner());
super(STAMEN_TONER.build());
}
@Override
@@ -54,7 +55,7 @@ implements OnItemGestureListener<MarkerItem> {
ItemizedLayer<MarkerItem> markerLayer =
new ItemizedLayer<MarkerItem>(mMap, new ArrayList<MarkerItem>(),
symbol, this);
symbol, this);
mMap.layers().add(markerLayer);

View File

@@ -14,6 +14,8 @@
*/
package org.oscim.android.test;
import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
import org.oscim.android.MapActivity;
import org.oscim.android.MapView;
import org.oscim.layers.TileGridLayer;
@@ -25,7 +27,6 @@ import org.oscim.theme.IRenderTheme;
import org.oscim.theme.ThemeLoader;
import org.oscim.theme.VtmThemes;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.bitmap.DefaultSources.StamenToner;
import org.oscim.tiling.source.geojson.HighroadJsonTileSource;
import org.oscim.tiling.source.geojson.OsmBuildingJsonTileSource;
import org.oscim.tiling.source.geojson.OsmLanduseJsonTileSource;
@@ -49,7 +50,7 @@ public class OsmJsonMapActivity extends MapActivity {
mTileSource = new OsmWaterJsonTileSource();
mMap.setBaseMap(new BitmapTileLayer(mMap, new StamenToner()));
mMap.setBaseMap(new BitmapTileLayer(mMap, STAMEN_TONER.build()));
mMap.layers().add(new TileGridLayer(mMap));
IRenderTheme theme = ThemeLoader.load(VtmThemes.OSMARENDER);

View File

@@ -16,13 +16,14 @@
*/
package org.oscim.android.test;
import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
import java.util.ArrayList;
import java.util.List;
import org.oscim.backend.canvas.Color;
import org.oscim.core.GeoPoint;
import org.oscim.layers.PathLayer;
import org.oscim.tiling.source.bitmap.DefaultSources;
import android.os.Bundle;
import android.os.SystemClock;
@@ -30,7 +31,7 @@ import android.os.SystemClock;
public class PathOverlayActivity extends BitmapTileMapActivity {
public PathOverlayActivity() {
super(new DefaultSources.StamenToner());
super(STAMEN_TONER.build());
}
@Override
@@ -58,7 +59,8 @@ public class PathOverlayActivity extends BitmapTileMapActivity {
}
}, 50);
}
void redraw(){
void redraw() {
mMap.render();
}
@@ -71,7 +73,7 @@ public class PathOverlayActivity extends BitmapTileMapActivity {
for (double lat = -90; lat <= 90; lat += 5) {
List<GeoPoint> pts = new ArrayList<GeoPoint>();
for (double lon = -180; lon <= 180; lon += 2){
for (double lon = -180; lon <= 180; lon += 2) {
//pts.add(new GeoPoint(lat, lon));
double longitude = lon + (pos * 180);
if (longitude < -180)
@@ -79,8 +81,8 @@ public class PathOverlayActivity extends BitmapTileMapActivity {
if (longitude > 180)
longitude -= 360;
double latitude = lat + (pos * 90);
if (latitude< -90)
double latitude = lat + (pos * 90);
if (latitude < -90)
latitude += 180;
if (latitude > 90)
latitude -= 180;

View File

@@ -20,7 +20,11 @@ public class S3DBMapActivity extends BaseMapActivity {
mMap.setTheme(VtmThemes.DEFAULT);
TileSource ts = new OSciMap4TileSource("http://opensciencemap.org/tiles/s3db");
TileSource ts = OSciMap4TileSource.builder()
.url("http://opensciencemap.org/tiles/s3db")
.zoomMin(16)
.zoomMax(16)
.build();
if (USE_CACHE) {
mS3dbCache = new TileCache(this, null, "s3db.db");