Samples improvements #32

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

@@ -22,7 +22,6 @@ import android.graphics.drawable.Drawable;
 
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.core.GeoPoint;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
@@ -95,7 +94,5 @@ public class AtlasMarkerOverlayActivity extends MarkerOverlayActivity {
         }
 
         mMarkerLayer.addItems(pts);
-
-        mMap.layers().add(new TileGridLayer(mMap, getResources().getDisplayMetrics().density));
     }
 }

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

@@ -26,7 +26,6 @@ import org.oscim.backend.canvas.Canvas;
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint;
 import org.oscim.core.GeoPoint;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
@@ -93,8 +92,6 @@ public class AtlasMultiTextureActivity extends MarkerOverlayActivity {
 
         mMarkerLayer.addItems(pts);
 
-        mMap.layers().add(new TileGridLayer(mMap, getResources().getDisplayMetrics().density));
-
         // set all markers
         for (MarkerItem item : pts) {
             MarkerSymbol markerSymbol = new MarkerSymbol(regionsMap.get(item.getTitle()), HotspotPlace.BOTTOM_CENTER);

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

@@ -16,7 +16,6 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-import android.view.Menu;
 
 import org.oscim.theme.ThemeLoader;
 
@@ -28,9 +27,4 @@ public class AtlasThemeMapActivity extends SimpleMapActivity {
 
         super.onCreate(savedInstanceState);
     }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        return false;
-    }
 }

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

@@ -18,7 +18,6 @@ package org.oscim.android.test;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeoPoint;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ClusterMarkerRenderer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
@@ -76,8 +75,6 @@ public class ClusterMarkerOverlayActivity extends MarkerOverlayActivity {
             }
         }
         mMarkerLayer.addItems(pts);
-
-        mMap.layers().add(new TileGridLayer(mMap, getResources().getDisplayMetrics().density));
     }
 
     @Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -83,7 +83,6 @@ public class JeoIndoorMapActivity extends BaseMapActivity {
         mMap.layers().add(new BuildingLayer(mMap, mBaseLayer));
         mMap.layers().add(new LabelLayer(mMap, mBaseLayer));
 
-        //    mMap.layers().add(new TileGridLayer(mMap));
         //    String file = Environment.getExternalStorageDirectory().getAbsolutePath();
         //    VectorDataset data = (VectorDataset) JeoTest.getJsonData(file + "/states.json", true);
         //    Style style = JeoTest.getStyle();
@@ -157,6 +156,7 @@ public class JeoIndoorMapActivity extends BaseMapActivity {
             i = 0;
 
         mIndoorLayer.activeLevels[i] ^= true;
+        if (v instanceof ToggleButton)
             ((ToggleButton) v).setChecked(mIndoorLayer.activeLevels[i]);
         log.debug(Arrays.toString(mIndoorLayer.activeLevels));
         mIndoorLayer.update();

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

@@ -26,7 +26,6 @@ import org.oscim.event.Gesture;
 import org.oscim.event.GestureListener;
 import org.oscim.event.MotionEvent;
 import org.oscim.layers.Layer;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
@@ -87,8 +86,6 @@ public class MarkerOverlayActivity extends SimpleMapActivity
         }
 
         mMarkerLayer.addItems(pts);
-
-        mMap.layers().add(new TileGridLayer(mMap, getResources().getDisplayMetrics().density));
     }
 
     @Override

vtm-android-example/src/org/oscim/android/test/OsmJsonMapActivity.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).
  *
@@ -19,7 +19,6 @@ package org.oscim.android.test;
 
 import android.os.Bundle;
 
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -65,8 +64,6 @@ public class OsmJsonMapActivity extends MapActivity {
         mMap.layers().add(l);
         mMap.layers().add(new LabelLayer(mMap, l));
 
-        mMap.layers().add(new TileGridLayer(mMap, getResources().getDisplayMetrics().density));
-
         mMap.setMapPosition(53.08, 8.83, Math.pow(2, 16));
     }
 }

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

@@ -20,7 +20,6 @@ package org.oscim.android.test;
 import android.os.Bundle;
 
 import org.oscim.backend.canvas.Color;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.vector.VectorLayer;
 import org.oscim.layers.vector.geometries.PointDrawable;
 import org.oscim.layers.vector.geometries.Style;
@@ -88,7 +87,6 @@ public class VectorLayerMapActivity extends SimpleMapActivity {
         vectorLayer.update();
 
         mMap.layers().add(vectorLayer);
-        mMap.layers().add(new TileGridLayer(mMap, 0xff222222, 1.2f, 1));
     }
 
     @Override

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

@@ -19,7 +19,6 @@ import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.core.GeoPoint;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
@@ -87,8 +86,6 @@ public class AtlasMarkerLayerTest extends MarkerLayerTest {
                 pts.add(new MarkerItem(lat + "/" + lon, "", new GeoPoint(lat, lon)));
         }
         mMarkerLayer.addItems(pts);
-
-        mMap.layers().add(new TileGridLayer(mMap));
     }
 
     public static void main(String[] args) {

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

@@ -22,7 +22,6 @@ import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint;
 import org.oscim.core.GeoPoint;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
@@ -91,8 +90,6 @@ public class AtlasMultiTextureTest extends MarkerLayerTest {
 
         mMarkerLayer.addItems(pts);
 
-        mMap.layers().add(new TileGridLayer(mMap));
-
         // set all markers
         for (MarkerItem item : pts) {
             MarkerSymbol markerSymbol = new MarkerSymbol(regionsMap.get(item.getTitle()), HotspotPlace.BOTTOM_CENTER);

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

@@ -20,7 +20,6 @@ import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeoPoint;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ClusterMarkerRenderer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
@@ -78,8 +77,6 @@ public class ClusterMarkerLayerTest extends MarkerLayerTest {
             }
         }
         mMarkerLayer.addItems(pts);
-
-        mMap.layers().add(new TileGridLayer(mMap));
     }
 
     public static void main(String[] args) {

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

@@ -22,7 +22,6 @@ import org.oscim.event.GestureListener;
 import org.oscim.event.MotionEvent;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.Layer;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
@@ -78,8 +77,6 @@ public class MarkerLayerTest extends GdxMapApp implements ItemizedLayer.OnItemGe
                 pts.add(new MarkerItem(lat + "/" + lon, "", new GeoPoint(lat, lon)));
         }
         mMarkerLayer.addItems(pts);
-
-        mMap.layers().add(new TileGridLayer(mMap));
     }
 
     @Override

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

@@ -18,7 +18,6 @@ package org.oscim.test;
 
 import org.oscim.backend.canvas.Color;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -90,7 +89,6 @@ public class VectorLayerTest extends GdxMapApp {
         vectorLayer.update();
 
         mMap.layers().add(vectorLayer);
-        mMap.layers().add(new TileGridLayer(mMap, 0xff222222, 1.2f, 1));
     }
 
     public static void main(String[] args) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -22,7 +22,6 @@ import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.JeoVectorLayer;
 import org.oscim.layers.OSMIndoorLayer;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.test.JeoTest;
 
@@ -35,14 +34,13 @@ import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
 
 public class LayerTest extends GdxMap {
 
-    String PATH = "https://gist.github.com/anonymous/8960337/raw/overpass.geojson";
+    private String PATH = "https://gist.github.com/anonymous/8960337/raw/overpass.geojson";
 
-    OSMIndoorLayer mIndoorLayer;
+    private OSMIndoorLayer mIndoorLayer;
 
     @Override
     public void createLayers() {
         mMap.setBaseMap(new BitmapTileLayer(mMap, STAMEN_TONER.build()));
-        mMap.layers().add(new TileGridLayer(mMap));
 
         mMap.addTask(new Runnable() {
             @Override

vtm-playground/src/org/oscim/test/jeo/ThemeTest.java

@@ -1,7 +1,22 @@
+/*
+ * Copyright 2016-2017 devemux86
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.oscim.test.jeo;
 
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.theme.carto.RenderTheme;
@@ -28,7 +43,5 @@ public class ThemeTest extends GdxMapApp {
         // mMap.getLayers().add(new LabelLayer(mMap,
         // mMapLayer.getTileLayer()));
         // mMap.getLayers().add(new JeoMapLayer(mMap));
-
-        mMap.layers().add(new TileGridLayer(mMap));
     }
 }