Samples improvements #32

vtm-desktop/src/org/oscim/gdx/GdxMapImpl.java

@@ -1,22 +0,0 @@
-/*
- * Copyright 2017 devemux86
- *
- * 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.gdx;
-
-public class GdxMapImpl extends GdxMap {
-    @Override
-    public void dispose() {
-        System.exit(0);
-    }
-}

vtm-playground/src/org/oscim/stuff/MapzenTest.java

@@ -17,7 +17,6 @@
 package org.oscim.stuff;
 
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -26,7 +25,7 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-public class MapzenTest extends GdxMapImpl {
+public class MapzenTest extends GdxMapApp {
 
     @Override
     public void createLayers() {

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

@@ -21,14 +21,13 @@ import com.badlogic.gdx.Input;
 
 import org.oscim.core.BoundingBox;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
-public class AnimatorTest extends GdxMapImpl {
+public class AnimatorTest extends GdxMapApp {
 
     @Override
     public void createLayers() {

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

@@ -19,12 +19,11 @@ package org.oscim.test;
 import com.badlogic.gdx.Input;
 
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
-public class BitmapTileTest extends GdxMapImpl {
+public class BitmapTileTest extends GdxMapApp {
 
     private BitmapTileLayer mLayer = null;
     private BitmapTileLayer mShaded = null;

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

@@ -18,7 +18,6 @@ import org.oscim.backend.GLAdapter;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeometryBuffer;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
@@ -26,7 +25,7 @@ import org.oscim.renderer.MapRenderer;
 import org.oscim.renderer.bucket.CircleBucket;
 import org.oscim.theme.styles.CircleStyle;
 
-public class CircleTest extends GdxMapImpl {
+public class CircleTest extends GdxMapApp {
 
     private final GeometryBuffer geom = new GeometryBuffer(2, 1);
     private final Renderer renderer = new Renderer();
@@ -55,7 +54,7 @@ public class CircleTest extends GdxMapImpl {
     }
 
     @Override
-    protected void createLayers() {
+    public void createLayers() {
         MapRenderer.setBackgroundColor(Color.BLACK);
 
         mMap.setMapPosition(0, 0, 1 << 4);

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

@@ -19,7 +19,6 @@ package org.oscim.test;
 import com.badlogic.gdx.Input;
 
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.renderer.MapRenderer;
@@ -28,7 +27,7 @@ import org.oscim.theme.IRenderTheme.ThemeException;
 import org.oscim.theme.ThemeLoader;
 import org.oscim.tiling.source.mapfile.MapFileTileSource;
 
-public class ExternalRenderThemeTest extends GdxMapImpl {
+public class ExternalRenderThemeTest extends GdxMapApp {
 
     VectorTileLayer mapLayer;
 

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

@@ -28,7 +28,6 @@ import com.badlogic.gdx.utils.viewport.Viewport;
 import org.oscim.backend.GL;
 import org.oscim.core.Point;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.renderer.GLState;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.TileSource;
@@ -37,7 +36,7 @@ import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
 import static org.oscim.backend.GLAdapter.gl;
 
-public class GdxSpriteBatchTest extends GdxMapImpl {
+public class GdxSpriteBatchTest extends GdxMapApp {
     private double latitude = 47.1970869;
     private double longitude = 18.4398422;
     private double scale = 1 << 17;
@@ -49,7 +48,7 @@ public class GdxSpriteBatchTest extends GdxMapImpl {
     private Texture texture;
 
     @Override
-    protected void createLayers() {
+    public void createLayers() {
         TileSource tileSource = OSciMap4TileSource.builder()
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();

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

@@ -20,7 +20,6 @@ import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.core.GeometryBuffer;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
@@ -32,7 +31,7 @@ import org.oscim.theme.styles.AreaStyle;
 import org.oscim.theme.styles.LineStyle;
 import org.oscim.theme.styles.LineStyle.LineBuilder;
 
-public class HairLineTest extends GdxMapImpl {
+public class HairLineTest extends GdxMapApp {
 
     static GeometryBuffer createLine(float r) {
         GeometryBuffer in = new GeometryBuffer(100, 2);
@@ -117,7 +116,7 @@ public class HairLineTest extends GdxMapImpl {
     }
 
     @Override
-    protected void createLayers() {
+    public void createLayers() {
         MapRenderer.setBackgroundColor(Color.BLACK);
         mMap.layers().add(new GenericLayer(mMap, new Renderer()));
 

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

@@ -24,7 +24,6 @@ import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.core.GeometryBuffer;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
@@ -36,7 +35,7 @@ import org.oscim.theme.styles.LineStyle;
 
 import java.io.IOException;
 
-public class LineRenderTest extends GdxMapImpl {
+public class LineRenderTest extends GdxMapApp {
 
     GeometryBuffer mGeom = new GeometryBuffer(2, 1);
     GeometryBuffer mLine = new GeometryBuffer(2, 1);

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

@@ -6,7 +6,6 @@ import com.badlogic.gdx.Input;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeometryBuffer;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
@@ -14,7 +13,7 @@ import org.oscim.renderer.MapRenderer;
 import org.oscim.renderer.bucket.LineBucket;
 import org.oscim.theme.styles.LineStyle;
 
-public class LineTest extends GdxMapImpl {
+public class LineTest extends GdxMapApp {
 
     @Override
     protected boolean onKeyDown(int keycode) {
@@ -37,7 +36,7 @@ public class LineTest extends GdxMapImpl {
     float angle = 0;
 
     @Override
-    protected void createLayers() {
+    public void createLayers() {
         mMap.layers().add(new GenericLayer(mMap, new BucketRenderer() {
             boolean init;
 

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

@@ -17,7 +17,6 @@ package org.oscim.test;
 import org.oscim.core.MapPosition;
 import org.oscim.core.Tile;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -29,7 +28,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MapsforgeMultiTest extends GdxMapImpl {
+public class MapsforgeMultiTest extends GdxMapApp {
 
     private final List<File> mapFiles;
 

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

@@ -19,7 +19,6 @@ package org.oscim.test;
 import org.oscim.core.MapPosition;
 import org.oscim.core.Tile;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.buildings.S3DBLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -37,7 +36,7 @@ import org.oscim.tiling.source.mapfile.MapInfo;
 
 import java.io.File;
 
-public class MapsforgeTest extends GdxMapImpl {
+public class MapsforgeTest extends GdxMapApp {
 
     private File mapFile;
     private boolean s3db;

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

@@ -19,7 +19,6 @@ package org.oscim.test;
 import com.badlogic.gdx.Input;
 
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.theme.RenderTheme;
@@ -39,7 +38,7 @@ import org.slf4j.LoggerFactory;
 
 import static org.oscim.utils.ColorUtil.saturate;
 
-public class RuleVisitorTest extends GdxMapImpl {
+public class RuleVisitorTest extends GdxMapApp {
 
     final Logger log = LoggerFactory.getLogger(RuleVisitorTest.class);
     RenderTheme mTheme;

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

@@ -19,7 +19,6 @@ package org.oscim.test;
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.theme.RenderTheme;
@@ -27,7 +26,7 @@ import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-public class ThemeBuilderTest extends GdxMapImpl {
+public class ThemeBuilderTest extends GdxMapApp {
 
     static class MyTheme extends ThemeBuilder {
         public MyTheme() {

vtm-playground/src/org/oscim/test/gdx/poi3d/Gdx3DTest.java

@@ -17,7 +17,6 @@
 package org.oscim.test.gdx.poi3d;
 
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,7 +26,7 @@ import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-public class Gdx3DTest extends GdxMapImpl {
+public class Gdx3DTest extends GdxMapApp {
 
     @Override
     public void createLayers() {

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

@@ -21,7 +21,6 @@ import org.jeo.map.Style;
 import org.jeo.vector.VectorDataset;
 import org.oscim.backend.canvas.Color;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.JeoVectorLayer;
 import org.oscim.layers.OSMIndoorLayer;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
@@ -35,7 +34,7 @@ import java.net.URLConnection;
 
 import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
 
-public class LayerTest extends GdxMapImpl {
+public class LayerTest extends GdxMapApp {
 
     // from http://overpass-turbo.eu/s/2vp
     String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";

vtm-playground/src/org/oscim/test/renderer/AtlasTest.java

@@ -19,7 +19,6 @@ package org.oscim.test.renderer;
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
@@ -36,10 +35,10 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 
-public class AtlasTest extends GdxMapImpl {
+public class AtlasTest extends GdxMapApp {
 
     @Override
-    protected void createLayers() {
+    public void createLayers() {
         mMap.setMapPosition(0, 0, 1 << 4);
         mMap.layers().add(new GenericLayer(mMap, new AtlasRenderLayer()));
     }

vtm-playground/src/org/oscim/test/renderer/BezierTest.java

@@ -20,7 +20,6 @@ import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeometryBuffer;
 import org.oscim.core.Point;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
@@ -30,10 +29,10 @@ import org.oscim.utils.geom.BezierPath;
 
 import java.util.List;
 
-public class BezierTest extends GdxMapImpl {
+public class BezierTest extends GdxMapApp {
 
     @Override
-    protected void createLayers() {
+    public void createLayers() {
         mMap.layers().add(new GenericLayer(mMap, new BezierPathLayer()));
     }
 

vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java

@@ -19,7 +19,6 @@ package org.oscim.test.renderer;
 import org.oscim.backend.GL;
 import org.oscim.backend.canvas.Color;
 import org.oscim.gdx.GdxMapApp;
-import org.oscim.gdx.GdxMapImpl;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.BufferObject;
@@ -35,10 +34,10 @@ import java.nio.FloatBuffer;
 import static org.oscim.backend.GLAdapter.gl;
 import static org.oscim.renderer.MapRenderer.COORD_SCALE;
 
-public class HexagonRenderTest extends GdxMapImpl {
+public class HexagonRenderTest extends GdxMapApp {
 
     @Override
-    protected void createLayers() {
+    public void createLayers() {
         mMap.setMapPosition(0, 0, 1 << 4);
         mMap.layers().add(new GenericLayer(mMap, new HexagonRenderer()));
     }