From 9a6da018a97362f023f45d0c54f3cad4366050e3 Mon Sep 17 00:00:00 2001 From: Emux Date: Tue, 12 Dec 2017 10:56:29 +0200 Subject: [PATCH] Samples: use OkHttp engine, fix #454 --- .../test/AtlasMarkerOverlayActivity.java | 7 +++++- .../test/AtlasMultiTextureActivity.java | 7 +++++- .../oscim/android/test/BaseMapActivity.java | 5 ++++- .../test/ClusterMarkerOverlayActivity.java | 7 +++++- .../oscim/android/test/GdxMapActivity.java | 5 ++++- .../android/test/MarkerOverlayActivity.java | 7 +++++- .../oscim/android/test/MultiMapActivity.java | 12 ++++++++-- .../android/test/OSciMapS3DBMapActivity.java | 4 +++- .../src/org/oscim/stuff/MapzenTest.java | 4 +++- .../src/org/oscim/test/AnimatorTest.java | 22 ++++++++++++++++++- .../org/oscim/test/AtlasMarkerLayerTest.java | 7 +++++- .../org/oscim/test/AtlasMultiTextureTest.java | 7 +++++- .../oscim/test/ClusterMarkerLayerTest.java | 7 +++++- .../oscim/test/ExternalRenderThemeTest.java | 6 +++-- .../org/oscim/test/GdxSpriteBatchTest.java | 5 ++++- .../src/org/oscim/test/LineRenderTest.java | 4 +++- .../src/org/oscim/test/LineTexTest.java | 7 +++++- .../src/org/oscim/test/MapTest.java | 9 ++++++-- .../src/org/oscim/test/MarkerLayerTest.java | 7 +++++- .../src/org/oscim/test/OSciMapS3DBTest.java | 14 ++++++++---- .../src/org/oscim/test/PathLayerTest.java | 7 +++++- .../src/org/oscim/test/RuleVisitorTest.java | 7 ++++-- .../src/org/oscim/test/ThemeBuilderTest.java | 9 ++++++-- .../src/org/oscim/test/TileRenderTest.java | 5 ++++- .../src/org/oscim/test/VectorLayerTest.java | 7 +++++- .../org/oscim/test/gdx/poi3d/Gdx3DTest.java | 7 ++++-- .../src/org/oscim/test/jeo/ThemeTest.java | 5 ++++- 27 files changed, 164 insertions(+), 36 deletions(-) diff --git a/vtm-android-example/src/org/oscim/android/test/AtlasMarkerOverlayActivity.java b/vtm-android-example/src/org/oscim/android/test/AtlasMarkerOverlayActivity.java index 8257cc9f..db3f9b90 100644 --- a/vtm-android-example/src/org/oscim/android/test/AtlasMarkerOverlayActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/AtlasMarkerOverlayActivity.java @@ -30,6 +30,8 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.atlas.TextureAtlas; import org.oscim.renderer.atlas.TextureRegion; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.utils.TextureAtlasUtils; @@ -46,7 +48,10 @@ public class AtlasMarkerOverlayActivity extends MarkerOverlayActivity { // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-android-example/src/org/oscim/android/test/AtlasMultiTextureActivity.java b/vtm-android-example/src/org/oscim/android/test/AtlasMultiTextureActivity.java index 8247cad2..7f0740bb 100644 --- a/vtm-android-example/src/org/oscim/android/test/AtlasMultiTextureActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/AtlasMultiTextureActivity.java @@ -36,6 +36,8 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.atlas.TextureAtlas; import org.oscim.renderer.atlas.TextureRegion; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.utils.TextureAtlasUtils; @@ -50,7 +52,10 @@ public class AtlasMultiTextureActivity extends MarkerOverlayActivity { // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java index 0efc2636..b1ffc3cf 100644 --- a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java @@ -27,6 +27,7 @@ import org.oscim.layers.TileGridLayer; import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.theme.VtmThemes; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,9 @@ public class BaseMapActivity extends MapActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mTileSource = new OSciMap4TileSource(); + mTileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); if (USE_CACHE) { mCache = new TileCache(this, null, "tile.db"); diff --git a/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java b/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java index 22345629..b3855631 100644 --- a/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java @@ -29,6 +29,8 @@ import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import java.util.ArrayList; @@ -46,7 +48,10 @@ public class ClusterMarkerOverlayActivity extends MarkerOverlayActivity { // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-android-example/src/org/oscim/android/test/GdxMapActivity.java b/vtm-android-example/src/org/oscim/android/test/GdxMapActivity.java index ddc99f22..ba569a28 100644 --- a/vtm-android-example/src/org/oscim/android/test/GdxMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/GdxMapActivity.java @@ -32,6 +32,7 @@ import org.oscim.gdx.AndroidGL; import org.oscim.gdx.GdxAssets; import org.oscim.gdx.GdxMap; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class GdxMapActivity extends AndroidApplication { @@ -60,7 +61,9 @@ public class GdxMapActivity extends AndroidApplication { class GdxMapAndroid extends GdxMap { @Override public void createLayers() { - TileSource ts = new OSciMap4TileSource(); + TileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); initDefaultLayers(ts, true, true, true, getResources().getDisplayMetrics().density); } } diff --git a/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java b/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java index e095aab5..46c6a28e 100644 --- a/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java @@ -34,6 +34,8 @@ import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.map.Map; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import java.util.ArrayList; @@ -53,7 +55,10 @@ public class MarkerOverlayActivity extends SimpleMapActivity // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-android-example/src/org/oscim/android/test/MultiMapActivity.java b/vtm-android-example/src/org/oscim/android/test/MultiMapActivity.java index 816a2429..1d1028ea 100644 --- a/vtm-android-example/src/org/oscim/android/test/MultiMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MultiMapActivity.java @@ -27,6 +27,8 @@ import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.map.Map; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class MultiMapActivity extends Activity { @@ -43,7 +45,10 @@ public class MultiMapActivity extends Activity { mMapView1 = (MapView) findViewById(R.id.mapView1); Map map1 = mMapView1.map(); mPrefs1 = new MapPreferences(MultiMapActivity.class.getName() + "1", this); - VectorTileLayer baseLayer1 = map1.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource1 = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer baseLayer1 = map1.setBaseMap(tileSource1); map1.layers().add(new BuildingLayer(map1, baseLayer1)); map1.layers().add(new LabelLayer(map1, baseLayer1)); map1.setTheme(VtmThemes.DEFAULT); @@ -52,7 +57,10 @@ public class MultiMapActivity extends Activity { mMapView2 = (MapView) findViewById(R.id.mapView2); Map map2 = mMapView2.map(); mPrefs2 = new MapPreferences(MultiMapActivity.class.getName() + "2", this); - VectorTileLayer baseLayer2 = map2.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource2 = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer baseLayer2 = map2.setBaseMap(tileSource2); map2.layers().add(new BuildingLayer(map2, baseLayer2)); map2.layers().add(new LabelLayer(map2, baseLayer2)); map2.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-android-example/src/org/oscim/android/test/OSciMapS3DBMapActivity.java b/vtm-android-example/src/org/oscim/android/test/OSciMapS3DBMapActivity.java index a9b6717a..ff60edf6 100644 --- a/vtm-android-example/src/org/oscim/android/test/OSciMapS3DBMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/OSciMapS3DBMapActivity.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -24,6 +24,7 @@ import org.oscim.layers.tile.buildings.S3DBTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.theme.VtmThemes; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class OSciMapS3DBMapActivity extends BaseMapActivity { @@ -37,6 +38,7 @@ public class OSciMapS3DBMapActivity extends BaseMapActivity { mMap.setTheme(VtmThemes.DEFAULT); TileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) .url("http://opensciencemap.org/tiles/s3db") .zoomMin(16) .zoomMax(16) diff --git a/vtm-playground/src/org/oscim/stuff/MapzenTest.java b/vtm-playground/src/org/oscim/stuff/MapzenTest.java index 3ec53674..14adbd6c 100644 --- a/vtm-playground/src/org/oscim/stuff/MapzenTest.java +++ b/vtm-playground/src/org/oscim/stuff/MapzenTest.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,6 +22,7 @@ import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.vector.VectorTileLayer; 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.oscimap4.OSciMap4TileSource; @@ -30,6 +31,7 @@ public class MapzenTest extends GdxMapImpl { @Override public void createLayers() { UrlTileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) .url("https://vector.mapzen.com/osm/v0.8/all") .apiKey("vector-tiles-xxxxxxx") // Put a proper API key .build(); diff --git a/vtm-playground/src/org/oscim/test/AnimatorTest.java b/vtm-playground/src/org/oscim/test/AnimatorTest.java index 4d02eec3..b6a6999e 100644 --- a/vtm-playground/src/org/oscim/test/AnimatorTest.java +++ b/vtm-playground/src/org/oscim/test/AnimatorTest.java @@ -1,3 +1,20 @@ +/* + * Copyright 2014 Hannes Janetzek + * Copyright 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 . + */ package org.oscim.test; import com.badlogic.gdx.Input; @@ -7,6 +24,7 @@ import org.oscim.gdx.GdxMapApp; import org.oscim.gdx.GdxMapImpl; import org.oscim.renderer.MapRenderer; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class AnimatorTest extends GdxMapImpl { @@ -15,7 +33,9 @@ public class AnimatorTest extends GdxMapImpl { public void createLayers() { MapRenderer.setBackgroundColor(0xff000000); - TileSource ts = new OSciMap4TileSource(); + TileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); initDefaultLayers(ts, false, false, false); mMap.setMapPosition(0, 0, 1 << 4); diff --git a/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java b/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java index 27d06021..e6410afa 100644 --- a/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java +++ b/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java @@ -28,6 +28,8 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.atlas.TextureAtlas; import org.oscim.renderer.atlas.TextureRegion; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.utils.TextureAtlasUtils; @@ -46,7 +48,10 @@ public class AtlasMarkerLayerTest extends MarkerLayerTest { // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java b/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java index 0d056af4..29f9389a 100644 --- a/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java +++ b/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java @@ -31,6 +31,8 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.atlas.TextureAtlas; import org.oscim.renderer.atlas.TextureRegion; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.utils.TextureAtlasUtils; @@ -47,7 +49,10 @@ public class AtlasMultiTextureTest extends MarkerLayerTest { // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java b/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java index c9880f53..c6660cb0 100644 --- a/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java +++ b/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java @@ -31,6 +31,8 @@ import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import java.io.IOException; @@ -48,7 +50,10 @@ public class ClusterMarkerLayerTest extends MarkerLayerTest { // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java b/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java index f01f645c..28466b4a 100644 --- a/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java +++ b/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -62,7 +62,9 @@ public class ExternalRenderThemeTest extends GdxMapImpl { public void createLayers() { mMap.setMapPosition(53.08, 8.83, 1 << 14); - // TileSource tileSource = new OSciMap4TileSource(); + /*TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build();*/ MapFileTileSource tileSource = new MapFileTileSource(); // tileSource.setMapFile("/home/jeff/src/vtm/Freizeitkarte_DEU_NW.map"); diff --git a/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java b/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java index eced4eaf..00ca52ac 100644 --- a/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java +++ b/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java @@ -32,6 +32,7 @@ import org.oscim.gdx.GdxMapImpl; import org.oscim.renderer.GLState; import org.oscim.renderer.MapRenderer; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import static org.oscim.backend.GLAdapter.gl; @@ -49,7 +50,9 @@ public class GdxSpriteBatchTest extends GdxMapImpl { @Override protected void createLayers() { - TileSource tileSource = new OSciMap4TileSource(); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); initDefaultLayers(tileSource, false, true, false); mMap.setMapPosition(latitude, longitude, scale); diff --git a/vtm-playground/src/org/oscim/test/LineRenderTest.java b/vtm-playground/src/org/oscim/test/LineRenderTest.java index a6a2f6d3..1deb556a 100644 --- a/vtm-playground/src/org/oscim/test/LineRenderTest.java +++ b/vtm-playground/src/org/oscim/test/LineRenderTest.java @@ -48,7 +48,9 @@ public class LineRenderTest extends GdxMapImpl { public void createLayers() { MapRenderer.setBackgroundColor(0xff000000); - // TileSource ts = new OSciMap4TileSource(); + /*TileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build();*/ // ts.setOption("url", "http://opensciencemap.org/tiles/vtm"); // initDefaultLayers(ts, false, false, false); diff --git a/vtm-playground/src/org/oscim/test/LineTexTest.java b/vtm-playground/src/org/oscim/test/LineTexTest.java index e32d9b3a..a701f7f5 100644 --- a/vtm-playground/src/org/oscim/test/LineTexTest.java +++ b/vtm-playground/src/org/oscim/test/LineTexTest.java @@ -31,6 +31,8 @@ import org.oscim.layers.vector.geometries.Style; import org.oscim.map.Map; import org.oscim.renderer.bucket.TextureItem; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import java.io.IOException; @@ -46,7 +48,10 @@ public class LineTexTest extends GdxMapApp { @Override public void createLayers() { - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/MapTest.java b/vtm-playground/src/org/oscim/test/MapTest.java index 6f9ea943..03e53fb5 100644 --- a/vtm-playground/src/org/oscim/test/MapTest.java +++ b/vtm-playground/src/org/oscim/test/MapTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -30,6 +30,8 @@ import org.oscim.scalebar.MapScaleBar; import org.oscim.scalebar.MapScaleBarLayer; import org.oscim.scalebar.MetricUnitAdapter; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class MapTest extends GdxMapApp { @@ -38,7 +40,10 @@ public class MapTest extends GdxMapApp { public void createLayers() { Map map = getMap(); - VectorTileLayer l = map.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = map.setBaseMap(tileSource); GroupLayer groupLayer = new GroupLayer(mMap); groupLayer.layers.add(new BuildingLayer(map, l)); diff --git a/vtm-playground/src/org/oscim/test/MarkerLayerTest.java b/vtm-playground/src/org/oscim/test/MarkerLayerTest.java index 50eb796c..f9d54a4c 100644 --- a/vtm-playground/src/org/oscim/test/MarkerLayerTest.java +++ b/vtm-playground/src/org/oscim/test/MarkerLayerTest.java @@ -30,6 +30,8 @@ import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.map.Map; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import java.io.IOException; @@ -50,7 +52,10 @@ public class MarkerLayerTest extends GdxMapApp implements ItemizedLayer.OnItemGe // Map events receiver mMap.layers().add(new MapEventsReceiver(mMap)); - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java b/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java index 7baff5e5..7496e59f 100644 --- a/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java +++ b/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -20,18 +20,24 @@ import org.oscim.gdx.GdxMapApp; import org.oscim.layers.tile.buildings.S3DBTileLayer; import org.oscim.theme.VtmThemes; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class OSciMapS3DBTest extends GdxMapApp { @Override public void createLayers() { - mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + mMap.setBaseMap(tileSource); mMap.setTheme(VtmThemes.DEFAULT); - TileSource ts = OSciMap4TileSource - .builder() + TileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) .url("http://opensciencemap.org/tiles/s3db") + .zoomMin(16) + .zoomMax(16) .build(); S3DBTileLayer tl = new S3DBTileLayer(mMap, ts); diff --git a/vtm-playground/src/org/oscim/test/PathLayerTest.java b/vtm-playground/src/org/oscim/test/PathLayerTest.java index 513cd765..c6459312 100644 --- a/vtm-playground/src/org/oscim/test/PathLayerTest.java +++ b/vtm-playground/src/org/oscim/test/PathLayerTest.java @@ -29,6 +29,8 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.vector.PathLayer; import org.oscim.map.Map.UpdateListener; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import java.util.ArrayList; @@ -42,7 +44,10 @@ public class PathLayerTest extends GdxMapApp { @Override public void createLayers() { - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java index 0246681b..96695a23 100644 --- a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java +++ b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -32,6 +32,7 @@ import org.oscim.theme.styles.LineStyle; import org.oscim.theme.styles.LineStyle.LineBuilder; import org.oscim.theme.styles.RenderStyle; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,7 +72,9 @@ public class RuleVisitorTest extends GdxMapImpl { public void createLayers() { MapRenderer.setBackgroundColor(0xf0f0f0); - TileSource ts = new OSciMap4TileSource(); + TileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); VectorTileLayer l = mMap.setBaseMap(ts); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java b/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java index 4b67edab..f29c26e7 100644 --- a/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java +++ b/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -23,6 +23,8 @@ 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; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class ThemeBuilderTest extends GdxMapImpl { @@ -53,7 +55,10 @@ public class ThemeBuilderTest extends GdxMapImpl { @Override public void createLayers() { - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); RenderTheme t = new MyTheme().build(); diff --git a/vtm-playground/src/org/oscim/test/TileRenderTest.java b/vtm-playground/src/org/oscim/test/TileRenderTest.java index 6cd1b5e3..3edfe583 100644 --- a/vtm-playground/src/org/oscim/test/TileRenderTest.java +++ b/vtm-playground/src/org/oscim/test/TileRenderTest.java @@ -36,6 +36,7 @@ import org.oscim.renderer.MapRenderer; import org.oscim.theme.VtmThemes; import org.oscim.tiling.QueryResult; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class TileRenderTest extends GdxMapApp { @@ -92,7 +93,9 @@ public class TileRenderTest extends GdxMapApp { TestVectorTileLayer tileLayer = new TestVectorTileLayer(mMap, tileManager); tileLoader[0] = tileLayer.getTileLoader(); - TileSource tileSource = new OSciMap4TileSource(); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); //TileSource tileSource = new TestTileSource(); tileLayer.setTileSource(tileSource); diff --git a/vtm-playground/src/org/oscim/test/VectorLayerTest.java b/vtm-playground/src/org/oscim/test/VectorLayerTest.java index 5ebca531..4ab7a0fb 100644 --- a/vtm-playground/src/org/oscim/test/VectorLayerTest.java +++ b/vtm-playground/src/org/oscim/test/VectorLayerTest.java @@ -25,6 +25,8 @@ import org.oscim.layers.vector.VectorLayer; import org.oscim.layers.vector.geometries.PointDrawable; import org.oscim.layers.vector.geometries.Style; import org.oscim.theme.VtmThemes; +import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.utils.ColorUtil; @@ -32,7 +34,10 @@ public class VectorLayerTest extends GdxMapApp { @Override public void createLayers() { - VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource()); + TileSource tileSource = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); mMap.setTheme(VtmThemes.DEFAULT); diff --git a/vtm-playground/src/org/oscim/test/gdx/poi3d/Gdx3DTest.java b/vtm-playground/src/org/oscim/test/gdx/poi3d/Gdx3DTest.java index 9fb96e62..0b8f252d 100644 --- a/vtm-playground/src/org/oscim/test/gdx/poi3d/Gdx3DTest.java +++ b/vtm-playground/src/org/oscim/test/gdx/poi3d/Gdx3DTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 devemux86 + * Copyright 2016-2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -24,6 +24,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.MapRenderer; import org.oscim.theme.VtmThemes; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class Gdx3DTest extends GdxMapImpl { @@ -34,7 +35,9 @@ public class Gdx3DTest extends GdxMapImpl { mMap.setMapPosition(53.1, 8.8, 1 << 15); - TileSource ts = new OSciMap4TileSource(); + TileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); // initDefaultLayers(ts, false, false, false); VectorTileLayer mMapLayer = mMap.setBaseMap(ts); diff --git a/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java b/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java index 3778d730..7e40462a 100644 --- a/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java +++ b/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java @@ -20,6 +20,7 @@ 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; @@ -32,7 +33,9 @@ public class ThemeTest extends GdxMapApp { @Override public void createLayers() { - UrlTileSource ts = new OSciMap4TileSource(); + UrlTileSource ts = OSciMap4TileSource.builder() + .httpFactory(new OkHttpEngine.OkHttpFactory()) + .build(); VectorTileLayer l = mMap.setBaseMap(ts);