From 5a3eca0e8c2b6ece98e85979df83eddd5a7ca025 Mon Sep 17 00:00:00 2001 From: Emux Date: Wed, 12 Jun 2024 13:46:44 +0300 Subject: [PATCH] vtm-themes change package (#1131) --- docs/Changelog.md | 1 + .../src/org/oscim/android/test/BaseMapActivity.java | 2 +- .../src/org/oscim/android/test/GdxActivity.java | 4 +--- .../src/org/oscim/android/test/GettingStarted.java | 2 +- .../src/org/oscim/android/test/JeoIndoorActivity.java | 2 +- .../src/org/oscim/android/test/MBTilesMvtActivity.java | 2 +- .../src/org/oscim/android/test/MapFragment.java | 2 +- .../src/org/oscim/android/test/MapilionMvtActivity.java | 2 +- .../src/org/oscim/android/test/MapsforgeActivity.java | 6 +++++- .../org/oscim/android/test/MapzenGeojsonActivity.java | 2 +- .../src/org/oscim/android/test/MapzenMvtActivity.java | 2 +- .../org/oscim/android/test/NextzenGeojsonActivity.java | 2 +- .../src/org/oscim/android/test/NextzenMvtActivity.java | 2 +- .../org/oscim/android/test/OpenMapTilesMvtActivity.java | 2 +- .../src/org/oscim/android/test/OverpassActivity.java | 2 +- .../src/org/oscim/android/test/SimpleMapActivity.java | 9 ++------- .../src/org/oscim/android/test/ThemeStylerActivity.java | 3 +-- vtm-app/src/org/oscim/app/MapLayers.java | 2 +- vtm-gdx/src/org/oscim/gdx/GdxMap.java | 2 +- vtm-gdx/src/org/oscim/gdx/InputHandler.java | 2 +- .../src/org/oscim/ios/test/IOSLineTexBucketTest.java | 3 +-- vtm-ios-example/src/org/oscim/ios/test/IOSMapApp.java | 9 ++------- .../src/org/oscim/ios/test/IOSPathLayerTest.java | 2 +- vtm-playground/src/org/oscim/stuff/MapzenTest.java | 2 +- vtm-playground/src/org/oscim/test/ExtrusionsTest.java | 2 +- vtm-playground/src/org/oscim/test/GdxPoi3DTest.java | 2 +- vtm-playground/src/org/oscim/test/MapilionMvtTest.java | 2 +- vtm-playground/src/org/oscim/test/MapsforgeTest.java | 2 +- vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java | 2 +- vtm-playground/src/org/oscim/test/MapzenMvtTest.java | 2 +- .../src/org/oscim/test/NextzenGeojsonTest.java | 2 +- vtm-playground/src/org/oscim/test/NextzenMvtTest.java | 2 +- .../src/org/oscim/test/OpenMapTilesMvtTest.java | 2 +- vtm-playground/src/org/oscim/test/OverpassTest.java | 2 +- vtm-playground/src/org/oscim/test/RuleVisitorTest.java | 2 +- vtm-playground/src/org/oscim/test/SimpleMapTest.java | 2 +- vtm-playground/src/org/oscim/test/ThemeTest.java | 2 +- vtm-playground/src/org/oscim/test/TileRenderTest.java | 2 +- .../theme/comparator/vtm/MapApplicationAdapter.java | 9 ++------- .../src/org/oscim/theme/{ => internal}/VtmThemes.java | 5 ++++- vtm-web-app/src/org/oscim/web/client/GwtMap.java | 2 +- vtm-web-js/src/org/oscim/web/js/JsMap.java | 2 +- 42 files changed, 52 insertions(+), 63 deletions(-) rename vtm-themes/src/org/oscim/theme/{ => internal}/VtmThemes.java (93%) diff --git a/docs/Changelog.md b/docs/Changelog.md index 128089128..f1ea51682 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -2,6 +2,7 @@ ## New since 0.21.0 +- `vtm-themes` change package [#1130](https://github.com/mapsforge/vtm/issues/1130) - Minor improvements and bug fixes - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.22.0) 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 15db28ac9..c2aeaee5b 100644 --- a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java @@ -25,7 +25,7 @@ import org.oscim.core.MapPosition; import org.oscim.layers.TileGridLayer; import org.oscim.layers.tile.vector.VectorTileLayer; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/GdxActivity.java b/vtm-android-example/src/org/oscim/android/test/GdxActivity.java index 7f1927749..fa4924b90 100644 --- a/vtm-android-example/src/org/oscim/android/test/GdxActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/GdxActivity.java @@ -20,12 +20,10 @@ import android.os.Bundle; import android.util.DisplayMetrics; - import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; import com.badlogic.gdx.graphics.glutils.GLVersion; import com.badlogic.gdx.utils.SharedLibraryLoader; - import org.oscim.android.MapPreferences; import org.oscim.android.canvas.AndroidGraphics; import org.oscim.backend.CanvasAdapter; @@ -42,7 +40,7 @@ import org.oscim.layers.tile.buildings.S3DBLayer; import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/GettingStarted.java b/vtm-android-example/src/org/oscim/android/test/GettingStarted.java index c5ca55676..a172ca07a 100644 --- a/vtm-android-example/src/org/oscim/android/test/GettingStarted.java +++ b/vtm-android-example/src/org/oscim/android/test/GettingStarted.java @@ -29,7 +29,7 @@ import org.oscim.scalebar.MapScaleBar; import org.oscim.scalebar.MapScaleBarLayer; import org.oscim.theme.IRenderTheme; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.source.mapfile.MapFileTileSource; import java.io.FileInputStream; diff --git a/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java b/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java index 08225c4a5..61538119b 100644 --- a/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java @@ -30,7 +30,7 @@ //import org.oscim.layers.tile.buildings.BuildingLayer; //import org.oscim.layers.tile.vector.labeling.LabelLayer; //import org.oscim.test.JeoTest; -//import org.oscim.theme.VtmThemes; +//import org.oscim.theme.internal.VtmThemes; //import org.oscim.theme.styles.TextStyle; //import org.oscim.utils.IOUtils; //import org.slf4j.Logger; diff --git a/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java b/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java index 42c48e564..21cc71959 100644 --- a/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java @@ -28,7 +28,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.theme.internal.VtmThemes; import java.io.File; diff --git a/vtm-android-example/src/org/oscim/android/test/MapFragment.java b/vtm-android-example/src/org/oscim/android/test/MapFragment.java index f22c8f034..6bb617f89 100644 --- a/vtm-android-example/src/org/oscim/android/test/MapFragment.java +++ b/vtm-android-example/src/org/oscim/android/test/MapFragment.java @@ -25,7 +25,6 @@ import android.view.ViewGroup; import android.widget.RelativeLayout; import android.widget.Toast; - import org.oscim.android.MapView; import org.oscim.backend.CanvasAdapter; import org.oscim.core.MapPosition; @@ -38,6 +37,7 @@ import org.oscim.scalebar.MapScaleBar; import org.oscim.scalebar.MapScaleBarLayer; import org.oscim.theme.*; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.source.mapfile.MapFileTileSource; import org.oscim.tiling.source.mapfile.MapInfo; diff --git a/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java b/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java index 0970570f8..42c31509e 100644 --- a/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java @@ -24,7 +24,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.bitmap.DefaultSources; diff --git a/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java b/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java index 2761f10ca..acbf7987d 100644 --- a/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java @@ -47,7 +47,11 @@ import org.oscim.renderer.GLViewport; import org.oscim.renderer.bucket.RenderBuckets; import org.oscim.scalebar.*; -import org.oscim.theme.*; +import org.oscim.theme.IRenderTheme; +import org.oscim.theme.ThemeFile; +import org.oscim.theme.ZipRenderTheme; +import org.oscim.theme.ZipXmlThemeResourceProvider; +import org.oscim.theme.internal.VtmThemes; import org.oscim.theme.styles.AreaStyle; import org.oscim.theme.styles.RenderStyle; import org.oscim.tiling.source.mapfile.MapFileTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/MapzenGeojsonActivity.java b/vtm-android-example/src/org/oscim/android/test/MapzenGeojsonActivity.java index 62a09310b..716b1d86e 100644 --- a/vtm-android-example/src/org/oscim/android/test/MapzenGeojsonActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MapzenGeojsonActivity.java @@ -20,7 +20,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.geojson.MapzenGeojsonTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/MapzenMvtActivity.java b/vtm-android-example/src/org/oscim/android/test/MapzenMvtActivity.java index f0fd4ecc3..929ba57d0 100644 --- a/vtm-android-example/src/org/oscim/android/test/MapzenMvtActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MapzenMvtActivity.java @@ -21,7 +21,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.mvt.MapzenMvtTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/NextzenGeojsonActivity.java b/vtm-android-example/src/org/oscim/android/test/NextzenGeojsonActivity.java index cc8930f3c..58c5dec37 100644 --- a/vtm-android-example/src/org/oscim/android/test/NextzenGeojsonActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/NextzenGeojsonActivity.java @@ -20,7 +20,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.geojson.NextzenGeojsonTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/NextzenMvtActivity.java b/vtm-android-example/src/org/oscim/android/test/NextzenMvtActivity.java index 14080eb86..90966f303 100644 --- a/vtm-android-example/src/org/oscim/android/test/NextzenMvtActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/NextzenMvtActivity.java @@ -20,7 +20,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.mvt.NextzenMvtTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/OpenMapTilesMvtActivity.java b/vtm-android-example/src/org/oscim/android/test/OpenMapTilesMvtActivity.java index 9014082ab..818c849aa 100644 --- a/vtm-android-example/src/org/oscim/android/test/OpenMapTilesMvtActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/OpenMapTilesMvtActivity.java @@ -20,7 +20,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.mvt.OpenMapTilesMvtTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/OverpassActivity.java b/vtm-android-example/src/org/oscim/android/test/OverpassActivity.java index 865c3936f..9150ff7bf 100644 --- a/vtm-android-example/src/org/oscim/android/test/OverpassActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/OverpassActivity.java @@ -22,7 +22,7 @@ import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.map.Viewport; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java index f749a2512..80f193b7a 100644 --- a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java @@ -19,7 +19,6 @@ package org.oscim.android.test; import android.os.Bundle; - import org.oscim.backend.CanvasAdapter; import org.oscim.core.MapPosition; import org.oscim.core.MercatorProjection; @@ -28,14 +27,10 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.BitmapRenderer; import org.oscim.renderer.GLViewport; -import org.oscim.scalebar.DefaultMapScaleBar; -import org.oscim.scalebar.ImperialUnitAdapter; -import org.oscim.scalebar.MapScaleBar; -import org.oscim.scalebar.MapScaleBarLayer; -import org.oscim.scalebar.MetricUnitAdapter; +import org.oscim.scalebar.*; import org.oscim.theme.IRenderTheme; import org.oscim.theme.ThemeLoader; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; public class SimpleMapActivity extends BaseMapActivity { diff --git a/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java b/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java index 5413d9c4c..1a6dd74be 100644 --- a/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java @@ -6,7 +6,6 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.ToggleButton; - import org.oscim.backend.canvas.Color; import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.vector.VectorTileLayer; @@ -14,7 +13,7 @@ import org.oscim.map.Layers; import org.oscim.renderer.MapRenderer; import org.oscim.theme.RenderTheme; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.theme.rule.Rule; import org.oscim.theme.rule.Rule.RuleVisitor; import org.oscim.theme.styles.AreaStyle; diff --git a/vtm-app/src/org/oscim/app/MapLayers.java b/vtm-app/src/org/oscim/app/MapLayers.java index ecacbf39e..1113536f8 100644 --- a/vtm-app/src/org/oscim/app/MapLayers.java +++ b/vtm-app/src/org/oscim/app/MapLayers.java @@ -29,7 +29,7 @@ import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.theme.ThemeFile; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.ITileCache; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.UrlTileSource; diff --git a/vtm-gdx/src/org/oscim/gdx/GdxMap.java b/vtm-gdx/src/org/oscim/gdx/GdxMap.java index 003cac292..b7f2586f3 100644 --- a/vtm-gdx/src/org/oscim/gdx/GdxMap.java +++ b/vtm-gdx/src/org/oscim/gdx/GdxMap.java @@ -33,7 +33,7 @@ import org.oscim.map.Layers; import org.oscim.map.Map; import org.oscim.renderer.MapRenderer; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.utils.Parameters; import org.slf4j.Logger; diff --git a/vtm-gdx/src/org/oscim/gdx/InputHandler.java b/vtm-gdx/src/org/oscim/gdx/InputHandler.java index 029d1da36..d6e56f9b7 100644 --- a/vtm-gdx/src/org/oscim/gdx/InputHandler.java +++ b/vtm-gdx/src/org/oscim/gdx/InputHandler.java @@ -29,7 +29,7 @@ import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.map.Map; import org.oscim.map.ViewController; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.utils.animation.Easing; import java.util.List; diff --git a/vtm-ios-example/src/org/oscim/ios/test/IOSLineTexBucketTest.java b/vtm-ios-example/src/org/oscim/ios/test/IOSLineTexBucketTest.java index 5168d43b6..49fd7c03a 100644 --- a/vtm-ios-example/src/org/oscim/ios/test/IOSLineTexBucketTest.java +++ b/vtm-ios-example/src/org/oscim/ios/test/IOSLineTexBucketTest.java @@ -18,7 +18,6 @@ package org.oscim.ios.test; import com.badlogic.gdx.graphics.glutils.GLVersion; - import org.oscim.backend.CanvasAdapter; import org.oscim.backend.GLAdapter; import org.oscim.core.GeometryBuffer; @@ -37,7 +36,7 @@ import org.oscim.renderer.bucket.TextureItem; import org.oscim.theme.IRenderTheme; import org.oscim.theme.ThemeLoader; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.theme.styles.LineStyle; import org.oscim.theme.styles.RenderStyle; diff --git a/vtm-ios-example/src/org/oscim/ios/test/IOSMapApp.java b/vtm-ios-example/src/org/oscim/ios/test/IOSMapApp.java index 4e5a2acf0..41c96e1ab 100644 --- a/vtm-ios-example/src/org/oscim/ios/test/IOSMapApp.java +++ b/vtm-ios-example/src/org/oscim/ios/test/IOSMapApp.java @@ -19,7 +19,6 @@ package org.oscim.ios.test; import com.badlogic.gdx.graphics.glutils.GLVersion; - import org.oscim.backend.DateTime; import org.oscim.backend.DateTimeAdapter; import org.oscim.backend.GLAdapter; @@ -35,12 +34,8 @@ import org.oscim.map.Map; import org.oscim.renderer.BitmapRenderer; import org.oscim.renderer.GLViewport; -import org.oscim.scalebar.DefaultMapScaleBar; -import org.oscim.scalebar.ImperialUnitAdapter; -import org.oscim.scalebar.MapScaleBar; -import org.oscim.scalebar.MapScaleBarLayer; -import org.oscim.scalebar.MetricUnitAdapter; -import org.oscim.theme.VtmThemes; +import org.oscim.scalebar.*; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; public class IOSMapApp extends GdxMap { diff --git a/vtm-ios-example/src/org/oscim/ios/test/IOSPathLayerTest.java b/vtm-ios-example/src/org/oscim/ios/test/IOSPathLayerTest.java index cfd7f4a55..b46fdd72a 100644 --- a/vtm-ios-example/src/org/oscim/ios/test/IOSPathLayerTest.java +++ b/vtm-ios-example/src/org/oscim/ios/test/IOSPathLayerTest.java @@ -36,7 +36,7 @@ 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.theme.internal.VtmThemes; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.utils.Utils; diff --git a/vtm-playground/src/org/oscim/stuff/MapzenTest.java b/vtm-playground/src/org/oscim/stuff/MapzenTest.java index def8a5e10..5e0995160 100644 --- a/vtm-playground/src/org/oscim/stuff/MapzenTest.java +++ b/vtm-playground/src/org/oscim/stuff/MapzenTest.java @@ -20,7 +20,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; diff --git a/vtm-playground/src/org/oscim/test/ExtrusionsTest.java b/vtm-playground/src/org/oscim/test/ExtrusionsTest.java index 088a25a98..40b8786f9 100644 --- a/vtm-playground/src/org/oscim/test/ExtrusionsTest.java +++ b/vtm-playground/src/org/oscim/test/ExtrusionsTest.java @@ -23,7 +23,7 @@ import org.oscim.layers.tile.buildings.S3DBLayer; import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.test.tiling.source.TestTileSource; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; public class ExtrusionsTest extends GdxMapApp { diff --git a/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java b/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java index d02d5cbf0..d29b47c8e 100644 --- a/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java +++ b/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java @@ -24,7 +24,7 @@ import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.MapRenderer; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; diff --git a/vtm-playground/src/org/oscim/test/MapilionMvtTest.java b/vtm-playground/src/org/oscim/test/MapilionMvtTest.java index b506111d3..2e4127249 100644 --- a/vtm-playground/src/org/oscim/test/MapilionMvtTest.java +++ b/vtm-playground/src/org/oscim/test/MapilionMvtTest.java @@ -22,7 +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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.bitmap.DefaultSources; diff --git a/vtm-playground/src/org/oscim/test/MapsforgeTest.java b/vtm-playground/src/org/oscim/test/MapsforgeTest.java index 7f1eac8a1..c6b410121 100644 --- a/vtm-playground/src/org/oscim/test/MapsforgeTest.java +++ b/vtm-playground/src/org/oscim/test/MapsforgeTest.java @@ -32,7 +32,7 @@ import org.oscim.renderer.ExtrusionRenderer; import org.oscim.renderer.GLViewport; import org.oscim.scalebar.*; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.source.mapfile.MapFileTileSource; import org.oscim.tiling.source.mapfile.MultiMapFileTileSource; diff --git a/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java b/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java index fec355b70..b44f7e729 100644 --- a/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java +++ b/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java @@ -21,7 +21,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.geojson.MapzenGeojsonTileSource; diff --git a/vtm-playground/src/org/oscim/test/MapzenMvtTest.java b/vtm-playground/src/org/oscim/test/MapzenMvtTest.java index 0d881afd2..e7beddc26 100644 --- a/vtm-playground/src/org/oscim/test/MapzenMvtTest.java +++ b/vtm-playground/src/org/oscim/test/MapzenMvtTest.java @@ -21,7 +21,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.mvt.MapzenMvtTileSource; diff --git a/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java b/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java index 58f1a04e0..c52d5a7f5 100644 --- a/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java +++ b/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java @@ -21,7 +21,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.geojson.NextzenGeojsonTileSource; diff --git a/vtm-playground/src/org/oscim/test/NextzenMvtTest.java b/vtm-playground/src/org/oscim/test/NextzenMvtTest.java index e8d11b99e..acdaf21b7 100644 --- a/vtm-playground/src/org/oscim/test/NextzenMvtTest.java +++ b/vtm-playground/src/org/oscim/test/NextzenMvtTest.java @@ -21,7 +21,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.mvt.NextzenMvtTileSource; diff --git a/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java b/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java index c6fb35b3c..8cd84faa3 100644 --- a/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java +++ b/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java @@ -21,7 +21,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.theme.internal.VtmThemes; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; import org.oscim.tiling.source.mvt.OpenMapTilesMvtTileSource; diff --git a/vtm-playground/src/org/oscim/test/OverpassTest.java b/vtm-playground/src/org/oscim/test/OverpassTest.java index 112fdbfc8..1ca4a2948 100644 --- a/vtm-playground/src/org/oscim/test/OverpassTest.java +++ b/vtm-playground/src/org/oscim/test/OverpassTest.java @@ -27,7 +27,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.map.Map; import org.oscim.map.Viewport; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.UrlTileSource; diff --git a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java index ae4f56737..c84720b45 100644 --- a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java +++ b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java @@ -21,7 +21,7 @@ import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.renderer.MapRenderer; import org.oscim.theme.RenderTheme; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.theme.rule.Rule; import org.oscim.theme.rule.Rule.RuleVisitor; import org.oscim.theme.styles.AreaStyle; diff --git a/vtm-playground/src/org/oscim/test/SimpleMapTest.java b/vtm-playground/src/org/oscim/test/SimpleMapTest.java index ea870c573..c83850c1c 100644 --- a/vtm-playground/src/org/oscim/test/SimpleMapTest.java +++ b/vtm-playground/src/org/oscim/test/SimpleMapTest.java @@ -26,7 +26,7 @@ import org.oscim.renderer.BitmapRenderer; import org.oscim.renderer.GLViewport; import org.oscim.scalebar.*; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.OkHttpEngine; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; diff --git a/vtm-playground/src/org/oscim/test/ThemeTest.java b/vtm-playground/src/org/oscim/test/ThemeTest.java index 099b20c23..33d7f2999 100644 --- a/vtm-playground/src/org/oscim/test/ThemeTest.java +++ b/vtm-playground/src/org/oscim/test/ThemeTest.java @@ -7,7 +7,7 @@ import org.oscim.core.TagSet; import org.oscim.theme.IRenderTheme; import org.oscim.theme.ThemeLoader; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.theme.styles.RenderStyle; import java.io.FileInputStream; diff --git a/vtm-playground/src/org/oscim/test/TileRenderTest.java b/vtm-playground/src/org/oscim/test/TileRenderTest.java index 639b35e4d..80171f578 100644 --- a/vtm-playground/src/org/oscim/test/TileRenderTest.java +++ b/vtm-playground/src/org/oscim/test/TileRenderTest.java @@ -29,7 +29,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.map.Map; import org.oscim.renderer.MapRenderer; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.QueryResult; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.OkHttpEngine; diff --git a/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java b/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java index b0755285f..9d7206ebe 100644 --- a/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java +++ b/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java @@ -20,7 +20,6 @@ import com.badlogic.gdx.InputMultiplexer; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.input.GestureDetector; - import org.oscim.core.MapPosition; import org.oscim.event.Event; import org.oscim.gdx.GestureHandlerImpl; @@ -34,14 +33,10 @@ import org.oscim.renderer.GLState; import org.oscim.renderer.GLViewport; import org.oscim.renderer.MapRenderer; -import org.oscim.scalebar.DefaultMapScaleBar; -import org.oscim.scalebar.ImperialUnitAdapter; -import org.oscim.scalebar.MapScaleBar; -import org.oscim.scalebar.MapScaleBarLayer; -import org.oscim.scalebar.MetricUnitAdapter; +import org.oscim.scalebar.*; import org.oscim.theme.ExternalRenderTheme; -import org.oscim.theme.VtmThemes; import org.oscim.theme.comparator.BothMapPositionHandler; +import org.oscim.theme.internal.VtmThemes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/vtm-themes/src/org/oscim/theme/VtmThemes.java b/vtm-themes/src/org/oscim/theme/internal/VtmThemes.java similarity index 93% rename from vtm-themes/src/org/oscim/theme/VtmThemes.java rename to vtm-themes/src/org/oscim/theme/internal/VtmThemes.java index e18af309a..92ae85286 100644 --- a/vtm-themes/src/org/oscim/theme/VtmThemes.java +++ b/vtm-themes/src/org/oscim/theme/internal/VtmThemes.java @@ -19,10 +19,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.theme; +package org.oscim.theme.internal; import org.oscim.backend.AssetAdapter; import org.oscim.theme.IRenderTheme.ThemeException; +import org.oscim.theme.ThemeFile; +import org.oscim.theme.XmlRenderThemeMenuCallback; +import org.oscim.theme.XmlThemeResourceProvider; import java.io.InputStream; diff --git a/vtm-web-app/src/org/oscim/web/client/GwtMap.java b/vtm-web-app/src/org/oscim/web/client/GwtMap.java index bee8a1868..90081f732 100644 --- a/vtm-web-app/src/org/oscim/web/client/GwtMap.java +++ b/vtm-web-app/src/org/oscim/web/client/GwtMap.java @@ -40,7 +40,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.renderer.MapRenderer; import org.oscim.theme.StreamRenderTheme; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.oscim.tiling.TileSource; import org.oscim.tiling.source.bitmap.BitmapTileSource; import org.oscim.tiling.source.bitmap.DefaultSources; diff --git a/vtm-web-js/src/org/oscim/web/js/JsMap.java b/vtm-web-js/src/org/oscim/web/js/JsMap.java index a9e94b0a6..62268ec82 100644 --- a/vtm-web-js/src/org/oscim/web/js/JsMap.java +++ b/vtm-web-js/src/org/oscim/web/js/JsMap.java @@ -6,7 +6,7 @@ import org.oscim.map.Map; import org.oscim.theme.IRenderTheme; import org.oscim.theme.ThemeLoader; -import org.oscim.theme.VtmThemes; +import org.oscim.theme.internal.VtmThemes; import org.timepedia.exporter.client.Export; import org.timepedia.exporter.client.ExportPackage; import org.timepedia.exporter.client.Exportable;