From c20922b5f55905170c1f123aaa8aafd4adad9b27 Mon Sep 17 00:00:00 2001 From: Emux Date: Tue, 1 Oct 2019 18:41:13 +0300 Subject: [PATCH] Tile decoders refactoring --- .../tiling/source/mbtiles/MBTilesMvtTileDataSource.java | 8 ++++---- .../oscim/tiling/source/overpass/OverpassTileSource.java | 2 +- .../{OverpassTileDecoder.java => TileDecoder.java} | 4 ++-- .../oscim/tiling/source/mvt/MapilionMvtTileSource.java | 2 +- .../org/oscim/tiling/source/mvt/MapzenMvtTileSource.java | 2 +- .../org/oscim/tiling/source/mvt/NextzenMvtTileSource.java | 2 +- .../tiling/source/mvt/OpenMapTilesMvtTileSource.java | 2 +- .../source/mvt/{MvtTileDecoder.java => TileDecoder.java} | 6 +++--- .../mvt/{MvtTileDecoderTest.java => TileDecoderTest.java} | 4 ++-- .../org/oscim/tiling/source/bitmap/BitmapTileSource.java | 4 ++-- .../oscim/tiling/source/{mvt => mapzen}/TileDecoder.java | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) rename vtm-extras/src/org/oscim/tiling/source/overpass/{OverpassTileDecoder.java => TileDecoder.java} (98%) rename vtm-mvt/src/org/oscim/tiling/source/mvt/{MvtTileDecoder.java => TileDecoder.java} (98%) rename vtm-tests/test/org/oscim/tiling/source/mvt/{MvtTileDecoderTest.java => TileDecoderTest.java} (95%) rename vtm/src/org/oscim/tiling/source/{mvt => mapzen}/TileDecoder.java (99%) diff --git a/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java b/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java index b6ed4f52..79cf6a86 100644 --- a/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java +++ b/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java @@ -22,7 +22,7 @@ import org.oscim.layers.tile.MapTile; import org.oscim.tiling.ITileDataSink; import org.oscim.tiling.OverzoomDataSink; import org.oscim.tiling.QueryResult; -import org.oscim.tiling.source.mvt.MvtTileDecoder; +import org.oscim.tiling.source.mvt.TileDecoder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,10 +45,10 @@ public class MBTilesMvtTileDataSource extends MBTilesTileDataSource { private final String mLanguage; - private final ThreadLocal mThreadLocalDecoders = new ThreadLocal() { + private final ThreadLocal mThreadLocalDecoders = new ThreadLocal() { @Override - protected MvtTileDecoder initialValue() { - return new MvtTileDecoder(mLanguage); + protected TileDecoder initialValue() { + return new TileDecoder(mLanguage); } }; diff --git a/vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileSource.java b/vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileSource.java index dcc9fb9d..083b9b7b 100644 --- a/vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileSource.java +++ b/vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileSource.java @@ -78,6 +78,6 @@ public class OverpassTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new OverzoomTileDataSource(new UrlTileDataSource(this, new OverpassTileDecoder(), getHttpEngine()), mOverZoom); + return new OverzoomTileDataSource(new UrlTileDataSource(this, new TileDecoder(), getHttpEngine()), mOverZoom); } } diff --git a/vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/overpass/TileDecoder.java similarity index 98% rename from vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileDecoder.java rename to vtm-extras/src/org/oscim/tiling/source/overpass/TileDecoder.java index 1baba026..93eed0a7 100644 --- a/vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileDecoder.java +++ b/vtm-extras/src/org/oscim/tiling/source/overpass/TileDecoder.java @@ -39,14 +39,14 @@ import java.io.InputStream; import static org.oscim.core.MercatorProjection.latitudeToY; import static org.oscim.core.MercatorProjection.longitudeToX; -public class OverpassTileDecoder implements ITileDecoder { +public class TileDecoder implements ITileDecoder { private final MapElement mMapElement; private ITileDataSink mTileDataSink; private double mTileY, mTileX, mTileScale; - public OverpassTileDecoder() { + public TileDecoder() { mMapElement = new MapElement(); mMapElement.layer = 5; } diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/MapilionMvtTileSource.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/MapilionMvtTileSource.java index 181d4f35..1ec9089b 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/MapilionMvtTileSource.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/MapilionMvtTileSource.java @@ -65,6 +65,6 @@ public class MapilionMvtTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new OverzoomTileDataSource(new UrlTileDataSource(this, new MvtTileDecoder(locale), getHttpEngine()), mOverZoom); + return new OverzoomTileDataSource(new UrlTileDataSource(this, new TileDecoder(locale), getHttpEngine()), mOverZoom); } } diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java index db6a83c4..1be451ea 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java @@ -69,6 +69,6 @@ public class MapzenMvtTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new OverzoomTileDataSource(new UrlTileDataSource(this, new MvtTileDecoder(locale), getHttpEngine()), mOverZoom); + return new OverzoomTileDataSource(new UrlTileDataSource(this, new TileDecoder(locale), getHttpEngine()), mOverZoom); } } diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java index d966e1ab..15476c81 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java @@ -66,6 +66,6 @@ public class NextzenMvtTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new OverzoomTileDataSource(new UrlTileDataSource(this, new MvtTileDecoder(locale), getHttpEngine()), mOverZoom); + return new OverzoomTileDataSource(new UrlTileDataSource(this, new TileDecoder(locale), getHttpEngine()), mOverZoom); } } diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java index c2221eb1..98cd76a5 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java @@ -69,6 +69,6 @@ public class OpenMapTilesMvtTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new OverzoomTileDataSource(new UrlTileDataSource(this, new MvtTileDecoder(locale), getHttpEngine()), mOverZoom); + return new OverzoomTileDataSource(new UrlTileDataSource(this, new TileDecoder(locale), getHttpEngine()), mOverZoom); } } diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/MvtTileDecoder.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java similarity index 98% rename from vtm-mvt/src/org/oscim/tiling/source/mvt/MvtTileDecoder.java rename to vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java index 69005781..cc40be22 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/MvtTileDecoder.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java @@ -42,7 +42,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; -public class MvtTileDecoder implements ITileDecoder { +public class TileDecoder implements ITileDecoder { private final String mLocale; private static final float REF_TILE_SIZE = 4096.0f; @@ -52,11 +52,11 @@ public class MvtTileDecoder implements ITileDecoder { private final MapElement mMapElement; private ITileDataSink mTileDataSink; - public MvtTileDecoder() { + public TileDecoder() { this(""); } - public MvtTileDecoder(String locale) { + public TileDecoder(String locale) { mLocale = locale; mGeomFactory = new GeometryFactory(); mMapElement = new MapElement(); diff --git a/vtm-tests/test/org/oscim/tiling/source/mvt/MvtTileDecoderTest.java b/vtm-tests/test/org/oscim/tiling/source/mvt/TileDecoderTest.java similarity index 95% rename from vtm-tests/test/org/oscim/tiling/source/mvt/MvtTileDecoderTest.java rename to vtm-tests/test/org/oscim/tiling/source/mvt/TileDecoderTest.java index 35146b8b..a4edfa85 100644 --- a/vtm-tests/test/org/oscim/tiling/source/mvt/MvtTileDecoderTest.java +++ b/vtm-tests/test/org/oscim/tiling/source/mvt/TileDecoderTest.java @@ -24,11 +24,11 @@ import org.oscim.tiling.QueryResult; import static org.junit.Assert.assertEquals; -public class MvtTileDecoderTest { +public class TileDecoderTest { @Test public void tileDecodingTest() throws Exception { - MvtTileDecoder decoder = new MvtTileDecoder(); + TileDecoder decoder = new TileDecoder(); Tile tile = new Tile(0, 0, (byte) 0); ITileDataSink sink = new ITileDataSink() { @Override diff --git a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java index 1a403d62..3039b79d 100644 --- a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java +++ b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java @@ -81,10 +81,10 @@ public class BitmapTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new UrlTileDataSource(this, new BitmapTileDecoder(), getHttpEngine()); + return new UrlTileDataSource(this, new TileDecoder(), getHttpEngine()); } - public class BitmapTileDecoder implements ITileDecoder { + public static class TileDecoder implements ITileDecoder { @Override public boolean decode(Tile tile, ITileDataSink sink, InputStream is) diff --git a/vtm/src/org/oscim/tiling/source/mvt/TileDecoder.java b/vtm/src/org/oscim/tiling/source/mapzen/TileDecoder.java similarity index 99% rename from vtm/src/org/oscim/tiling/source/mvt/TileDecoder.java rename to vtm/src/org/oscim/tiling/source/mapzen/TileDecoder.java index 1190aa42..2b25137c 100644 --- a/vtm/src/org/oscim/tiling/source/mvt/TileDecoder.java +++ b/vtm/src/org/oscim/tiling/source/mapzen/TileDecoder.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.tiling.source.mvt; +package org.oscim.tiling.source.mapzen; import org.oscim.core.GeometryBuffer.GeometryType; import org.oscim.core.MapElement;