Samples: use vector map #32

2017-03-02 20:59:27 +02:00
parent ac0455b1b4
commit acb7727234
13 changed files with 104 additions and 84 deletions
--- a/vtm-android-example/src/org/oscim/android/test/AtlasMarkerOverlayActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/AtlasMarkerOverlayActivity.java
@@ -27,8 +27,13 @@ import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
+import org.oscim.layers.tile.buildings.BuildingLayer;
+import org.oscim.layers.tile.vector.VectorTileLayer;
+import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.renderer.atlas.TextureAtlas;
 import org.oscim.renderer.atlas.TextureRegion;
+import org.oscim.theme.VtmThemes;
+import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 import org.oscim.utils.TextureAtlasUtils;

 import java.util.ArrayList;
@@ -41,11 +46,14 @@ public class AtlasMarkerOverlayActivity extends MarkerOverlayActivity {

    @Override
    void createLayers() {
-        mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);
-
        // Map events receiver
        mMap.layers().add(new MapEventsReceiver(mMap));

+        VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource());
+        mMap.layers().add(new BuildingLayer(mMap, l));
+        mMap.layers().add(new LabelLayer(mMap, l));
+        mMap.setTheme(VtmThemes.DEFAULT);
+
        /* directly load bitmap from resources */
        Bitmap bitmapPoi = drawableToBitmap(getResources(), R.drawable.marker_poi);

--- a/vtm-android-example/src/org/oscim/android/test/AtlasMultiTextureActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/AtlasMultiTextureActivity.java
@@ -32,8 +32,13 @@ import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
+import org.oscim.layers.tile.buildings.BuildingLayer;
+import org.oscim.layers.tile.vector.VectorTileLayer;
+import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.renderer.atlas.TextureAtlas;
 import org.oscim.renderer.atlas.TextureRegion;
+import org.oscim.theme.VtmThemes;
+import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 import org.oscim.utils.TextureAtlasUtils;

 import java.util.ArrayList;
@@ -48,11 +53,14 @@ public class AtlasMultiTextureActivity extends MarkerOverlayActivity {

    @Override
    void createLayers() {
-        mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);
-
        // Map events receiver
        mMap.layers().add(new MapEventsReceiver(mMap));

+        VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource());
+        mMap.layers().add(new BuildingLayer(mMap, l));
+        mMap.layers().add(new LabelLayer(mMap, l));
+        mMap.setTheme(VtmThemes.DEFAULT);
+
        /* directly load bitmap from resources */
        Bitmap bitmapPoi = drawableToBitmap(getResources(), R.drawable.marker_poi);

--- a/vtm-android-example/src/org/oscim/android/test/LineTexActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/LineTexActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright 2014 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
 *
 * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
 *
@@ -31,26 +31,19 @@ import org.oscim.renderer.bucket.TextureItem;
 import java.util.ArrayList;
 import java.util.List;

-import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
-
 /**
 * This is a very INEFFICIENT and somewhat less useful example for how to use
 * PathLayers!
 */
-public class LineTexActivity extends BitmapTileMapActivity {
+public class LineTexActivity extends SimpleMapActivity {

    private static final boolean ANIMATION = false;

    private List<PathLayer> mPathLayers = new ArrayList<>();

-    public LineTexActivity() {
-        super(STAMEN_TONER.build());
-    }
-
    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);

        TextureItem tex = new TextureItem(CanvasAdapter.getBitmapAsset("", "patterns/pike.png"));
        tex.mipmap = true;
--- a/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java
@@ -18,7 +18,6 @@
 package org.oscim.android.test;

 import android.graphics.drawable.Drawable;
-import android.os.Bundle;
 import android.widget.Toast;

 import org.oscim.backend.canvas.Bitmap;
@@ -32,38 +31,35 @@ import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
+import org.oscim.layers.tile.buildings.BuildingLayer;
+import org.oscim.layers.tile.vector.VectorTileLayer;
+import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.map.Map;
+import org.oscim.theme.VtmThemes;
+import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;

 import java.util.ArrayList;
 import java.util.List;

 import static org.oscim.android.canvas.AndroidGraphics.drawableToBitmap;
-import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;

-public class MarkerOverlayActivity extends BitmapTileMapActivity
+public class MarkerOverlayActivity extends SimpleMapActivity
        implements ItemizedLayer.OnItemGestureListener<MarkerItem> {

    static final boolean BILLBOARDS = true;
    MarkerSymbol mFocusMarker;
    ItemizedLayer<MarkerItem> mMarkerLayer;

-    public MarkerOverlayActivity() {
-        super(STAMEN_TONER.build());
-    }
-
    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        createLayers();
-    }
-
    void createLayers() {
-        mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);
-
        // Map events receiver
        mMap.layers().add(new MapEventsReceiver(mMap));

+        VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource());
+        mMap.layers().add(new BuildingLayer(mMap, l));
+        mMap.layers().add(new LabelLayer(mMap, l));
+        mMap.setTheme(VtmThemes.DEFAULT);
+
        /* directly load bitmap from resources */
        Bitmap bitmap = drawableToBitmap(getResources(), R.drawable.marker_poi);

--- a/vtm-android-example/src/org/oscim/android/test/PathOverlayActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/PathOverlayActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright 2014 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
 *
 * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
 *
@@ -28,26 +28,19 @@ import org.oscim.map.Map.UpdateListener;
 import java.util.ArrayList;
 import java.util.List;

-import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
-
 /**
 * This is a very INEFFICIENT and somewhat less useful example for how to use
 * PathLayers!
 */
-public class PathOverlayActivity extends BitmapTileMapActivity {
+public class PathOverlayActivity extends SimpleMapActivity {

    private static final boolean ANIMATION = true;

    private List<PathLayer> mPathLayers = new ArrayList<>();

-    public PathOverlayActivity() {
-        super(STAMEN_TONER.build());
-    }
-
    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);

        for (double lat = -90; lat <= 90; lat += 5) {
            int c = Color.fade(Color.rainbow((float) (lat + 90) / 180), 0.5f);
--- a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright 2013 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
 *
 * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
 *
@@ -42,6 +42,10 @@ public class SimpleMapActivity extends BaseMapActivity {
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

+        createLayers();
+    }
+
+    void createLayers() {
        GroupLayer groupLayer = new GroupLayer(mMap);
        groupLayer.layers.add(new BuildingLayer(mMap, mBaseLayer));
        groupLayer.layers.add(new LabelLayer(mMap, mBaseLayer));
@@ -64,7 +68,8 @@ public class SimpleMapActivity extends BaseMapActivity {

    @Override
    protected void onDestroy() {
-        mapScaleBar.destroy();
+        if (mapScaleBar != null)
+            mapScaleBar.destroy();

        super.onDestroy();
    }
--- a/vtm-android-example/src/org/oscim/android/test/VectorLayerMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/VectorLayerMapActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright 2013 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
 *
 * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
 *
@@ -26,18 +26,11 @@ import org.oscim.layers.vector.geometries.PointDrawable;
 import org.oscim.layers.vector.geometries.Style;
 import org.oscim.utils.ColorUtil;

-import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
-
-public class VectorLayerMapActivity extends BitmapTileMapActivity {
-
-    public VectorLayerMapActivity() {
-        super(STAMEN_TONER.build());
-    }
+public class VectorLayerMapActivity extends SimpleMapActivity {

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);

        VectorLayer vectorLayer = new VectorLayer(mMap);