Samples improvements #32

docs/Changelog.md

@@ -3,8 +3,8 @@
 ## New since 0.9.2
 
 - S3DB layer [#475](https://github.com/mapsforge/vtm/pull/475)
-- vtm-mvt module with MVT tile decoder [#481](https://github.com/mapsforge/vtm/issues/481)
+- vtm-mvt module with MVT tile decoder [#481](https://github.com/mapsforge/vtm/pull/481)
-- OpenMapTiles MVT vector tiles [#481](https://github.com/mapsforge/vtm/issues/481)
+- OpenMapTiles MVT vector tiles [#481](https://github.com/mapsforge/vtm/pull/481)
 - OpenMapTiles GeoJSON vector tiles [#385](https://github.com/mapsforge/vtm/issues/385)
 - Render theme fallback internal resources [#477](https://github.com/mapsforge/vtm/issues/477)
 - Many other minor improvements and bug fixes

docs/Integration.md

@@ -93,7 +93,7 @@ implementation 'com.vividsolutions:jts:1.13'
 implementation 'com.wdtinc:mapbox-vector-tile:2.0.0'
 ```
 
-- GeoJSON tiles
+- GeoJSON vector tiles
 
 ```groovy
 implementation 'org.mapsforge:vtm-json:[CURRENT-VERSION]'

vtm-android-example/AndroidManifest.xml

@@ -31,16 +31,16 @@
             android:name=".AtlasThemeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".BitmapTileMapActivity"
+            android:name=".BitmapTileActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".ClusterMarkerOverlayActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".GdxMapActivity"
+            android:name=".GdxActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".JeoIndoorMapActivity"
+            android:name=".JeoIndoorActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".LayerGroupActivity"
@@ -52,13 +52,13 @@
             android:name=".LocationActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".MapsforgeMapActivity"
+            android:name=".MapsforgeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".MapsforgeMapActivity$MapFilePicker"
+            android:name=".MapsforgeActivity$MapFilePicker"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".MapsforgeMapActivity$ThemeFilePicker"
+            android:name=".MapsforgeActivity$ThemeFilePicker"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MapsforgePolyLabelActivity"
@@ -69,29 +69,29 @@
         <activity
             android:name=".MapsforgeStyleActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-        <!--<activity
+        <activity
-            android:name=".MapzenGeojsonMapActivity"
+            android:name=".MapzenGeojsonActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".MapzenMvtMapActivity"
+            android:name=".MapzenMvtActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize" />-->
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MarkerOverlayActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".MultiMapActivity"
+            android:name=".MultiMapViewActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".NewGesturesActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".OpenMapTilesGeojsonMapActivity"
+            android:name=".OpenMapTilesGeojsonActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".OpenMapTilesMvtMapActivity"
+            android:name=".OpenMapTilesMvtActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".OSciMapS3DBMapActivity"
+            android:name=".OSciMapS3DBActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".PathOverlayActivity"
@@ -118,7 +118,7 @@
             android:name=".ThemeStylerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".VectorLayerMapActivity"
+            android:name=".VectorLayerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
     </application>
 

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

@@ -27,20 +27,20 @@ import org.oscim.tiling.source.bitmap.DefaultSources;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BitmapTileMapActivity extends MapActivity {
+public class BitmapTileActivity extends MapActivity {
 
-    static final Logger log = LoggerFactory.getLogger(BitmapTileMapActivity.class);
+    static final Logger log = LoggerFactory.getLogger(BitmapTileActivity.class);
 
     private final static boolean USE_CACHE = false;
 
     private final BitmapTileSource mTileSource;
     protected BitmapTileLayer mBitmapLayer;
 
-    public BitmapTileMapActivity() {
+    public BitmapTileActivity() {
         this(DefaultSources.OPENSTREETMAP.build());
     }
 
-    public BitmapTileMapActivity(BitmapTileSource tileSource) {
+    public BitmapTileActivity(BitmapTileSource tileSource) {
         super(R.layout.activity_map);
         mTileSource = tileSource;
     }

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

@@ -35,7 +35,7 @@ import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-public class GdxMapActivity extends AndroidApplication {
+public class GdxActivity extends AndroidApplication {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

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

@@ -42,15 +42,15 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.Arrays;
 
-public class JeoIndoorMapActivity extends BaseMapActivity {
+public class JeoIndoorActivity extends BaseMapActivity {
-    public static final Logger log = LoggerFactory.getLogger(JeoIndoorMapActivity.class);
+    public static final Logger log = LoggerFactory.getLogger(JeoIndoorActivity.class);
 
     // from http://overpass-turbo.eu/s/2vp
     String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
 
     private OSMIndoorLayer mIndoorLayer;
 
-    public JeoIndoorMapActivity() {
+    public JeoIndoorActivity() {
         super(R.layout.jeo_indoor_map);
     }
 

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

@@ -53,7 +53,7 @@ import org.oscim.theme.styles.RenderStyle;
 import org.oscim.tiling.source.mapfile.MapFileTileSource;
 import org.oscim.tiling.source.mapfile.MapInfo;
 
-public class MapsforgeMapActivity extends MapActivity {
+public class MapsforgeActivity extends MapActivity {
 
     static final int SELECT_MAP_FILE = 0;
     static final int SELECT_THEME_FILE = SELECT_MAP_FILE + 1;
@@ -69,11 +69,11 @@ public class MapsforgeMapActivity extends MapActivity {
     private VectorTileLayer mTileLayer;
     MapFileTileSource mTileSource;
 
-    public MapsforgeMapActivity() {
+    public MapsforgeActivity() {
         this(false);
     }
 
-    public MapsforgeMapActivity(boolean s3db) {
+    public MapsforgeActivity(boolean s3db) {
         super();
         mS3db = s3db;
     }

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

@@ -18,7 +18,7 @@ import android.os.Bundle;
 
 import org.oscim.utils.Parameters;
 
-public class MapsforgePolyLabelActivity extends MapsforgeMapActivity {
+public class MapsforgePolyLabelActivity extends MapsforgeActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

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

@@ -14,7 +14,7 @@
  */
 package org.oscim.android.test;
 
-public class MapsforgeS3DBActivity extends MapsforgeMapActivity {
+public class MapsforgeS3DBActivity extends MapsforgeActivity {
 
     public MapsforgeS3DBActivity() {
         super(true);

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

@@ -28,7 +28,7 @@ import java.util.Set;
 /**
  * Load render theme from Android assets folder and show a configuration menu based on stylemenu.
  */
-public class MapsforgeStyleActivity extends MapsforgeMapActivity {
+public class MapsforgeStyleActivity extends MapsforgeActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

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

@@ -26,7 +26,7 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.geojson.MapzenGeojsonTileSource;
 
-public class MapzenGeojsonMapActivity extends MapActivity {
+public class MapzenGeojsonActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 

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

@@ -27,7 +27,7 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.mvt.MapzenMvtTileSource;
 
-public class MapzenMvtMapActivity extends MapActivity {
+public class MapzenMvtActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 

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

@@ -31,7 +31,7 @@ import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-public class MultiMapActivity extends Activity {
+public class MultiMapViewActivity extends Activity {
     private MapView mMapView1, mMapView2;
     private MapPreferences mPrefs1, mPrefs2;
 
@@ -44,7 +44,7 @@ public class MultiMapActivity extends Activity {
         // 1st map view
         mMapView1 = (MapView) findViewById(R.id.mapView1);
         Map map1 = mMapView1.map();
-        mPrefs1 = new MapPreferences(MultiMapActivity.class.getName() + "1", this);
+        mPrefs1 = new MapPreferences(MultiMapViewActivity.class.getName() + "1", this);
         TileSource tileSource1 = OSciMap4TileSource.builder()
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
@@ -56,7 +56,7 @@ public class MultiMapActivity extends Activity {
         // 2nd map view
         mMapView2 = (MapView) findViewById(R.id.mapView2);
         Map map2 = mMapView2.map();
-        mPrefs2 = new MapPreferences(MultiMapActivity.class.getName() + "2", this);
+        mPrefs2 = new MapPreferences(MultiMapViewActivity.class.getName() + "2", this);
         TileSource tileSource2 = OSciMap4TileSource.builder()
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();

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

@@ -27,7 +27,7 @@ import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-public class OSciMapS3DBMapActivity extends BaseMapActivity {
+public class OSciMapS3DBActivity extends BaseMapActivity {
 
     TileCache mS3dbCache;
 

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

@@ -26,7 +26,7 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.geojson.OpenMapTilesGeojsonTileSource;
 
-public class OpenMapTilesGeojsonMapActivity extends MapActivity {
+public class OpenMapTilesGeojsonActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 

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

@@ -26,7 +26,7 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.mvt.OpenMapTilesMvtTileSource;
 
-public class OpenMapTilesMvtMapActivity extends MapActivity {
+public class OpenMapTilesMvtActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 

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

@@ -54,13 +54,13 @@ import static org.oscim.android.canvas.AndroidGraphics.drawableToBitmap;
  * Long press on map to search inside visible bounding box.<br/>
  * Tap on POIs to show their name (in default locale).
  */
-public class PoiSearchActivity extends MapsforgeMapActivity implements ItemizedLayer.OnItemGestureListener<MarkerItem> {
+public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLayer.OnItemGestureListener<MarkerItem> {
 
     private static final Logger log = LoggerFactory.getLogger(PoiSearchActivity.class);
 
     private static String POI_FILE;
     private static final String POI_CATEGORY = "Restaurants";
-    private static final int SELECT_POI_FILE = MapsforgeMapActivity.SELECT_THEME_FILE + 1;
+    private static final int SELECT_POI_FILE = MapsforgeActivity.SELECT_THEME_FILE + 1;
 
     private ItemizedLayer<MarkerItem> mMarkerLayer;
 

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

@@ -46,7 +46,7 @@ import java.util.List;
  * - POI in specified radius.<br/>
  * - Ways containing touch point.
  */
-public class ReverseGeocodeActivity extends MapsforgeMapActivity {
+public class ReverseGeocodeActivity extends MapsforgeActivity {
 
     private static final int TOUCH_RADIUS = 32 / 2;
 

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

@@ -80,12 +80,12 @@ public class Samples extends Activity {
         setContentView(R.layout.activity_samples);
         LinearLayout linearLayout = findViewById(R.id.samples);
         linearLayout.addView(createButton(SimpleMapActivity.class));
-        linearLayout.addView(createButton(MapsforgeMapActivity.class));
+        linearLayout.addView(createButton(MapsforgeActivity.class));
-        /*linearLayout.addView(createButton(MapzenMvtMapActivity.class));
+        /*linearLayout.addView(createButton(MapzenMvtActivity.class));
-        linearLayout.addView(createButton(MapzenGeojsonMapActivity.class));*/
+        linearLayout.addView(createButton(MapzenGeojsonActivity.class));*/
-        linearLayout.addView(createButton(OpenMapTilesMvtMapActivity.class));
+        linearLayout.addView(createButton(OpenMapTilesMvtActivity.class));
-        linearLayout.addView(createButton(OpenMapTilesGeojsonMapActivity.class));
+        linearLayout.addView(createButton(OpenMapTilesGeojsonActivity.class));
-        linearLayout.addView(createButton(GdxMapActivity.class));
+        linearLayout.addView(createButton(GdxActivity.class));
 
         linearLayout.addView(createLabel("Features"));
         linearLayout.addView(createButton(null, "GraphHopper Routing", new View.OnClickListener() {
@@ -104,7 +104,7 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(POTTextureActivity.class));
 
         linearLayout.addView(createLabel("Raster Maps"));
-        linearLayout.addView(createButton(BitmapTileMapActivity.class));
+        linearLayout.addView(createButton(BitmapTileActivity.class));
 
         linearLayout.addView(createLabel("Overlays"));
         linearLayout.addView(createButton(MarkerOverlayActivity.class));
@@ -114,7 +114,7 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(ClusterMarkerOverlayActivity.class));
         linearLayout.addView(createButton(PathOverlayActivity.class));
         linearLayout.addView(createButton(LineTexActivity.class));
-        linearLayout.addView(createButton(VectorLayerMapActivity.class));
+        linearLayout.addView(createButton(VectorLayerActivity.class));
         linearLayout.addView(createButton(LocationActivity.class));
 
         linearLayout.addView(createLabel("User Interaction"));
@@ -122,12 +122,12 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(LayerGroupActivity.class));
 
         linearLayout.addView(createLabel("Dual Map Views"));
-        linearLayout.addView(createButton(MultiMapActivity.class));
+        linearLayout.addView(createButton(MultiMapViewActivity.class));
 
         linearLayout.addView(createLabel("Experiments"));
         linearLayout.addView(createButton(ReverseGeocodeActivity.class));
-        linearLayout.addView(createButton(OSciMapS3DBMapActivity.class));
+        linearLayout.addView(createButton(OSciMapS3DBActivity.class));
         linearLayout.addView(createButton(ThemeStylerActivity.class));
-        linearLayout.addView(createButton(JeoIndoorMapActivity.class));
+        linearLayout.addView(createButton(JeoIndoorActivity.class));
     }
 }

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

@@ -25,7 +25,7 @@ import org.oscim.layers.vector.geometries.PointDrawable;
 import org.oscim.layers.vector.geometries.Style;
 import org.oscim.utils.ColorUtil;
 
-public class VectorLayerMapActivity extends SimpleMapActivity {
+public class VectorLayerActivity extends SimpleMapActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

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

@@ -18,14 +18,14 @@ package org.oscim.test;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.utils.Parameters;
 
-public class AtlasThemeMapTest extends MapTest {
+public class AtlasThemeTest extends SimpleMapTest {
 
-    private AtlasThemeMapTest() {
+    private AtlasThemeTest() {
         Parameters.TEXTURE_ATLAS = true;
     }
 
     public static void main(String[] args) {
         GdxMapApp.init();
-        GdxMapApp.run(new AtlasThemeMapTest());
+        GdxMapApp.run(new AtlasThemeTest());
     }
 }

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

@@ -24,7 +24,7 @@ import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
-public class BitmapLayerTest extends GdxMapImpl {
+public class BitmapTileTest extends GdxMapImpl {
 
     private BitmapTileLayer mLayer = null;
     private BitmapTileLayer mShaded = null;
@@ -73,6 +73,6 @@ public class BitmapLayerTest extends GdxMapImpl {
 
     public static void main(String[] args) {
         GdxMapApp.init();
-        GdxMapApp.run(new BitmapLayerTest(), null, 256);
+        GdxMapApp.run(new BitmapTileTest(), null, 256);
     }
 }

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

@@ -20,7 +20,7 @@ package org.oscim.test;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.utils.Parameters;
 
-public class POTTextureTest extends MapTest {
+public class POTTextureTest extends SimpleMapTest {
 
     private POTTextureTest() {
         Parameters.POT_TEXTURES = true;

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

@@ -34,7 +34,7 @@ import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-public class MapTest extends GdxMapApp {
+public class SimpleMapTest extends GdxMapApp {
 
     @Override
     public void createLayers() {
@@ -68,6 +68,6 @@ public class MapTest extends GdxMapApp {
 
     public static void main(String[] args) {
         GdxMapApp.init();
-        GdxMapApp.run(new MapTest());
+        GdxMapApp.run(new SimpleMapTest());
     }
 }