Update vtm-jeo module (#770)

2020-04-13 18:55:27 +02:00
parent 29634d29b5
commit 18ee0a393f
19 changed files with 829 additions and 427 deletions
--- a/vtm-playground/build.gradle
+++ b/vtm-playground/build.gradle
@@ -8,7 +8,7 @@ dependencies {
    implementation project(':vtm-extras')
    implementation project(':vtm-gdx-poi3d')
    implementation project(':vtm-http')
-    //implementation project(':vtm-jeo')
+    implementation project(':vtm-jeo')
    implementation project(':vtm-json')
    implementation project(':vtm-jts')
    implementation project(':vtm-models')
--- a/vtm-playground/src/org/oscim/test/jeo/LayerTest.java
+++ b/vtm-playground/src/org/oscim/test/jeo/LayerTest.java
@@ -1,92 +1,92 @@
-///*
-// * Copyright 2014 Hannes Janetzek
-// * 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.jeo.map.Style;
-//import org.jeo.vector.VectorDataset;
-//import org.oscim.backend.canvas.Color;
-//import org.oscim.gdx.GdxMapApp;
-//import org.oscim.layers.JeoVectorLayer;
-//import org.oscim.layers.OSMIndoorLayer;
-//import org.oscim.layers.tile.bitmap.BitmapTileLayer;
-//import org.oscim.test.JeoTest;
-//import org.oscim.theme.styles.TextStyle;
-//
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.net.URL;
-//import java.net.URLConnection;
-//
-//import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
-//
-//public class LayerTest extends GdxMapApp {
-//
-//    // from http://overpass-turbo.eu/s/2vp
-//    String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
-//
-//    private OSMIndoorLayer mIndoorLayer;
-//
-//    @Override
-//    public void createLayers() {
-//        mMap.setBaseMap(new BitmapTileLayer(mMap, STAMEN_TONER.build()));
-//
-//        mMap.addTask(new Runnable() {
-//            @Override
-//            public void run() {
-//                try {
-//                    URL url = new URL(PATH);
-//                    URLConnection conn = url.openConnection();
-//                    InputStream is = conn.getInputStream();
-//
-//                    VectorDataset data = JeoTest.readGeoJson(is);
-//                    Style style = JeoTest.getStyle();
-//                    TextStyle textStyle = TextStyle.builder()
-//                            .isCaption(true)
-//                            .fontSize(16).color(Color.BLACK)
-//                            .strokeWidth(2.2f).strokeColor(Color.WHITE)
-//                            .build();
-//                    mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
-//                    mIndoorLayer.activeLevels[0] = true;
-//                    mIndoorLayer.activeLevels[1] = true;
-//                    mIndoorLayer.activeLevels[2] = true;
-//                    mIndoorLayer.activeLevels[3] = true;
-//
-//                    mMap.layers().add(new JeoVectorLayer(mMap, data, style));
-//                    mMap.layers().add(mIndoorLayer);
-//
-//                    mMap.updateMap(true);
-//
-//                } catch (IOException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        });
-//
-//        mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
-//
-//        //VectorDataset data = (VectorDataset) JeoTest.getJsonData("states.json", true);
-//        //Style style = JeoTest.getStyle();
-//        //mMap.layers().add(new JeoVectorLayer(mMap, data, style));
-//
-//    }
-//
-//    public static void main(String[] args) {
-//        GdxMapApp.init();
-//        GdxMapApp.run(new LayerTest(), null, 256);
-//    }
-//}
+/*
+ * Copyright 2014 Hannes Janetzek
+ * 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 io.jeo.map.Style;
+import io.jeo.vector.VectorDataset;
+import org.oscim.backend.canvas.Color;
+import org.oscim.gdx.GdxMapApp;
+import org.oscim.layers.JeoVectorLayer;
+import org.oscim.layers.OSMIndoorLayer;
+import org.oscim.layers.tile.bitmap.BitmapTileLayer;
+import org.oscim.test.JeoTest;
+import org.oscim.theme.styles.TextStyle;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
+
+public class LayerTest extends GdxMapApp {
+
+    // from http://overpass-turbo.eu/s/2vp
+    String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
+
+    private OSMIndoorLayer mIndoorLayer;
+
+    @Override
+    public void createLayers() {
+        mMap.setBaseMap(new BitmapTileLayer(mMap, STAMEN_TONER.build()));
+
+        mMap.addTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    URL url = new URL(PATH);
+                    URLConnection conn = url.openConnection();
+                    InputStream is = conn.getInputStream();
+
+                    VectorDataset data = JeoTest.readGeoJson(is);
+                    Style style = JeoTest.getStyle();
+                    TextStyle textStyle = TextStyle.builder()
+                            .isCaption(true)
+                            .fontSize(16).color(Color.BLACK)
+                            .strokeWidth(2.2f).strokeColor(Color.WHITE)
+                            .build();
+                    mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
+                    mIndoorLayer.activeLevels[0] = true;
+                    mIndoorLayer.activeLevels[1] = true;
+                    mIndoorLayer.activeLevels[2] = true;
+                    mIndoorLayer.activeLevels[3] = true;
+
+                    mMap.layers().add(new JeoVectorLayer(mMap, data, style));
+                    mMap.layers().add(mIndoorLayer);
+
+                    mMap.updateMap(true);
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
+
+        //VectorDataset data = (VectorDataset) JeoTest.getJsonData("states.json", true);
+        //Style style = JeoTest.getStyle();
+        //mMap.layers().add(new JeoVectorLayer(mMap, data, style));
+
+    }
+
+    public static void main(String[] args) {
+        GdxMapApp.init();
+        GdxMapApp.run(new LayerTest(), null, 256);
+    }
+}
--- a/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
+++ b/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
@@ -1,50 +1,50 @@
-///*
-// * 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.tile.vector.VectorTileLayer;
-//import org.oscim.renderer.MapRenderer;
-//import org.oscim.theme.carto.RenderTheme;
-//import org.oscim.tiling.source.OkHttpEngine;
-//import org.oscim.tiling.source.UrlTileSource;
-//import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
-//
-//public class ThemeTest extends GdxMapApp {
-//
-//    public static void main(String[] args) {
-//        GdxMapApp.init();
-//        GdxMapApp.run(new ThemeTest(), null, 256);
-//    }
-//
-//    @Override
-//    public void createLayers() {
-//        UrlTileSource ts = OSciMap4TileSource.builder()
-//                .httpFactory(new OkHttpEngine.OkHttpFactory())
-//                .build();
-//
-//        VectorTileLayer l = mMap.setBaseMap(ts);
-//
-//        l.setRenderTheme(new RenderTheme());
-//
-//        MapRenderer.setBackgroundColor(0xffcccccc);
-//
-//        // mMap.getLayers().add(new LabelLayer(mMap,
-//        // mMapLayer.getTileLayer()));
-//        // mMap.getLayers().add(new JeoMapLayer(mMap));
-//    }
-//}
+/*
+ * 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.tile.vector.VectorTileLayer;
+import org.oscim.renderer.MapRenderer;
+import org.oscim.theme.carto.RenderTheme;
+import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
+import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
+
+public class ThemeTest extends GdxMapApp {
+
+    public static void main(String[] args) {
+        GdxMapApp.init();
+        GdxMapApp.run(new ThemeTest(), null, 256);
+    }
+
+    @Override
+    public void createLayers() {
+        UrlTileSource ts = OSciMap4TileSource.builder()
+                .httpFactory(new OkHttpEngine.OkHttpFactory())
+                .build();
+
+        VectorTileLayer l = mMap.setBaseMap(ts);
+
+        l.setRenderTheme(new RenderTheme());
+
+        MapRenderer.setBackgroundColor(0xffcccccc);
+
+        // mMap.getLayers().add(new LabelLayer(mMap,
+        // mMapLayer.getTileLayer()));
+        // mMap.getLayers().add(new JeoMapLayer(mMap));
+    }
+}