Mapzen MVT: refactor tile source #57

README.md

@@ -17,10 +17,10 @@ If you have any questions or problems, don't hesitate to ask our public [mailing
 - OpenGL vector-tile rendering
 - Themeable vector layers
 - Support for multiple tile sources:
-  - OpenScienceMap (.vtm)
+  - OpenScienceMap vector tiles
-  - Mapsforge (.map)
+  - Mapsforge vector maps
-  - Mapbox tiles (.mvt)
+  - Mapbox vector tiles
-  - GeoJSON tiles
+  - GeoJSON vector tiles
   - Raster tiles: any quadtree-scheme tiles as texture
 - Backends:
   - Android

docs/Changelog.md

@@ -26,7 +26,7 @@
 - Improved gestures implementation [#253](https://github.com/mapsforge/vtm/issues/253)
 - Polygon label position enhancements [#80](https://github.com/mapsforge/vtm/issues/80)
 - vtm-web modules update [#51](https://github.com/mapsforge/vtm/issues/51)
-- Mapbox (Mapzen) vector tiles [#57](https://github.com/mapsforge/vtm/issues/57)
+- Mapzen MVT vector tiles [#57](https://github.com/mapsforge/vtm/issues/57)
 - SVG resources scaling in themes [#214](https://github.com/mapsforge/vtm/issues/214)
 - Circle map style [#122](https://github.com/mapsforge/vtm/issues/122)
 - Oneway arrows in themes [#275](https://github.com/mapsforge/vtm/issues/275)

vtm-android-example/AndroidManifest.xml

@@ -53,9 +53,6 @@
         <activity
             android:name=".LocationActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-        <activity
-            android:name=".MapboxMapActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MapFragmentActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -71,6 +68,9 @@
         <activity
             android:name=".MapsforgeStyleActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".MapzenMvtMapActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MarkerOverlayActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />

vtm-android-example/src/org/oscim/android/test/MapzenMvtMapActivity.java

@@ -25,9 +25,9 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
-import org.oscim.tiling.source.mvt.MapboxTileSource;
+import org.oscim.tiling.source.mvt.MapzenMvtTileSource;
 
-public class MapboxMapActivity extends MapActivity {
+public class MapzenMvtMapActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 
@@ -37,7 +37,7 @@ public class MapboxMapActivity extends MapActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        UrlTileSource tileSource = MapboxTileSource.builder()
+        UrlTileSource tileSource = MapzenMvtTileSource.builder()
                 .apiKey("mapzen-xxxxxxx") // Put a proper API key
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 //.locale("en")

vtm-android-example/src/org/oscim/android/test/Samples.java

@@ -43,7 +43,7 @@ public class Samples extends Activity {
         LinearLayout linearLayout = findViewById(R.id.samples);
         linearLayout.addView(createButton(SimpleMapActivity.class));
         linearLayout.addView(createButton(MapsforgeMapActivity.class));
-        linearLayout.addView(createButton(MapboxMapActivity.class));
+        linearLayout.addView(createButton(MapzenMvtMapActivity.class));
 
         linearLayout.addView(createLabel("Vector Features"));
         linearLayout.addView(createButton(MapsforgeStyleActivity.class));

vtm-playground/src/org/oscim/test/MapzenMvtTest.java

@@ -21,7 +21,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
-import org.oscim.tiling.source.mvt.MapboxTileSource;
+import org.oscim.tiling.source.mvt.MapzenMvtTileSource;
 
 import java.io.File;
 import java.util.UUID;
@@ -29,7 +29,7 @@ import java.util.UUID;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
 
-public class MapboxTest extends GdxMapApp {
+public class MapzenMvtTest extends GdxMapApp {
 
     private static final boolean USE_CACHE = false;
 
@@ -45,7 +45,7 @@ public class MapboxTest extends GdxMapApp {
         }
         OkHttpEngine.OkHttpFactory factory = new OkHttpEngine.OkHttpFactory(builder);
 
-        UrlTileSource tileSource = MapboxTileSource.builder()
+        UrlTileSource tileSource = MapzenMvtTileSource.builder()
                 .apiKey("mapzen-xxxxxxx") // Put a proper API key
                 .httpFactory(factory)
                 //.locale("en")
@@ -60,6 +60,6 @@ public class MapboxTest extends GdxMapApp {
 
     public static void main(String[] args) {
         GdxMapApp.init();
-        GdxMapApp.run(new MapboxTest());
+        GdxMapApp.run(new MapzenMvtTest());
     }
 }

vtm/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.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).
  *
@@ -21,7 +21,7 @@ import org.oscim.tiling.ITileDataSource;
 import org.oscim.tiling.source.UrlTileDataSource;
 import org.oscim.tiling.source.UrlTileSource;
 
-public class MapboxTileSource extends UrlTileSource {
+public class MapzenMvtTileSource extends UrlTileSource {
 
     private final static String DEFAULT_URL = "https://tile.mapzen.com/mapzen/vector/v1/all";
     private final static String DEFAULT_PATH = "/{Z}/{X}/{Y}.mvt";
@@ -38,8 +38,8 @@ public class MapboxTileSource extends UrlTileSource {
             return self();
         }
 
-        public MapboxTileSource build() {
+        public MapzenMvtTileSource build() {
-            return new MapboxTileSource(this);
+            return new MapzenMvtTileSource(this);
         }
     }
 
@@ -50,16 +50,16 @@ public class MapboxTileSource extends UrlTileSource {
 
     private final String locale;
 
-    protected MapboxTileSource(Builder<?> builder) {
+    protected MapzenMvtTileSource(Builder<?> builder) {
         super(builder);
         this.locale = builder.locale;
     }
 
-    public MapboxTileSource() {
+    public MapzenMvtTileSource() {
         this(builder());
     }
 
-    public MapboxTileSource(String urlString) {
+    public MapzenMvtTileSource(String urlString) {
         this(builder().url(urlString));
     }