0.16.0

Render theme xml pull parser

.travis.yml

@@ -4,8 +4,8 @@ jdk:
 - openjdk8
 env:
   global:
-  - ANDROID=29
-  - ANDROID_BUILD_TOOLS=29.0.2
+  - ANDROID=30
+  - ANDROID_BUILD_TOOLS=30.0.3
   - GRADLE_OPTS="-Xmx2048m"
   - secure: sW674wuFZOuoX7jHQHDbX3j8NxL8JxR07cyq+CrrqJ537dU9lxWQmMBRUpOb+p/q7sQ74PUtiKJkmFgKCSJSAKY+nr6GJ8P/q6u5TUKbmUWODSn8znehX2zualfvFwpF4PILok/wUzXBQE62jn4lUua7cMdsHRMNHbLmKqBoVL0meObDDjsaJ/RCbOPuruy3FmgvXPp0+Y4zl1GsklDSyjFzg4LBzjAk9Ryvh1O4zvJBkkyfCgurLKCnOKIPy3v5fPMS9oDfO1aarAVGoZZe416pvTW4hb8cdB6kn9XWYDob4NDFX/sP5k7XIhd/NAIn9LrKFg0sLtATaKLX+BcasF1CgDR/u6+SEeQd5QaRF7Go2Nq5Ltuu4OIFONI2qhEeVDDK6Otf2WSWj9KPno2GHuumBfbg4ypWoJgmZrMXk8JeVV/OP/0jIQz3p/7yfF21X1XBEqYaVHPAMKdEYYkCSa46KfACyOt6LfnkuCHtoTOpFo7sq0omIA2HOtpIx1u3vMBUyAbQqT6cokkKB1b6gNTFwhHc+8ybfLFPljJB8cWshI+V/b06S6fekRmvTNxvDykWNsdlkENBYqc9hMfjcT4hO4K+76SWN62mimQYODvFyfTVMC7WkQ3k/XEnmqUPV5XkbaILbS1d/tA57N148FiJ5/QXtI6Y94imubYyVqU=
   - secure: AdKSZKA4gMuKXI4X4dQNJqcMv5OmPIHdN8fpy55Y9yoOQPQHZE3Zwc4QDWBh20q298jyEC854tVTPTysdZ7h+2s2FhsprYv1Bt/QNzKIrLpeIMj2quuVGMbdPuk08y55gost94KwVLJv0sIDpRlB/PEQkA7Mg/UDsT9zR8E1Ms5x+ul2C8e1ag0zzNl1wVnT5jY8WCp74uA/XXCcJl/80qT1stUERazCKwbKNo007hi7rdm4HA7YGevORq8e2r67je+WIBZUAwrHT0Zjuo4ibwUii4LdwvjuN3w0Z6e9Wf4x5bBqGgnih0T31uom2yPjNx+U/c2AWI+Nxfy/SEF2U+9bjBEZ3ZhI7F1B9ofXo2mhvvsVDiUrymMBbG2V64C9kAzeUh7xIBTqIrbdtpAEBV9FlLAtF2swVTwtCgZgcVTOt3RKXCi3X3nk3cuH7PAorFa/QGfT4xxVu2011FVAt2Rm7SD0ZWztZTSTz/4Nt/egtGBOJfrCc7oLEygLzDmLqsqCwCROITVQjWLjrtqDyLteaNiSXeNIQMKun3izApbXnHmXB+FV3R3EZocboqk3v5bmPTahnG6Ghc2zknWyyxSx+O9qIfOpHUL8JMJiT82lUQUeibtCn7DCE8wVQ/gYC5i+a+KO/d3NemSzIFlZ8aoUiEPYq18dYlsDXeLXwF0=

README.md

@@ -12,7 +12,7 @@ VTM (Vector Tile Map) was developed within the [OpenScienceMap](https://github.c
 
 See the **[integration guide](docs/Integration.md)** and [changelog](docs/Changelog.md). And read through [how to contribute](docs/CONTRIBUTING.md) guidelines.
 
-If you have any questions or problems, don't hesitate to ask our public [forum](https://groups.google.com/group/mapsforge-dev) for help.
+If you have any questions or problems, don't hesitate to ask the Discussions for help.
 
 ## Features
 - Java map library

build.gradle

@@ -1,10 +1,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
@@ -14,7 +14,7 @@ allprojects {
     version = 'master-SNAPSHOT'
     ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
-    ext.androidBuildVersionTools = "29.0.2"
+    ext.androidBuildVersionTools = "30.0.3"
     ext.gdxVersion = "1.9.10"
     ext.gwtVersion = "2.8.2"
     ext.slf4jVersion = "1.7.28"
@@ -28,12 +28,12 @@ allprojects {
     }
 }
 
-static def androidCompileSdk() { return 29 }
+static def androidCompileSdk() { return 30 }
 
 // 14 for Support Library, 16 for sqlite-android
 static def androidMinSdk() { return 16 }
 
-static def androidTargetSdk() { return 29 }
+static def androidTargetSdk() { return 30 }
 
 static def versionCode() { return 1 }
 
@@ -42,14 +42,19 @@ def versionName() { return version }
 subprojects {
     repositories {
         google()
-        maven { url 'https://repo.boundlessgeo.com/main/' }
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 
     tasks.withType(JavaCompile) {
         sourceCompatibility = JavaVersion.VERSION_1_7
         targetCompatibility = JavaVersion.VERSION_1_7
         options.encoding = 'UTF-8'
+        if (JavaVersion.current().isJava9Compatible()) {
+            if (!project.properties.containsKey('android')) {
+                options.compilerArgs.addAll(['--release', '7'])
+            }
+        }
     }
 }

deploy.gradle

@@ -9,6 +9,7 @@ if (project.hasProperty("android")) {
     task javadoc(type: Javadoc) {
         source = android.sourceSets.main.java.srcDirs
         classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        classpath += project.android.libraryVariants.toList().first().javaCompileProvider.get().classpath
     }
 } else {
     task sourcesJar(type: Jar) {

docs/Applications.md

@@ -7,8 +7,9 @@
 | [Cruiser](http://wiki.openstreetmap.org/wiki/Cruiser) | Map and navigation application | Proprietary/Free | Android, Desktop | Closed |
 | [GCDroid](https://play.google.com/store/apps/details?id=com.gcdroid) | Geocaching App | Proprietary/Free and Commercial | Android | Closed |
 | [GPSLogger II](https://play.google.com/store/apps/details?id=com.emacberry.gpslogger) | Map and navigation, Fitness & Cycling application | Proprietary/Free | Android | Closed |
+| [HabanaTrans](https://play.google.com/store/apps/details?id=cu.pabloapk.habanatrans&hl=es_419) | Public transport, map offline, gps, routing | Proprietary/Free | Android | Closed |
 | [Hunt Cyprus](https://play.google.com/store/apps/developer?id=Talent+S.A.) | Map and navigation application for hunters | Proprietary/Free and Commercial | Android | Closed |
-| [Kurviger](https://kurviger.de/en) | Route planner specialized on motorcyclists | Proprietary/Free and Commercial | Android | Closed |
+| [Kurviger](https://kurviger.de/en) | Route planner specialized on motorcyclists | Proprietary/Free (in-app purchases) | Android | Closed |
 | [MapTrek](http://maptrek.mobi) | Application for outdoor activities | GPL3/Free and Commercial | Android | Open |
 | [MyRunningApp](https://play.google.com/store/apps/details?id=it.nimarsolutions.rungpstracker) | Fitness app | Proprietary/Free | Android | Closed |
 | [MyTourbook](http://mytourbook.sourceforge.net/mytourbook/) | Visualize and analyze tours | GPL2/Free | Desktop | Open |
@@ -18,6 +19,5 @@
 | [topoGuide](http://www.topoguide.gr/index-en.php) | Digital guides for the outdoor | Proprietary/Free and Commercial | Android | Closed |
 | [Ubitrek](https://play.google.com/store/apps/details?id=ubicarta.ubitrek) | Hiking with IGN maps | Proprietary/Free | Android | Closed |
 | [VTM with Eclipse RCP](https://github.com/wolfgang-ch/vtm-with-rcp) | VTM with an Eclipse RCP application | GPL3/Free | Desktop | Open |
+| [Walkaholic](https://play.google.com/store/apps/details?id=com.walkaholic.hikeapp) | Hiking app with official routes and online/offline maps | Proprietary/Free (in-app purchases) | Android | Closed |
 | [XCTrack](http://xctrack.org/) | Flight computer for paraglider pilots | Proprietary/Free | Android | Closed |
-
-You know an application that is missing here? Please inform us by sending a message via our public [forum](https://groups.google.com/group/mapsforge-dev).

docs/CONTRIBUTING.md

@@ -2,9 +2,7 @@
 
 As an open source project, we welcome new contributors and appreciate your help.
 
-Before you start working on an unresolved issue or try to implement a new feature, please contact us via our public [forum](https://groups.google.com/group/mapsforge-dev).
-
-You may also create a new issue on [Github](https://github.com/mapsforge/vtm/issues) or comment on an existing one to describe your ideas. We will then discuss the best way to realize your proposal and figure out how we can help you to get started quickly.
+Before you start working on an unresolved issue or try to implement a new feature, please contact us via the Discussions. We will then discuss the best way to realize your proposal and figure out how we can help you to get started quickly.
 
 If you are only requesting a small change in the code, you may attach a patch file to the corresponding issue, but it is best to create a pull request on Github. Make sure that your patch is derived from the latest version in our **master** repository, otherwise we might be unable to apply it. Important is to keep pull requests simple with one feature in each. Please follow our code and style conventions.
 

docs/Changelog.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## New since 0.16.0
+
+- Many other minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.17.0)
+
+## Version 0.16.0 (2021-05-27)
+
+- Android: scoped storage map / theme example [#804](https://github.com/mapsforge/vtm/pull/804)
+- Render theme from zip archive [#804](https://github.com/mapsforge/vtm/pull/804)
+- Render themes: custom resource providers [#804](https://github.com/mapsforge/vtm/pull/804)
+- Nautical unit adapter with feet [#803](https://github.com/mapsforge/vtm/pull/803)
+- Distant labels rendering option [#844](https://github.com/mapsforge/vtm/pull/844)
+  - `Parameters.DISTANT_LABELS`
+- Many other minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.16.0)
+
+## Version 0.15.0 (2021-01-01)
+
+- Android: scoped storage map example [#785](https://github.com/mapsforge/vtm/pull/785)
+- Mapsforge: map stream support [#784](https://github.com/mapsforge/vtm/pull/784)
+- Render theme from Android content providers [#783](https://github.com/mapsforge/vtm/pull/783)
+- Render theme xml pull parser [#786](https://github.com/mapsforge/vtm/pull/786)
+- Symbol scale option [#790](https://github.com/mapsforge/vtm/pull/790)
+  - `Parameters.SYMBOL_SCALING`
+- Many other minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.15.0)
+
+## Version 0.14.0 (2020-08-25)
+
+- Render themes: symbol styles [#769](https://github.com/mapsforge/vtm/pull/769)
+- More mutable itemized layer [#771](https://github.com/mapsforge/vtm/pull/771)
+- Marker renderer sort option
+  - `Parameters.MARKER_SORT`
+- Update vtm-jeo module [#770](https://github.com/mapsforge/vtm/pull/770)
+- Many other minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.14.0)
+
 ## Version 0.13.0 (2020-01-12)
 
 - Render themes: symbols on lines with billboard / rotation [#743](https://github.com/mapsforge/vtm/pull/743)
@@ -197,7 +234,7 @@
 - Many other minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.7.0)
 
-## Version 0.6.0 (2016-10-28) - VTM revive
+## Version 0.6.0 (2016-10-28) - VTM revival
 
 - Mapsforge maps **v4** support [#34](https://github.com/mapsforge/vtm/issues/34)
 - Render theme SVG resources [#60](https://github.com/mapsforge/vtm/issues/60)
@@ -214,6 +251,8 @@
 - libGDX layer gestures [#151](https://github.com/mapsforge/vtm/issues/151)
 - Render theme area tessellation option [#37](https://github.com/mapsforge/vtm/issues/37)
 - Render theme resources optional location prefixes [#66](https://github.com/mapsforge/vtm/issues/66)
+- Render theme from input stream [#161](https://github.com/mapsforge/vtm/issues/161)
+- Render theme from Android assets [#162](https://github.com/mapsforge/vtm/issues/162)
 - Graphics API platform enhancements [#92](https://github.com/mapsforge/vtm/issues/92)
 - GeoPoint & BoundingBox improvements [#201](https://github.com/mapsforge/vtm/issues/201) [#200](https://github.com/mapsforge/vtm/issues/200)
 - vtm-jts module [#53](https://github.com/mapsforge/vtm/issues/53)

docs/ISSUE_TEMPLATE.md

@@ -1 +1 @@
-For questions, reports and discussion please always use the [forum](https://groups.google.com/group/mapsforge-dev).
+For questions, reports and feature requests please use the Discussions.

docs/Integration.md

@@ -10,6 +10,7 @@ Current version is [![Maven Central](https://img.shields.io/maven-central/v/org.
 ```groovy
 implementation 'org.mapsforge:vtm:[CURRENT-VERSION]'
 implementation 'org.mapsforge:vtm-themes:[CURRENT-VERSION]'
+implementation 'net.sf.kxml:kxml2:2.3.0'
 implementation 'org.slf4j:slf4j-api:1.7.28'
 ```
 
@@ -47,23 +48,19 @@ Detailed iOS instructions can be found [here](ios.md).
 
 ### Desktop
 ```groovy
-repositories {
-    maven { url 'https://jitpack.io' }
-}
-
 implementation 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]'
 implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]'
 implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-linux'
 implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-osx'
 implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows'
-implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]'
 implementation 'com.badlogicgames.gdx:gdx:1.9.10'
 implementation 'com.badlogicgames.gdx:gdx-platform:1.9.10:natives-desktop'
-implementation 'com.github.blackears:svgSalamander:v1.1.1'
+implementation 'com.formdev:svgSalamander:1.1.2.4'
 ```
 
 ### Desktop (LWJGL)
 ```groovy
+implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]'
 implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10'
 implementation 'org.lwjgl.lwjgl:lwjgl:2.9.3'
 implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux'
@@ -73,6 +70,7 @@ implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-windows'
 
 ### Desktop (LWJGL 3)
 ```groovy
+implementation 'org.mapsforge:vtm-desktop-lwjgl3:[CURRENT-VERSION]'
 implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl3:1.9.10'
 implementation 'org.lwjgl:lwjgl:3.2.3'
 implementation 'org.lwjgl:lwjgl:3.2.3:natives-linux'
@@ -93,7 +91,7 @@ implementation 'org.locationtech.jts:jts-core:1.15.1'
 ```groovy
 implementation 'org.mapsforge:vtm-http:[CURRENT-VERSION]'
 // https://github.com/square/okhttp/issues/4481
-implementation 'com.squareup.okhttp3:okhttp:3.12.5'
+implementation 'com.squareup.okhttp3:okhttp:3.12.13'
 implementation 'com.squareup.okio:okio:1.15.0'
 ```
 
@@ -129,29 +127,15 @@ implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9'
 
 ### jeo (indoor maps)
 
-Add _first_ the Boundless repository:
 ```groovy
 repositories {
-    maven { url 'https://repo.boundlessgeo.com/main/' }
-    jcenter()
-    ...
+    maven { url 'https://jitpack.io' }
 }
-```
 
-```groovy
 implementation 'org.mapsforge:vtm-jeo:[CURRENT-VERSION]'
-implementation('org.jeo:jeo:0-SNAPSHOT') {
+implementation('com.github.jeo.jeo:jeo-carto:master-SNAPSHOT') {
     exclude group: 'org.slf4j', module: 'slf4j-jdk14'
 }
-implementation('org.jeo:jeo-carto:0-SNAPSHOT') {
-    exclude group: 'org.slf4j', module: 'slf4j-jdk14'
-}
-implementation('org.jeo:jeo-render:0-SNAPSHOT') {
-    exclude group: 'org.slf4j', module: 'slf4j-jdk14'
-}
-implementation 'org.osgeo:proj4j:0.1.0:jeo'
-implementation 'com.metaweb:lessen:1.0'
-implementation 'com.vividsolutions:jts:1.13'
 ```
 
 ## Snapshots

docs/Mapsforge-Maps.md

@@ -1,11 +1,10 @@
 # Mapsforge map providers (in lexical order)
 
-- [AndroidMaps](http://www.androidmaps.co.uk/)
-- [Freizeitkarte](http://www.freizeitkarte-osm.de/android/en/index.html)
-- [Kurviger](https://offline-maps.kurviger.de/)
-- [Mapsforge](http://download.mapsforge.org/)
-- [OpenAndroMaps](http://www.openandromaps.org/en/)
-- [OpenMaps](http://openmaps.eu/)
+- [AndroidMaps](https://www.androidmaps.co.uk/)
+- [BBBike](https://extract.bbbike.org/?format=mapsforge-osm.zip)
+- [Freizeitkarte](https://www.freizeitkarte-osm.de/android/en/index.html)
+- [Kurviger](https://download.kurviger.de/)
+- [Mapsforge](https://download.mapsforge.org/)
+- [OpenAndroMaps](https://www.openandromaps.org/en/)
+- [OpenMaps](https://openmaps.eu/)
 - [vector.city](https://vector.city/)
-
-You know a Mapsforge map provider that is missing here? Please inform us by sending a message via our public [forum](https://groups.google.com/group/mapsforge-dev).

docs/Rendertheme.md

@@ -1,8 +1,6 @@
 # RenderTheme
 
-**This article describes how to use XML-based render-themes to style maps.**
-
-If you have any questions or problems, don't hesitate to ask our public [forum](https://groups.google.com/group/mapsforge-dev) for help. You can also report bugs and improvement requests via our [issue tracker](https://github.com/mapsforge/vtm/issues).
+This article describes how to use XML-based render-themes to style maps.
 
 ## Introduction
 
@@ -109,11 +107,12 @@ There are different possibilities to simplify and accelerate map styling or chan
 
 ### Style patterns
 
-If you want to use a specific style multiple times you not have to rewrite it for each text, area, or line rule.
+If you want to use a specific style multiple times you not have to rewrite it for each text, line, area or symbol rule.
 If you define a style set an `id` and use it with `use` in your rendering instructions:
  - `style-text`
  - `style-line`
  - `style-area`
+ - `style-symbol`
  
 This example styles all areas with the_residential_ style, which haven't the `highway` or `building` key.
  

gradle.properties

@@ -6,14 +6,12 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
+# Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

resources/rendertheme.xsd

@@ -233,7 +233,11 @@
 
     <xs:complexType name="symbol">
         <xs:attribute name="cat" type="xs:string" use="optional" />
-        <xs:attribute name="src" type="tns:src" use="required" />
+
+        <xs:attribute name="id" default="0" type="xs:string" use="optional" />
+        <xs:attribute name="use" default="0" type="xs:string" use="optional" />
+
+        <xs:attribute name="src" type="tns:src" use="optional" />
         <xs:attribute name="symbol-width" type="xs:positiveInteger" use="optional" />
         <xs:attribute name="symbol-height" type="xs:positiveInteger" use="optional" />
         <xs:attribute name="symbol-percent" type="xs:positiveInteger" use="optional" />
@@ -332,6 +336,7 @@
             <xs:sequence maxOccurs="256" minOccurs="0">
                 <xs:choice maxOccurs="unbounded" minOccurs="0">
                     <xs:element name="style-text" type="tns:text" />
+                    <xs:element name="style-symbol" type="tns:symbol" />
                     <xs:element name="style-area" type="tns:area" />
                     <xs:element name="style-line" type="tns:line" />
                     <!-- <xs:element name="style-outline" type="tns:line" /> -->

vtm-android-example/AndroidManifest.xml

@@ -15,6 +15,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".Samples"
@@ -33,6 +34,9 @@
         <activity
             android:name=".ClusterMarkerOverlayActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".FragmentActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".GettingStarted"
             android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -60,12 +64,6 @@
         <activity
             android:name=".MapsforgeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-        <activity
-            android:name=".MapsforgeActivity$MapFilePicker"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
-        <activity
-            android:name=".MapsforgeActivity$ThemeFilePicker"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MapsforgeS3DBActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />

vtm-android-example/build.gradle

@@ -16,11 +16,11 @@ dependencies {
     implementation project(':vtm-gdx')
     implementation project(':vtm-gdx-poi3d')
 
-    implementation 'org.mapsforge:mapsforge-poi-android:0.13.0'
-    implementation 'org.mapsforge:sqlite-android:0.13.0:natives-armeabi-v7a'
-    implementation 'org.mapsforge:sqlite-android:0.13.0:natives-arm64-v8a'
-    implementation 'org.mapsforge:sqlite-android:0.13.0:natives-x86'
-    implementation 'org.mapsforge:sqlite-android:0.13.0:natives-x86_64'
+    implementation 'org.mapsforge:mapsforge-poi-android:0.16.0'
+    implementation 'org.mapsforge:sqlite-android:0.16.0:natives-armeabi-v7a'
+    implementation 'org.mapsforge:sqlite-android:0.16.0:natives-arm64-v8a'
+    implementation 'org.mapsforge:sqlite-android:0.16.0:natives-x86'
+    implementation 'org.mapsforge:sqlite-android:0.16.0:natives-x86_64'
 }
 
 android {

vtm-android-example/res/layout/fragment_blank.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/white">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/empty_fragment_text" />
+
+</RelativeLayout>

vtm-android-example/res/layout/fragment_map.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white">
 
-    <org.oscim.android.MapView
+    <RelativeLayout
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

vtm-android-example/res/menu/fragment_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/replace_fragment"
+        android:showAsAction="never"
+        android:title="@string/replace_fragment" />
+
+</menu>

vtm-android-example/res/menu/theme_menu.xml

@@ -20,6 +20,9 @@
         <item
             android:id="@+id/theme_newtron"
             android:title="@string/theme_newtron" />
+        <item
+            android:id="@+id/theme_external_archive"
+            android:title="@string/theme_external_archive" />
         <item
             android:id="@+id/theme_external"
             android:title="@string/theme_external" />

vtm-android-example/res/values/strings.xml

@@ -6,7 +6,8 @@
     <string name="theme_osmagray">Osmagray</string>
     <string name="theme_tubes">Tubes</string>
     <string name="theme_newtron">NewTron</string>
-    <string name="theme_external">External theme</string>
+    <string name="theme_external">External theme (Android 5)</string>
+    <string name="theme_external_archive">External theme archive</string>
     <string name="styler_mode_line">Line</string>
     <string name="styler_mode_area">Area</string>
     <string name="styler_mode_outline">Outline</string>
@@ -15,6 +16,7 @@
     <string name="style_2">Hide nature</string>
     <string name="menu_gridlayer">Grid</string>
     <string name="dialog_reverse_geocoding_title">Reverse Geocoding</string>
+    <string name="dialog_theme_title">Select a theme</string>
     <string name="add">Add</string>
     <string name="cancel">Cancel</string>
     <string name="error">Error</string>
@@ -28,5 +30,7 @@
     <string name="warning">Warning</string>
     <string name="startup_message_mbtiles">To run this sample activity, you need an MBTiles database installed on storage.\n\nadb push %s %s</string>
     <string name="exit">Exit</string>
+    <string name="replace_fragment">Replace fragment</string>
+    <string name="empty_fragment_text">This is a fragment to test the back stack behaviour of the map fragment.</string>
 
 </resources>

vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2017 Longri
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -16,18 +16,11 @@
  */
 package org.oscim.android.filepicker;
 
-import org.oscim.theme.ExternalRenderTheme;
-import org.oscim.theme.ThemeFile;
-import org.oscim.theme.XmlThemeBuilder;
+import org.oscim.theme.ThemeLoader;
 import org.oscim.tiling.TileSource.OpenResult;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
 
 import java.io.File;
 
-import javax.xml.parsers.SAXParserFactory;
-
 /**
  * Accepts all valid render theme XML files.
  */
@@ -36,13 +29,8 @@ public final class ValidRenderTheme implements ValidFileFilter {
 
     @Override
     public boolean accept(File file) {
-
         try {
-            ThemeFile theme = new ExternalRenderTheme(file.getAbsolutePath());
-            DefaultHandler renderThemeHandler = new XmlThemeBuilder(theme);
-            XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
-            xmlReader.setContentHandler(renderThemeHandler);
-            xmlReader.parse(new InputSource(theme.getRenderThemeAsStream()));
+            ThemeLoader.load(file.getAbsolutePath());
             mOpenResult = OpenResult.SUCCESS;
         } catch (Exception e) {
             mOpenResult = new OpenResult(e.getMessage());

vtm-android-example/src/org/oscim/android/test/AtlasMultiTextureActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Hannes Janetzek
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2017 Longri
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -19,7 +19,6 @@
 package org.oscim.android.test;
 
 import android.widget.Toast;
-
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Canvas;
@@ -27,18 +26,20 @@ import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint;
 import org.oscim.core.GeoPoint;
 import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.atlas.TextureAtlas;
 import org.oscim.renderer.atlas.TextureRegion;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 import org.oscim.utils.TextureAtlasUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -49,9 +50,10 @@ public class AtlasMultiTextureActivity extends MarkerOverlayActivity {
         // Map events receiver
         mMap.layers().add(new MapEventsReceiver(mMap));
 
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-android-example"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         // Create Atlas from Bitmaps
@@ -65,7 +67,7 @@ public class AtlasMultiTextureActivity extends MarkerOverlayActivity {
         paint.setTextSize(12 * CanvasAdapter.getScale());
         paint.setStrokeWidth(2 * CanvasAdapter.getScale());
         paint.setColor(Color.BLACK);
-        List<MarkerItem> pts = new ArrayList<>();
+        List<MarkerInterface> pts = new ArrayList<>();
         for (double lat = -90; lat <= 90; lat += 10) {
             for (double lon = -180; lon <= 180; lon += 10) {
                 String title = lat + "/" + lon;
@@ -85,29 +87,32 @@ public class AtlasMultiTextureActivity extends MarkerOverlayActivity {
         // With iOS we must flip the Y-Axis
         TextureAtlasUtils.createTextureRegions(inputMap, regionsMap, atlasList, true, false);
 
-        mMarkerLayer = new ItemizedLayer<>(mMap, new ArrayList<MarkerItem>(), (MarkerSymbol) null, this);
+        mMarkerLayer = new ItemizedLayer(mMap, new ArrayList<MarkerInterface>(), (MarkerSymbol) null, this);
         mMap.layers().add(mMarkerLayer);
 
         mMarkerLayer.addItems(pts);
 
         // set all markers
-        for (MarkerItem item : pts) {
-            MarkerSymbol markerSymbol = new MarkerSymbol(regionsMap.get(item.getTitle()), HotspotPlace.BOTTOM_CENTER);
-            item.setMarker(markerSymbol);
+        for (MarkerInterface item : pts) {
+            MarkerItem markerItem = (MarkerItem) item;
+            MarkerSymbol markerSymbol = new MarkerSymbol(regionsMap.get(markerItem.getTitle()), HotspotPlace.BOTTOM_CENTER);
+            markerItem.setMarker(markerSymbol);
         }
 
         Toast.makeText(this, "Atlas count: " + atlasList.size(), Toast.LENGTH_SHORT).show();
     }
 
     @Override
-    public boolean onItemSingleTapUp(int index, MarkerItem item) {
-        Toast.makeText(this, "Marker tap\n" + item.getTitle(), Toast.LENGTH_SHORT).show();
+    public boolean onItemSingleTapUp(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        Toast.makeText(this, "Marker tap\n" + markerItem.getTitle(), Toast.LENGTH_SHORT).show();
         return true;
     }
 
     @Override
-    public boolean onItemLongPress(int index, MarkerItem item) {
-        Toast.makeText(this, "Marker long press\n" + item.getTitle(), Toast.LENGTH_SHORT).show();
+    public boolean onItemLongPress(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        Toast.makeText(this, "Marker long press\n" + markerItem.getTitle(), Toast.LENGTH_SHORT).show();
         return true;
     }
 }

vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -20,8 +20,8 @@ package org.oscim.android.test;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-
-import org.oscim.android.cache.TileCache;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
 import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -29,11 +29,10 @@ 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;
+
+import java.io.File;
 
 public class BaseMapActivity extends MapActivity {
-    static final Logger log = LoggerFactory.getLogger(BaseMapActivity.class);
 
     static final boolean USE_CACHE = false;
 
@@ -41,8 +40,6 @@ public class BaseMapActivity extends MapActivity {
     TileSource mTileSource;
     TileGridLayer mGridLayer;
 
-    private TileCache mCache;
-
     public BaseMapActivity(int contentView) {
         super(contentView);
     }
@@ -54,15 +51,19 @@ public class BaseMapActivity extends MapActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        if (USE_CACHE) {
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
+        }
+
         mTileSource = OSciMap4TileSource.builder()
-                .httpFactory(new OkHttpEngine.OkHttpFactory())
+                .httpFactory(new OkHttpEngine.OkHttpFactory(builder))
                 .build();
 
-        if (USE_CACHE) {
-            mCache = new TileCache(this, null, "tile.db");
-            mCache.setCacheSize(512 * (1 << 10));
-            mTileSource.setCache(mCache);
-        }
         mBaseLayer = mMap.setBaseMap(mTileSource);
 
         /* set initial position on first run */
@@ -72,14 +73,6 @@ public class BaseMapActivity extends MapActivity {
             mMap.setMapPosition(53.08, 8.83, Math.pow(2, 16));
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mCache != null)
-            mCache.dispose();
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 

vtm-android-example/src/org/oscim/android/test/BitmapTileActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Hannes Janetzek
- * Copyright 2017-2018 devemux86
+ * Copyright 2017-2020 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
@@ -16,21 +16,21 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-
-import org.oscim.android.cache.TileCache;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
 import org.oscim.core.MercatorProjection;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
+import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.bitmap.BitmapTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.Collections;
 
 public class BitmapTileActivity extends MapActivity {
 
-    static final Logger log = LoggerFactory.getLogger(BitmapTileActivity.class);
-
     private static final boolean USE_CACHE = false;
 
     private final BitmapTileSource mTileSource;
@@ -45,8 +45,6 @@ public class BitmapTileActivity extends MapActivity {
         mTileSource = tileSource;
     }
 
-    private TileCache mCache;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -56,31 +54,24 @@ public class BitmapTileActivity extends MapActivity {
         if (mTileSource == null)
             return;
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
         if (USE_CACHE) {
-            String cacheFile = mTileSource.getUrl()
-                    .toString()
-                    .replaceFirst("https?://", "")
-                    .replaceAll("/", "-");
-
-            log.debug("use bitmap cache {}", cacheFile);
-            mCache = new TileCache(this, null, cacheFile);
-            mCache.setCacheSize(512 * (1 << 10));
-            mTileSource.setCache(mCache);
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
         }
 
+        mTileSource.setHttpEngine(new OkHttpEngine.OkHttpFactory(builder));
+        mTileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-android-example"));
+
         mBitmapLayer = new BitmapTileLayer(mMap, mTileSource);
         mMap.layers().add(mBitmapLayer);
 
         //loooop(1);
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (mCache != null)
-            mCache.dispose();
-    }
-
     // Stress testing
     void loooop(final int i) {
         final long time = (long) (500 + Math.random() * 1000);

vtm-android-example/src/org/oscim/android/test/BlankFragment.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 Meibes
+ *
+ * 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.android.test;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+@SuppressWarnings("deprecation")
+public class BlankFragment extends Fragment {
+
+    static BlankFragment newInstance() {
+        BlankFragment instance = new BlankFragment();
+
+        Bundle args = new Bundle();
+        instance.setArguments(args);
+        return instance;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_blank, container, false);
+    }
+}

vtm-android-example/src/org/oscim/android/test/ClusterMarkerOverlayActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2017 nebular
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -22,11 +22,12 @@ import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeoPoint;
 import org.oscim.layers.marker.*;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ClusterMarkerOverlayActivity extends MarkerOverlayActivity {
@@ -39,9 +40,10 @@ public class ClusterMarkerOverlayActivity extends MarkerOverlayActivity {
         // Map events receiver
         mMap.layers().add(new MapEventsReceiver(mMap));
 
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-android-example"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         Bitmap bitmapPoi = new AndroidBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.marker_poi));
@@ -63,15 +65,15 @@ public class ClusterMarkerOverlayActivity extends MarkerOverlayActivity {
                 };
             }
         };
-        mMarkerLayer = new ItemizedLayer<>(
+        mMarkerLayer = new ItemizedLayer(
                 mMap,
-                new ArrayList<MarkerItem>(),
+                new ArrayList<MarkerInterface>(),
                 markerRendererFactory,
                 this);
         mMap.layers().add(mMarkerLayer);
 
         // Create some markers spaced STEP degrees
-        List<MarkerItem> pts = new ArrayList<>();
+        List<MarkerInterface> pts = new ArrayList<>();
         mMap.setMapPosition(53.08, 8.83, 1 << 15);
         GeoPoint center = mMap.getMapPosition().getGeoPoint();
         for (int x = -COUNT; x < COUNT; x++) {

vtm-android-example/src/org/oscim/android/test/FragmentActivity.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 Meibes
+ *
+ * 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.android.test;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class FragmentActivity extends Activity {
+
+    @SuppressWarnings("deprecation")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_map_fragment);
+
+        setTitle(getClass().getSimpleName());
+
+        if (savedInstanceState == null) {
+            Fragment mapFragment = MapFragment.newInstance();
+            FragmentTransaction ft = getFragmentManager().beginTransaction();
+            ft.add(R.id.fragment_container, mapFragment).commit();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.fragment_menu, menu);
+        return true;
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.replace_fragment) {
+            Fragment blankFragment = BlankFragment.newInstance();
+            FragmentTransaction ft = getFragmentManager().beginTransaction();
+            ft.replace(R.id.fragment_container, blankFragment);
+            ft.addToBackStack(null);
+            ft.commit();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

vtm-android-example/src/org/oscim/android/test/GdxActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2018-2019 Gustl22
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -71,7 +71,7 @@ public class GdxActivity extends AndroidApplication {
         DateTimeAdapter.init(new DateTime());
 
         DisplayMetrics metrics = getResources().getDisplayMetrics();
-        CanvasAdapter.dpi = (int) (metrics.scaledDensity * CanvasAdapter.DEFAULT_DPI);
+        CanvasAdapter.dpi = (int) (metrics.density * CanvasAdapter.DEFAULT_DPI);
         Tile.SIZE = Tile.calculateTileSize();
 
         AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();

vtm-android-example/src/org/oscim/android/test/GettingStarted.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 devemux86
+ * Copyright 2018-2020 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
@@ -15,6 +15,9 @@
 package org.oscim.android.test;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import org.oscim.android.MapView;
 import org.oscim.backend.CanvasAdapter;
@@ -25,24 +28,24 @@ import org.oscim.renderer.GLViewport;
 import org.oscim.scalebar.DefaultMapScaleBar;
 import org.oscim.scalebar.MapScaleBar;
 import org.oscim.scalebar.MapScaleBarLayer;
+import org.oscim.theme.IRenderTheme;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.source.mapfile.MapFileTileSource;
 
-import java.io.File;
+import java.io.FileInputStream;
 
 /**
  * A very basic Android app example.
  * <p>
- * You'll need a map with filename berlin.map from download.mapsforge.org in device storage:
- * /sdcard/Android/data/org.oscim.android.test/files/
+ * You'll need a map with filename berlin.map from download.mapsforge.org in device storage.
  */
 public class GettingStarted extends Activity {
 
-    // Name of the map file in device storage
-    private static final String MAP_FILE = "berlin.map";
+    // Request code for selecting a map file
+    private static final int SELECT_MAP_FILE = 0;
 
     private MapView mapView;
-    private MapScaleBar mapScaleBar;
+    private IRenderTheme theme;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -52,10 +55,30 @@ public class GettingStarted extends Activity {
         mapView = new MapView(this);
         setContentView(mapView);
 
-        // Tile source
-        MapFileTileSource tileSource = new MapFileTileSource();
-        String mapPath = new File(getExternalFilesDir(null), MAP_FILE).getAbsolutePath();
-        if (tileSource.setMapFile(mapPath)) {
+        // Open map
+        Intent intent = new Intent(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        startActivityForResult(intent, SELECT_MAP_FILE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SELECT_MAP_FILE && resultCode == Activity.RESULT_OK) {
+            if (data != null) {
+                Uri uri = data.getData();
+                openMap(uri);
+            }
+        }
+    }
+
+    private void openMap(Uri uri) {
+        try {
+            // Tile source
+            MapFileTileSource tileSource = new MapFileTileSource();
+            FileInputStream fis = (FileInputStream) getContentResolver().openInputStream(uri);
+            tileSource.setMapFileInputStream(fis);
+
             // Vector layer
             VectorTileLayer tileLayer = mapView.map().setBaseMap(tileSource);
 
@@ -66,10 +89,10 @@ public class GettingStarted extends Activity {
             mapView.map().layers().add(new LabelLayer(mapView.map(), tileLayer));
 
             // Render theme
-            mapView.map().setTheme(VtmThemes.DEFAULT);
+            theme = mapView.map().setTheme(VtmThemes.DEFAULT);
 
             // Scale bar
-            mapScaleBar = new DefaultMapScaleBar(mapView.map());
+            MapScaleBar mapScaleBar = new DefaultMapScaleBar(mapView.map());
             MapScaleBarLayer mapScaleBarLayer = new MapScaleBarLayer(mapView.map(), mapScaleBar);
             mapScaleBarLayer.getRenderer().setPosition(GLViewport.Position.BOTTOM_LEFT);
             mapScaleBarLayer.getRenderer().setOffset(5 * CanvasAdapter.getScale(), 0);
@@ -77,6 +100,11 @@ public class GettingStarted extends Activity {
 
             // Note: this map position is specific to Berlin area
             mapView.map().setMapPosition(52.517037, 13.38886, 1 << 12);
+        } catch (Exception e) {
+            /*
+             * In case of map file errors avoid crash, but developers should handle these cases!
+             */
+            e.printStackTrace();
         }
     }
 
@@ -94,9 +122,8 @@ public class GettingStarted extends Activity {
 
     @Override
     protected void onDestroy() {
-        if (mapScaleBar != null)
-            mapScaleBar.destroy();
         mapView.onDestroy();
+        theme.dispose();
         super.onDestroy();
     }
 }

vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java

@@ -22,9 +22,8 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
 import android.widget.ToggleButton;
-
-import org.jeo.map.Style;
-import org.jeo.vector.VectorDataset;
+import io.jeo.map.Style;
+import io.jeo.vector.VectorDataset;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Color;
 import org.oscim.layers.OSMIndoorLayer;

vtm-android-example/src/org/oscim/android/test/MapFragment.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright 2018-2020 devemux86
+ * Copyright 2020 Meibes
+ *
+ * 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.android.test;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import org.oscim.android.MapView;
+import org.oscim.backend.CanvasAdapter;
+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.renderer.GLViewport;
+import org.oscim.scalebar.DefaultMapScaleBar;
+import org.oscim.scalebar.MapScaleBar;
+import org.oscim.scalebar.MapScaleBarLayer;
+import org.oscim.theme.IRenderTheme;
+import org.oscim.theme.VtmThemes;
+import org.oscim.tiling.source.mapfile.MapFileTileSource;
+
+import java.io.File;
+
+/**
+ * You'll need a map with filename berlin.map from download.mapsforge.org in device storage.
+ */
+@SuppressWarnings("deprecation")
+public class MapFragment extends Fragment {
+
+    private MapView mapView;
+    private IRenderTheme theme;
+
+    public static MapFragment newInstance() {
+        MapFragment instance = new MapFragment();
+
+        Bundle args = new Bundle();
+        instance.setArguments(args);
+        return instance;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_map, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mapView = new MapView(getActivity());
+        RelativeLayout relativeLayout = view.findViewById(R.id.mapView);
+        relativeLayout.addView(mapView);
+
+        // Tile source
+        MapFileTileSource tileSource = new MapFileTileSource();
+        File file = new File(getActivity().getExternalFilesDir(null), "berlin.map");
+        tileSource.setMapFile(file.getAbsolutePath());
+
+        // Vector layer
+        VectorTileLayer tileLayer = mapView.map().setBaseMap(tileSource);
+
+        // Building layer
+        mapView.map().layers().add(new BuildingLayer(mapView.map(), tileLayer));
+
+        // Label layer
+        mapView.map().layers().add(new LabelLayer(mapView.map(), tileLayer));
+
+        // Render theme
+        theme = mapView.map().setTheme(VtmThemes.DEFAULT);
+
+        // Scale bar
+        MapScaleBar mapScaleBar = new DefaultMapScaleBar(mapView.map());
+        MapScaleBarLayer mapScaleBarLayer = new MapScaleBarLayer(mapView.map(), mapScaleBar);
+        mapScaleBarLayer.getRenderer().setPosition(GLViewport.Position.BOTTOM_LEFT);
+        mapScaleBarLayer.getRenderer().setOffset(5 * CanvasAdapter.getScale(), 0);
+        mapView.map().layers().add(mapScaleBarLayer);
+
+        // Note: this map position is specific to Berlin area
+        mapView.map().setMapPosition(52.517037, 13.38886, 1 << 12);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mapView != null) {
+            mapView.onResume();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mapView != null) {
+            mapView.onPause();
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        if (mapView != null) {
+            mapView.onDestroy();
+            mapView = null;
+        }
+        if (theme != null) {
+            theme.dispose();
+            theme = null;
+        }
+        super.onDestroyView();
+    }
+}

vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 devemux86
+ * Copyright 2018-2020 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
@@ -16,10 +16,10 @@ package org.oscim.android.test;
 
 import android.os.Build;
 import android.os.Bundle;
+import okhttp3.Cache;
 import okhttp3.CipherSuite;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
-import org.oscim.android.cache.TileCache;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -30,6 +30,7 @@ import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 import org.oscim.tiling.source.mvt.MapilionMvtTileSource;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -41,13 +42,18 @@ public class MapilionMvtActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 
-    private TileCache mCache;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        if (USE_CACHE) {
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
+        }
 
         // https://github.com/square/okhttp/issues/4053
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
@@ -71,13 +77,6 @@ public class MapilionMvtActivity extends MapActivity {
                 //.locale("en")
                 .build();
 
-        if (USE_CACHE) {
-            // Cache the tiles into a local SQLite database
-            mCache = new TileCache(this, null, "tile.db");
-            mCache.setCacheSize(512 * (1 << 10));
-            tileSource.setCache(mCache);
-        }
-
         VectorTileLayer l = mMap.setBaseMap(tileSource);
         mMap.setTheme(VtmThemes.OPENMAPTILES);
 
@@ -91,12 +90,4 @@ public class MapilionMvtActivity extends MapActivity {
         mMap.layers().add(new BuildingLayer(mMap, l));
         mMap.layers().add(new LabelLayer(mMap, l));
     }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mCache != null)
-            mCache.dispose();
-    }
 }

vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java

@@ -1,8 +1,9 @@
 /*
  * Copyright 2014 Hannes Janetzek
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2021 devemux86
  * Copyright 2017 Longri
  * Copyright 2018 Gustl22
+ * Copyright 2021 eddiemuc
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -19,15 +20,18 @@
  */
 package org.oscim.android.test;
 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.DocumentsContract;
 import android.view.Menu;
 import android.view.MenuItem;
-
-import org.oscim.android.filepicker.FilePicker;
-import org.oscim.android.filepicker.FilterByFileExtension;
-import org.oscim.android.filepicker.ValidMapFile;
-import org.oscim.android.filepicker.ValidRenderTheme;
+import org.oscim.android.theme.ContentRenderTheme;
+import org.oscim.android.theme.ContentResolverResourceProvider;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.core.MapElement;
 import org.oscim.core.MapPosition;
@@ -42,34 +46,40 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.renderer.BitmapRenderer;
 import org.oscim.renderer.GLViewport;
 import org.oscim.renderer.bucket.RenderBuckets;
-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.ExternalRenderTheme;
-import org.oscim.theme.ThemeUtils;
-import org.oscim.theme.VtmThemes;
+import org.oscim.scalebar.*;
+import org.oscim.theme.*;
 import org.oscim.theme.styles.AreaStyle;
 import org.oscim.theme.styles.RenderStyle;
 import org.oscim.tiling.source.mapfile.MapFileTileSource;
 import org.oscim.tiling.source.mapfile.MapInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.zip.ZipInputStream;
 
 public class MapsforgeActivity extends MapActivity {
 
+    private static final Logger log = LoggerFactory.getLogger(MapsforgeActivity.class);
+
     static final int SELECT_MAP_FILE = 0;
-    static final int SELECT_THEME_FILE = SELECT_MAP_FILE + 1;
+    private static final int SELECT_THEME_ARCHIVE = 1;
+    private static final int SELECT_THEME_DIR = 2;
+    static final int SELECT_THEME_FILE = 3;
 
     private static final Tag ISSEA_TAG = new Tag("natural", "issea");
     private static final Tag NOSEA_TAG = new Tag("natural", "nosea");
     private static final Tag SEA_TAG = new Tag("natural", "sea");
 
     private TileGridLayer mGridLayer;
-    private DefaultMapScaleBar mMapScaleBar;
     private Menu mMenu;
-    private boolean mS3db;
-    private VectorTileLayer mTileLayer;
-    MapFileTileSource mTileSource;
+    private final boolean mS3db;
+    IRenderTheme mTheme;
+    VectorTileLayer mTileLayer;
+    private Uri mThemeDirUri;
 
     public MapsforgeActivity() {
         this(false);
@@ -89,30 +99,10 @@ public class MapsforgeActivity extends MapActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        startActivityForResult(new Intent(this, MapFilePicker.class),
-                SELECT_MAP_FILE);
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (mMapScaleBar != null)
-            mMapScaleBar.destroy();
-
-        super.onDestroy();
-    }
-
-    public static class MapFilePicker extends FilePicker {
-        public MapFilePicker() {
-            setFileDisplayFilter(new FilterByFileExtension(".map"));
-            setFileSelectFilter(new ValidMapFile());
-        }
-    }
-
-    public static class ThemeFilePicker extends FilePicker {
-        public ThemeFilePicker() {
-            setFileDisplayFilter(new FilterByFileExtension(".xml"));
-            setFileSelectFilter(new ValidRenderTheme());
-        }
+        Intent intent = new Intent(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        startActivityForResult(intent, SELECT_MAP_FILE);
     }
 
     @Override
@@ -127,33 +117,53 @@ public class MapsforgeActivity extends MapActivity {
 
         switch (item.getItemId()) {
             case R.id.theme_default:
-                mMap.setTheme(VtmThemes.DEFAULT);
+                if (mTheme != null)
+                    mTheme.dispose();
+                mTheme = mMap.setTheme(VtmThemes.DEFAULT);
                 item.setChecked(true);
                 return true;
 
             case R.id.theme_osmarender:
-                mMap.setTheme(VtmThemes.OSMARENDER);
+                if (mTheme != null)
+                    mTheme.dispose();
+                mTheme = mMap.setTheme(VtmThemes.OSMARENDER);
                 item.setChecked(true);
                 return true;
 
             case R.id.theme_osmagray:
-                mMap.setTheme(VtmThemes.OSMAGRAY);
+                if (mTheme != null)
+                    mTheme.dispose();
+                mTheme = mMap.setTheme(VtmThemes.OSMAGRAY);
                 item.setChecked(true);
                 return true;
 
             case R.id.theme_tubes:
-                mMap.setTheme(VtmThemes.TRONRENDER);
+                if (mTheme != null)
+                    mTheme.dispose();
+                mTheme = mMap.setTheme(VtmThemes.TRONRENDER);
                 item.setChecked(true);
                 return true;
 
             case R.id.theme_newtron:
-                mMap.setTheme(VtmThemes.NEWTRON);
+                if (mTheme != null)
+                    mTheme.dispose();
+                mTheme = mMap.setTheme(VtmThemes.NEWTRON);
                 item.setChecked(true);
                 return true;
 
+            case R.id.theme_external_archive:
+                Intent intent = new Intent(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_GET_CONTENT);
+                intent.addCategory(Intent.CATEGORY_OPENABLE);
+                intent.setType("*/*");
+                startActivityForResult(intent, SELECT_THEME_ARCHIVE);
+                return true;
+
             case R.id.theme_external:
-                startActivityForResult(new Intent(this, ThemeFilePicker.class),
-                        SELECT_THEME_FILE);
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+                    return false;
+                intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+                intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                startActivityForResult(intent, SELECT_THEME_DIR);
                 return true;
 
             case R.id.gridlayer:
@@ -175,20 +185,23 @@ public class MapsforgeActivity extends MapActivity {
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         if (requestCode == SELECT_MAP_FILE) {
-            if (resultCode != RESULT_OK || intent == null || intent.getStringExtra(FilePicker.SELECTED_FILE) == null) {
+            if (resultCode != Activity.RESULT_OK || data == null) {
                 finish();
                 return;
             }
 
-            mTileSource = new MapFileTileSource();
-            //mTileSource.setPreferredLanguage("en");
-            String file = intent.getStringExtra(FilePicker.SELECTED_FILE);
-            if (mTileSource.setMapFile(file)) {
+            try {
+                Uri uri = data.getData();
 
-                mTileLayer = mMap.setBaseMap(mTileSource);
+                MapFileTileSource tileSource = new MapFileTileSource();
+                //tileSource.setPreferredLanguage("en");
+                FileInputStream fis = (FileInputStream) getContentResolver().openInputStream(uri);
+                tileSource.setMapFileInputStream(fis);
+
+                mTileLayer = mMap.setBaseMap(tileSource);
                 loadTheme(null);
 
                 if (mS3db)
@@ -197,58 +210,114 @@ public class MapsforgeActivity extends MapActivity {
                     mMap.layers().add(new BuildingLayer(mMap, mTileLayer));
                 mMap.layers().add(new LabelLayer(mMap, mTileLayer));
 
-                mMapScaleBar = new DefaultMapScaleBar(mMap);
-                mMapScaleBar.setScaleBarMode(DefaultMapScaleBar.ScaleBarMode.BOTH);
-                mMapScaleBar.setDistanceUnitAdapter(MetricUnitAdapter.INSTANCE);
-                mMapScaleBar.setSecondaryDistanceUnitAdapter(ImperialUnitAdapter.INSTANCE);
-                mMapScaleBar.setScaleBarPosition(MapScaleBar.ScaleBarPosition.BOTTOM_LEFT);
+                DefaultMapScaleBar mapScaleBar = new DefaultMapScaleBar(mMap);
+                mapScaleBar.setScaleBarMode(DefaultMapScaleBar.ScaleBarMode.BOTH);
+                mapScaleBar.setDistanceUnitAdapter(MetricUnitAdapter.INSTANCE);
+                mapScaleBar.setSecondaryDistanceUnitAdapter(ImperialUnitAdapter.INSTANCE);
+                mapScaleBar.setScaleBarPosition(MapScaleBar.ScaleBarPosition.BOTTOM_LEFT);
 
-                MapScaleBarLayer mapScaleBarLayer = new MapScaleBarLayer(mMap, mMapScaleBar);
+                MapScaleBarLayer mapScaleBarLayer = new MapScaleBarLayer(mMap, mapScaleBar);
                 BitmapRenderer renderer = mapScaleBarLayer.getRenderer();
                 renderer.setPosition(GLViewport.Position.BOTTOM_LEFT);
                 renderer.setOffset(5 * CanvasAdapter.getScale(), 0);
                 mMap.layers().add(mapScaleBarLayer);
 
-                MapInfo info = mTileSource.getMapInfo();
+                MapInfo info = tileSource.getMapInfo();
                 if (!info.boundingBox.contains(mMap.getMapPosition().getGeoPoint())) {
                     MapPosition pos = new MapPosition();
                     pos.setByBoundingBox(info.boundingBox, Tile.SIZE * 4, Tile.SIZE * 4);
                     mMap.setMapPosition(pos);
                     mPrefs.clear();
                 }
+            } catch (Exception e) {
+                log.error(e.getMessage());
+                finish();
             }
-        } else if (requestCode == SELECT_THEME_FILE) {
-            if (resultCode != RESULT_OK || intent == null || intent.getStringExtra(FilePicker.SELECTED_FILE) == null) {
+        } else if (requestCode == SELECT_THEME_ARCHIVE) {
+            if (resultCode != Activity.RESULT_OK || data == null)
                 return;
-            }
 
-            String file = intent.getStringExtra(FilePicker.SELECTED_FILE);
-            ExternalRenderTheme externalRenderTheme = new ExternalRenderTheme(file);
+            try {
+                final Uri uri = data.getData();
 
-            // Use tessellation with sea and land for Mapsforge themes
-            if (ThemeUtils.isMapsforgeTheme(externalRenderTheme)) {
-                mTileLayer.addHook(new VectorTileLayer.TileLoaderThemeHook() {
+                final List<String> xmlThemes = ZipXmlThemeResourceProvider.scanXmlThemes(new ZipInputStream(new BufferedInputStream(getContentResolver().openInputStream(uri))));
+                if (xmlThemes.isEmpty())
+                    return;
+
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle(R.string.dialog_theme_title);
+                builder.setSingleChoiceItems(xmlThemes.toArray(new String[0]), -1, new DialogInterface.OnClickListener() {
                     @Override
-                    public boolean process(MapTile tile, RenderBuckets buckets, MapElement element, RenderStyle style, int level) {
-                        if (element.tags.contains(ISSEA_TAG) || element.tags.contains(SEA_TAG) || element.tags.contains(NOSEA_TAG)) {
-                            if (style instanceof AreaStyle)
-                                ((AreaStyle) style).mesh = true;
+                    public void onClick(DialogInterface dialog, int which) {
+                        try {
+                            dialog.dismiss();
+                            ThemeFile theme = new ZipRenderTheme(xmlThemes.get(which), new ZipXmlThemeResourceProvider(new ZipInputStream(new BufferedInputStream(getContentResolver().openInputStream(uri)))));
+                            if (mTheme != null)
+                                mTheme.dispose();
+                            mTheme = mMap.setTheme(theme);
+                            mapsforgeTheme(mTheme);
+                            mMenu.findItem(R.id.theme_external_archive).setChecked(true);
+                        } catch (IOException e) {
+                            e.printStackTrace();
                         }
-                        return false;
-                    }
-
-                    @Override
-                    public void complete(MapTile tile, boolean success) {
                     }
                 });
+                builder.show();
+            } catch (IOException e) {
+                e.printStackTrace();
             }
+        } else if (requestCode == SELECT_THEME_DIR) {
+            if (resultCode != Activity.RESULT_OK || data == null)
+                return;
 
-            mMap.setTheme(externalRenderTheme);
+            mThemeDirUri = data.getData();
+
+            // Now we have the directory for resources, but we need to let the user also select a theme file
+            Intent intent = new Intent(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_GET_CONTENT);
+            intent.addCategory(Intent.CATEGORY_OPENABLE);
+            intent.setType("*/*");
+            intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, mThemeDirUri);
+            startActivityForResult(intent, SELECT_THEME_FILE);
+        } else if (requestCode == SELECT_THEME_FILE) {
+            if (resultCode != Activity.RESULT_OK || data == null)
+                return;
+
+            Uri uri = data.getData();
+            ThemeFile theme = new ContentRenderTheme(getContentResolver(), uri);
+            theme.setResourceProvider(new ContentResolverResourceProvider(getContentResolver(), mThemeDirUri));
+
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(theme);
+            mapsforgeTheme(mTheme);
             mMenu.findItem(R.id.theme_external).setChecked(true);
         }
     }
 
     protected void loadTheme(final String styleId) {
-        mMap.setTheme(VtmThemes.DEFAULT);
+        if (mTheme != null)
+            mTheme.dispose();
+        mTheme = mMap.setTheme(VtmThemes.DEFAULT);
+    }
+
+    private void mapsforgeTheme(IRenderTheme theme) {
+        if (!theme.isMapsforgeTheme())
+            return;
+
+        // Use tessellation with sea and land for Mapsforge themes
+        mTileLayer.addHook(new VectorTileLayer.TileLoaderThemeHook() {
+            @Override
+            public boolean process(MapTile tile, RenderBuckets buckets, MapElement element, RenderStyle style, int level) {
+                if (element.tags.contains(ISSEA_TAG) || element.tags.contains(SEA_TAG) || element.tags.contains(NOSEA_TAG)) {
+                    if (style instanceof AreaStyle)
+                        ((AreaStyle) style).mesh = true;
+                }
+                return false;
+            }
+
+            @Override
+            public void complete(MapTile tile, boolean success) {
+            }
+        });
     }
 }

vtm-android-example/src/org/oscim/android/test/MapsforgeStyleActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2020 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
@@ -17,7 +17,6 @@ package org.oscim.android.test;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
-
 import org.oscim.android.theme.AssetsRenderTheme;
 import org.oscim.theme.XmlRenderThemeMenuCallback;
 import org.oscim.theme.XmlRenderThemeStyleLayer;
@@ -58,7 +57,9 @@ public class MapsforgeStyleActivity extends MapsforgeActivity {
 
     @Override
     protected void loadTheme(final String styleId) {
-        mMap.setTheme(new AssetsRenderTheme(getAssets(), "", "vtm/stylemenu.xml", new XmlRenderThemeMenuCallback() {
+        if (mTheme != null)
+            mTheme.dispose();
+        mTheme = mMap.setTheme(new AssetsRenderTheme(getAssets(), "", "vtm/stylemenu.xml", new XmlRenderThemeMenuCallback() {
             @Override
             public Set<String> getCategories(XmlRenderThemeStyleMenu renderThemeStyleMenu) {
                 // Use the selected style or the default

vtm-android-example/src/org/oscim/android/test/MapzenGeojsonActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 devemux86
+ * Copyright 2017-2020 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
@@ -15,8 +15,8 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-
-import org.oscim.android.cache.TileCache;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -25,41 +25,35 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.geojson.MapzenGeojsonTileSource;
 
+import java.io.File;
+
 public class MapzenGeojsonActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 
-    private TileCache mCache;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        if (USE_CACHE) {
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
+        }
+
         UrlTileSource tileSource = MapzenGeojsonTileSource.builder()
                 .apiKey("xxxxxxx") // Put a proper API key
-                .httpFactory(new OkHttpEngine.OkHttpFactory())
+                .httpFactory(new OkHttpEngine.OkHttpFactory(builder))
                 //.locale("en")
                 .build();
 
-        if (USE_CACHE) {
-            // Cache the tiles into a local SQLite database
-            mCache = new TileCache(this, null, "tile.db");
-            mCache.setCacheSize(512 * (1 << 10));
-            tileSource.setCache(mCache);
-        }
-
         VectorTileLayer l = mMap.setBaseMap(tileSource);
         mMap.setTheme(VtmThemes.MAPZEN);
 
         mMap.layers().add(new BuildingLayer(mMap, l));
         mMap.layers().add(new LabelLayer(mMap, l));
     }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mCache != null)
-            mCache.dispose();
-    }
 }

vtm-android-example/src/org/oscim/android/test/MapzenMvtActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2017 Mathieu De Brito
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -16,8 +16,8 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-
-import org.oscim.android.cache.TileCache;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -26,41 +26,35 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.mvt.MapzenMvtTileSource;
 
+import java.io.File;
+
 public class MapzenMvtActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 
-    private TileCache mCache;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        if (USE_CACHE) {
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
+        }
+
         UrlTileSource tileSource = MapzenMvtTileSource.builder()
                 .apiKey("xxxxxxx") // Put a proper API key
-                .httpFactory(new OkHttpEngine.OkHttpFactory())
+                .httpFactory(new OkHttpEngine.OkHttpFactory(builder))
                 //.locale("en")
                 .build();
 
-        if (USE_CACHE) {
-            // Cache the tiles into a local SQLite database
-            mCache = new TileCache(this, null, "tile.db");
-            mCache.setCacheSize(512 * (1 << 10));
-            tileSource.setCache(mCache);
-        }
-
         VectorTileLayer l = mMap.setBaseMap(tileSource);
         mMap.setTheme(VtmThemes.MAPZEN);
 
         mMap.layers().add(new BuildingLayer(mMap, l));
         mMap.layers().add(new LabelLayer(mMap, l));
     }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mCache != null)
-            mCache.dispose();
-    }
 }

vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Hannes Janetzek
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -28,24 +28,25 @@ import org.oscim.event.GestureListener;
 import org.oscim.event.MotionEvent;
 import org.oscim.layers.Layer;
 import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.map.Map;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-public class MarkerOverlayActivity extends MapActivity
-        implements ItemizedLayer.OnItemGestureListener<MarkerItem> {
+public class MarkerOverlayActivity extends MapActivity implements ItemizedLayer.OnItemGestureListener<MarkerInterface> {
 
     static final boolean BILLBOARDS = true;
     MarkerSymbol mFocusMarker;
-    ItemizedLayer<MarkerItem> mMarkerLayer;
+    ItemizedLayer mMarkerLayer;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -58,9 +59,10 @@ public class MarkerOverlayActivity extends MapActivity
         // Map events receiver
         mMap.layers().add(new MapEventsReceiver(mMap));
 
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-android-example"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         Bitmap bitmapPoi = new AndroidBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.marker_poi));
@@ -76,10 +78,10 @@ public class MarkerOverlayActivity extends MapActivity
         else
             mFocusMarker = new MarkerSymbol(bitmapFocus, HotspotPlace.CENTER, false);
 
-        mMarkerLayer = new ItemizedLayer<>(mMap, new ArrayList<MarkerItem>(), symbol, this);
+        mMarkerLayer = new ItemizedLayer(mMap, new ArrayList<MarkerInterface>(), symbol, this);
         mMap.layers().add(mMarkerLayer);
 
-        List<MarkerItem> pts = new ArrayList<>();
+        List<MarkerInterface> pts = new ArrayList<>();
 
         for (double lat = -90; lat <= 90; lat += 5) {
             for (double lon = -180; lon <= 180; lon += 5)
@@ -98,24 +100,26 @@ public class MarkerOverlayActivity extends MapActivity
     }
 
     @Override
-    public boolean onItemSingleTapUp(int index, MarkerItem item) {
-        if (item.getMarker() == null)
-            item.setMarker(mFocusMarker);
+    public boolean onItemSingleTapUp(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        if (markerItem.getMarker() == null)
+            markerItem.setMarker(mFocusMarker);
         else
-            item.setMarker(null);
+            markerItem.setMarker(null);
 
-        Toast.makeText(this, "Marker tap\n" + item.getTitle(), Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "Marker tap\n" + markerItem.getTitle(), Toast.LENGTH_SHORT).show();
         return true;
     }
 
     @Override
-    public boolean onItemLongPress(int index, MarkerItem item) {
-        if (item.getMarker() == null)
-            item.setMarker(mFocusMarker);
+    public boolean onItemLongPress(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        if (markerItem.getMarker() == null)
+            markerItem.setMarker(mFocusMarker);
         else
-            item.setMarker(null);
+            markerItem.setMarker(null);
 
-        Toast.makeText(this, "Marker long press\n" + item.getTitle(), Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "Marker long press\n" + markerItem.getTitle(), Toast.LENGTH_SHORT).show();
         return true;
     }
 

vtm-android-example/src/org/oscim/android/test/NextzenGeojsonActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 devemux86
+ * Copyright 2018-2020 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
@@ -15,8 +15,8 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-
-import org.oscim.android.cache.TileCache;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -25,41 +25,35 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.geojson.NextzenGeojsonTileSource;
 
+import java.io.File;
+
 public class NextzenGeojsonActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 
-    private TileCache mCache;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        if (USE_CACHE) {
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
+        }
+
         UrlTileSource tileSource = NextzenGeojsonTileSource.builder()
                 .apiKey("xxxxxxx") // Put a proper API key
-                .httpFactory(new OkHttpEngine.OkHttpFactory())
+                .httpFactory(new OkHttpEngine.OkHttpFactory(builder))
                 //.locale("en")
                 .build();
 
-        if (USE_CACHE) {
-            // Cache the tiles into a local SQLite database
-            mCache = new TileCache(this, null, "tile.db");
-            mCache.setCacheSize(512 * (1 << 10));
-            tileSource.setCache(mCache);
-        }
-
         VectorTileLayer l = mMap.setBaseMap(tileSource);
         mMap.setTheme(VtmThemes.MAPZEN);
 
         mMap.layers().add(new BuildingLayer(mMap, l));
         mMap.layers().add(new LabelLayer(mMap, l));
     }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mCache != null)
-            mCache.dispose();
-    }
 }

vtm-android-example/src/org/oscim/android/test/NextzenMvtActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 devemux86
+ * Copyright 2018-2020 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
@@ -15,8 +15,8 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-
-import org.oscim.android.cache.TileCache;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -25,41 +25,35 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.mvt.NextzenMvtTileSource;
 
+import java.io.File;
+
 public class NextzenMvtActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 
-    private TileCache mCache;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        if (USE_CACHE) {
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
+        }
+
         UrlTileSource tileSource = NextzenMvtTileSource.builder()
                 .apiKey("xxxxxxx") // Put a proper API key
-                .httpFactory(new OkHttpEngine.OkHttpFactory())
+                .httpFactory(new OkHttpEngine.OkHttpFactory(builder))
                 //.locale("en")
                 .build();
 
-        if (USE_CACHE) {
-            // Cache the tiles into a local SQLite database
-            mCache = new TileCache(this, null, "tile.db");
-            mCache.setCacheSize(512 * (1 << 10));
-            tileSource.setCache(mCache);
-        }
-
         VectorTileLayer l = mMap.setBaseMap(tileSource);
         mMap.setTheme(VtmThemes.MAPZEN);
 
         mMap.layers().add(new BuildingLayer(mMap, l));
         mMap.layers().add(new LabelLayer(mMap, l));
     }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mCache != null)
-            mCache.dispose();
-    }
 }

vtm-android-example/src/org/oscim/android/test/OpenMapTilesMvtActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 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
@@ -15,8 +15,8 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-
-import org.oscim.android.cache.TileCache;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -25,41 +25,35 @@ import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.mvt.OpenMapTilesMvtTileSource;
 
+import java.io.File;
+
 public class OpenMapTilesMvtActivity extends MapActivity {
 
     private static final boolean USE_CACHE = false;
 
-    private TileCache mCache;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        if (USE_CACHE) {
+            // Cache the tiles into file system
+            File cacheDirectory = new File(getExternalCacheDir(), "tiles");
+            int cacheSize = 10 * 1024 * 1024; // 10 MB
+            Cache cache = new Cache(cacheDirectory, cacheSize);
+            builder.cache(cache);
+        }
+
         UrlTileSource tileSource = OpenMapTilesMvtTileSource.builder()
                 .apiKey("xxxxxxx") // Put a proper API key
-                .httpFactory(new OkHttpEngine.OkHttpFactory())
+                .httpFactory(new OkHttpEngine.OkHttpFactory(builder))
                 //.locale("en")
                 .build();
 
-        if (USE_CACHE) {
-            // Cache the tiles into a local SQLite database
-            mCache = new TileCache(this, null, "tile.db");
-            mCache.setCacheSize(512 * (1 << 10));
-            tileSource.setCache(mCache);
-        }
-
         VectorTileLayer l = mMap.setBaseMap(tileSource);
         mMap.setTheme(VtmThemes.OPENMAPTILES);
 
         mMap.layers().add(new BuildingLayer(mMap, l));
         mMap.layers().add(new LabelLayer(mMap, l));
     }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mCache != null)
-            mCache.dispose();
-    }
 }

vtm-android-example/src/org/oscim/android/test/OverpassActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 Gustl22
+ * Copyright 2020 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
@@ -15,7 +16,6 @@
 package org.oscim.android.test;
 
 import android.os.Bundle;
-
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.buildings.S3DBLayer;
@@ -25,9 +25,12 @@ import org.oscim.map.Viewport;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 import org.oscim.tiling.source.overpass.OverpassTileSource;
 
+import java.util.Collections;
+
 /**
  * Use Overpass API data for vector layer.
  * Only for developing as can be error-prone.
@@ -46,7 +49,7 @@ public class OverpassActivity extends MapActivity {
                 .build();
         VectorTileLayer l = mMap.setBaseMap(tileSource);
 
-        TileSource bitmapTileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource bitmapTileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .zoomMax(15)
                 .fadeSteps(new BitmapTileLayer.FadeStep[]{
@@ -54,6 +57,7 @@ public class OverpassActivity extends MapActivity {
                         new BitmapTileLayer.FadeStep(16, Viewport.MAX_ZOOM_LEVEL, 0f, 0f)
                 })
                 .build();
+        bitmapTileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-android-example"));
         mMap.layers().add(new BitmapTileLayer(mMap, bitmapTileSource));
 
         BuildingLayer.RAW_DATA = true;

vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 devemux86
+ * Copyright 2017-2020 devemux86
  * Copyright 2018 Gustl22
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -41,6 +41,7 @@ import org.oscim.event.GestureListener;
 import org.oscim.event.MotionEvent;
 import org.oscim.layers.Layer;
 import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.map.Map;
@@ -57,14 +58,14 @@ import java.util.List;
  * Long press on map to search inside visible bounding box.<br/>
  * Tap on POIs to show their name (in default locale).
  */
-public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLayer.OnItemGestureListener<MarkerItem> {
+public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLayer.OnItemGestureListener<MarkerInterface> {
 
     private static final Logger log = LoggerFactory.getLogger(PoiSearchActivity.class);
 
     private static final String POI_CATEGORY = "Restaurants";
     private static final int SELECT_POI_FILE = MapsforgeActivity.SELECT_THEME_FILE + 1;
 
-    private ItemizedLayer<MarkerItem> mMarkerLayer;
+    private ItemizedLayer mMarkerLayer;
     private PoiPersistenceManager mPersistenceManager;
 
     public static class PoiFilePicker extends FilePicker {
@@ -138,7 +139,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
         super.onActivityResult(requestCode, resultCode, intent);
 
         if (requestCode == SELECT_MAP_FILE) {
-            if (mTileSource != null)
+            if (mTileLayer.getTileSource() != null)
                 startActivityForResult(new Intent(this, PoiFilePicker.class),
                         SELECT_POI_FILE);
             else
@@ -154,19 +155,20 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
 
             Bitmap bitmap = new AndroidBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.marker_green));
             MarkerSymbol symbol = new MarkerSymbol(bitmap, MarkerSymbol.HotspotPlace.BOTTOM_CENTER);
-            mMarkerLayer = new ItemizedLayer<>(mMap, new ArrayList<MarkerItem>(), symbol, this);
+            mMarkerLayer = new ItemizedLayer(mMap, new ArrayList<MarkerInterface>(), symbol, this);
             mMap.layers().add(mMarkerLayer);
         }
     }
 
     @Override
-    public boolean onItemSingleTapUp(int index, MarkerItem item) {
-        Toast.makeText(this, item.getTitle(), Toast.LENGTH_SHORT).show();
+    public boolean onItemSingleTapUp(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        Toast.makeText(this, markerItem.getTitle(), Toast.LENGTH_SHORT).show();
         return true;
     }
 
     @Override
-    public boolean onItemLongPress(int index, MarkerItem item) {
+    public boolean onItemLongPress(int index, MarkerInterface item) {
         return false;
     }
 
@@ -315,7 +317,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
             }
 
             // Overlay POI
-            List<MarkerItem> pts = new ArrayList<>();
+            List<MarkerInterface> pts = new ArrayList<>();
             for (PointOfInterest pointOfInterest : pointOfInterests)
                 pts.add(new MarkerItem(pointOfInterest.getName(), "", new GeoPoint(pointOfInterest.getLatitude(), pointOfInterest.getLongitude())));
             mMarkerLayer.addItems(pts);

vtm-android-example/src/org/oscim/android/test/ReverseGeocodeActivity.java

@@ -97,7 +97,7 @@ public class ReverseGeocodeActivity extends MapsforgeActivity {
                 int tileYMax = MercatorProjection.pixelYToTileY(pixelY + touchRadius, (byte) mMap.getMapPosition().getZoomLevel());
                 Tile upperLeft = new Tile(tileXMin, tileYMin, (byte) mMap.getMapPosition().getZoomLevel());
                 Tile lowerRight = new Tile(tileXMax, tileYMax, (byte) mMap.getMapPosition().getZoomLevel());
-                MapReadResult mapReadResult = ((MapDatabase) ((OverzoomTileDataSource) mTileSource.getDataSource()).getDataSource()).readLabels(upperLeft, lowerRight);
+                MapReadResult mapReadResult = ((MapDatabase) ((OverzoomTileDataSource) mTileLayer.getTileSource().getDataSource()).getDataSource()).readLabels(upperLeft, lowerRight);
 
                 StringBuilder sb = new StringBuilder();
 

vtm-android-example/src/org/oscim/android/test/Samples.java

@@ -1,7 +1,7 @@
 /*
  * Copyright 2010, 2011, 2012, 2013 mapsforge.org
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2016 mar-v-in
  * Copyright 2016 Mathieu de Brito
  * Copyright 2017-2018 Longri
@@ -28,7 +28,6 @@ package org.oscim.android.test;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.Gravity;
@@ -87,8 +86,8 @@ public class Samples extends Activity {
         LinearLayout linearLayout = findViewById(R.id.samples);
         linearLayout.addView(createButton(GettingStarted.class));
         linearLayout.addView(createLabel(null));
-        linearLayout.addView(createButton(SimpleMapActivity.class));
         linearLayout.addView(createButton(MapsforgeActivity.class));
+        linearLayout.addView(createButton(SimpleMapActivity.class));
         linearLayout.addView(createButton(MBTilesMvtActivity.class));
         linearLayout.addView(createButton(MapilionMvtActivity.class));
         /*linearLayout.addView(createButton(MapzenMvtActivity.class));
@@ -99,12 +98,6 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(GdxActivity.class));
 
         linearLayout.addView(createLabel("Features"));
-        linearLayout.addView(createButton(null, "GraphHopper Routing", new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/graphhopper/graphhopper/tree/master/android")));
-            }
-        }));
         linearLayout.addView(createButton(LocationActivity.class));
         linearLayout.addView(createButton(LocationTextureActivity.class));
         linearLayout.addView(createButton(PoiSearchActivity.class));
@@ -132,5 +125,6 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(GdxPoi3DActivity.class));
         linearLayout.addView(createButton(OverpassActivity.class));
         linearLayout.addView(createButton(ClusterMarkerOverlayActivity.class));
+        linearLayout.addView(createButton(FragmentActivity.class));
     }
 }

vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java

@@ -38,7 +38,6 @@ import org.oscim.theme.ThemeLoader;
 import org.oscim.theme.VtmThemes;
 
 public class SimpleMapActivity extends BaseMapActivity {
-    private DefaultMapScaleBar mapScaleBar;
 
     BuildingLayer mBuildingLayer;
     private boolean mShadow;
@@ -71,7 +70,7 @@ public class SimpleMapActivity extends BaseMapActivity {
         groupLayer.layers.add(new LabelLayer(mMap, mBaseLayer));
         mMap.layers().add(groupLayer);
 
-        mapScaleBar = new DefaultMapScaleBar(mMap);
+        DefaultMapScaleBar mapScaleBar = new DefaultMapScaleBar(mMap);
         mapScaleBar.setScaleBarMode(DefaultMapScaleBar.ScaleBarMode.BOTH);
         mapScaleBar.setDistanceUnitAdapter(MetricUnitAdapter.INSTANCE);
         mapScaleBar.setSecondaryDistanceUnitAdapter(ImperialUnitAdapter.INSTANCE);
@@ -86,14 +85,6 @@ public class SimpleMapActivity extends BaseMapActivity {
         mMap.setTheme(VtmThemes.DEFAULT);
     }
 
-    @Override
-    protected void onDestroy() {
-        if (mapScaleBar != null)
-            mapScaleBar.destroy();
-
-        super.onDestroy();
-    }
-
     void runTheMonkey() {
         themes[0] = ThemeLoader.load(VtmThemes.DEFAULT);
         themes[1] = ThemeLoader.load(VtmThemes.OSMARENDER);

vtm-android/src/org/oscim/android/MapView.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2012 Hannes Janetzek
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2018-2019 Gustl22
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -112,7 +112,7 @@ public class MapView extends GLSurfaceView {
         DateTimeAdapter.init(new DateTime());
 
         DisplayMetrics metrics = getResources().getDisplayMetrics();
-        CanvasAdapter.dpi = (int) (metrics.scaledDensity * CanvasAdapter.DEFAULT_DPI);
+        CanvasAdapter.dpi = (int) (metrics.density * CanvasAdapter.DEFAULT_DPI);
         if (!Parameters.CUSTOM_TILE_SIZE)
             Tile.SIZE = Tile.calculateTileSize();
 

vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java

@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016 Longri
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2021 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -22,7 +22,6 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
-
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.utils.GraphicUtils;
 import org.oscim.utils.IOUtils;
@@ -39,6 +38,7 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
         Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
         try {
             GLUtils.getType(bitmap);
+            GLUtils.getInternalFormat(bitmap);
         } catch (IllegalArgumentException e) {
             bitmap = bitmap.copy(ARGB_8888, false);
         }
@@ -95,6 +95,9 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
 
     @Override
     public void uploadToTexture(boolean replace) {
+        if (mBitmap.isRecycled())
+            return;
+
         int format = GLUtils.getInternalFormat(mBitmap);
         int type = GLUtils.getType(mBitmap);
 

vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java

@@ -30,6 +30,7 @@ import org.oscim.backend.canvas.Canvas;
 import org.oscim.backend.canvas.Paint;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
+import org.oscim.theme.XmlThemeResourceProvider;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -69,8 +70,8 @@ public final class AndroidGraphics extends CanvasAdapter {
     }
 
     @Override
-    public Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, int width, int height, int percent) throws IOException {
-        return createBitmap(relativePathPrefix, src, width, height, percent);
+    public Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, XmlThemeResourceProvider resourceProvider, int width, int height, int percent) throws IOException {
+        return createBitmap(relativePathPrefix, src, resourceProvider, width, height, percent);
     }
 
     @Override

vtm-android/src/org/oscim/android/theme/AssetsRenderTheme.java

@@ -1,7 +1,8 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2021 devemux86
  * Copyright 2017 Andrey Novikov
+ * Copyright 2021 eddiemuc
  *
  * 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
@@ -18,11 +19,10 @@ package org.oscim.android.theme;
 
 import android.content.res.AssetManager;
 import android.text.TextUtils;
-
 import org.oscim.theme.IRenderTheme.ThemeException;
 import org.oscim.theme.ThemeFile;
-import org.oscim.theme.ThemeUtils;
 import org.oscim.theme.XmlRenderThemeMenuCallback;
+import org.oscim.theme.XmlThemeResourceProvider;
 import org.oscim.utils.Utils;
 
 import java.io.IOException;
@@ -37,8 +37,10 @@ public class AssetsRenderTheme implements ThemeFile {
 
     private final AssetManager mAssetManager;
     private final String mFileName;
+    private boolean mMapsforgeTheme;
     private XmlRenderThemeMenuCallback mMenuCallback;
     private final String mRelativePathPrefix;
+    private XmlThemeResourceProvider mResourceProvider;
 
     /**
      * @param assetManager       the Android asset manager.
@@ -100,13 +102,28 @@ public class AssetsRenderTheme implements ThemeFile {
         }
     }
 
+    @Override
+    public XmlThemeResourceProvider getResourceProvider() {
+        return mResourceProvider;
+    }
+
     @Override
     public boolean isMapsforgeTheme() {
-        return ThemeUtils.isMapsforgeTheme(this);
+        return mMapsforgeTheme;
+    }
+
+    @Override
+    public void setMapsforgeTheme(boolean mapsforgeTheme) {
+        mMapsforgeTheme = mapsforgeTheme;
     }
 
     @Override
     public void setMenuCallback(XmlRenderThemeMenuCallback menuCallback) {
         mMenuCallback = menuCallback;
     }
+
+    @Override
+    public void setResourceProvider(XmlThemeResourceProvider resourceProvider) {
+        mResourceProvider = resourceProvider;
+    }
 }

vtm-android/src/org/oscim/android/theme/ContentRenderTheme.java

@@ -0,0 +1,119 @@
+/*
+ * Copyright 2020-2021 devemux86
+ * Copyright 2021 eddiemuc
+ *
+ * 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.android.theme;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+import org.oscim.theme.IRenderTheme.ThemeException;
+import org.oscim.theme.ThemeFile;
+import org.oscim.theme.XmlRenderThemeMenuCallback;
+import org.oscim.theme.XmlThemeResourceProvider;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * An ContentRenderTheme allows for customizing the rendering style of the map
+ * via an XML from the Android content providers.
+ */
+public class ContentRenderTheme implements ThemeFile {
+    private static final long serialVersionUID = 1L;
+
+    private final ContentResolver mContentResolver;
+    private boolean mMapsforgeTheme;
+    private XmlRenderThemeMenuCallback mMenuCallback;
+    private XmlThemeResourceProvider mResourceProvider;
+    private final Uri mUri;
+
+    /**
+     * @param contentResolver the Android content resolver.
+     * @param uri             the XML render theme URI.
+     * @throws ThemeException if an error occurs while reading the render theme XML.
+     */
+    public ContentRenderTheme(ContentResolver contentResolver, Uri uri) throws ThemeException {
+        this(contentResolver, uri, null);
+    }
+
+    /**
+     * @param contentResolver the Android content resolver.
+     * @param uri             the XML render theme URI.
+     * @param menuCallback    the interface callback to create a settings menu on the fly.
+     * @throws ThemeException if an error occurs while reading the render theme XML.
+     */
+    public ContentRenderTheme(ContentResolver contentResolver, Uri uri, XmlRenderThemeMenuCallback menuCallback) throws ThemeException {
+        mContentResolver = contentResolver;
+        mUri = uri;
+        mMenuCallback = menuCallback;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (!(obj instanceof ContentRenderTheme)) {
+            return false;
+        }
+        ContentRenderTheme other = (ContentRenderTheme) obj;
+        if (getRenderThemeAsStream() != other.getRenderThemeAsStream()) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public XmlRenderThemeMenuCallback getMenuCallback() {
+        return mMenuCallback;
+    }
+
+    @Override
+    public String getRelativePathPrefix() {
+        return "";
+    }
+
+    @Override
+    public InputStream getRenderThemeAsStream() throws ThemeException {
+        try {
+            return mContentResolver.openInputStream(mUri);
+        } catch (IOException e) {
+            throw new ThemeException(e.getMessage());
+        }
+    }
+
+    @Override
+    public XmlThemeResourceProvider getResourceProvider() {
+        return mResourceProvider;
+    }
+
+    @Override
+    public boolean isMapsforgeTheme() {
+        return mMapsforgeTheme;
+    }
+
+    @Override
+    public void setMapsforgeTheme(boolean mapsforgeTheme) {
+        mMapsforgeTheme = mapsforgeTheme;
+    }
+
+    @Override
+    public void setMenuCallback(XmlRenderThemeMenuCallback menuCallback) {
+        mMenuCallback = menuCallback;
+    }
+
+    @Override
+    public void setResourceProvider(XmlThemeResourceProvider resourceProvider) {
+        mResourceProvider = resourceProvider;
+    }
+}

vtm-android/src/org/oscim/android/theme/ContentResolverResourceProvider.java

@@ -0,0 +1,179 @@
+/*
+ * Copyright 2021 eddiemuc
+ *
+ * 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.android.theme;
+
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.DocumentsContract;
+import org.oscim.backend.CanvasAdapter;
+import org.oscim.theme.XmlThemeResourceProvider;
+import org.oscim.utils.IOUtils;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * An xml theme resource provider resolving resources using Android scoped storage (document framework).
+ * <p>
+ * Implementation note: these methods do not use DocumentFile internally,
+ * but query directly for document info due to vastly better performance.
+ * Also for better performance, this implementation caches resource uris.
+ * <p>
+ * Note: this implementation requires minimum Android 5.0 (API 21)
+ */
+public class ContentResolverResourceProvider implements XmlThemeResourceProvider {
+
+    private final ContentResolver contentResolver;
+    private final Uri relativeRootUri;
+    private final boolean isDocumentUri;
+
+    private final Map<String, Uri> resourceUriCache = new HashMap<>();
+
+    private static class DocumentInfo {
+        private final String name;
+        private final Uri uri;
+        private final boolean isDirectory;
+
+        private DocumentInfo(String name, Uri uri, boolean isDirectory) {
+            this.name = name;
+            this.uri = uri;
+            this.isDirectory = isDirectory;
+        }
+    }
+
+    /**
+     * Creates a new content resolver resource provider.
+     *
+     * @param contentResolver content resolver used to read content.
+     * @param relativeRootUri uri pointing to a directory.
+     *                        Uri is assumed to be a pure tree Uri (as e.g. returned by {@link Intent#ACTION_OPEN_DOCUMENT_TREE}).
+     */
+    public ContentResolverResourceProvider(ContentResolver contentResolver, Uri relativeRootUri) {
+        this(contentResolver, relativeRootUri, false);
+    }
+
+    /**
+     * Creates a new content resolver resource provider.
+     *
+     * @param contentResolver content resolver used to read content.
+     * @param relativeRootUri uri pointing to a directory.
+     * @param isDocumentUri   Uris as returned e.g. by {@link Intent#ACTION_OPEN_DOCUMENT_TREE}) cannot directly be used to scan directories and read content.
+     *                        They must be converted to document uris first using {@link DocumentsContract#buildChildDocumentsUriUsingTree(Uri, String)}.
+     *                        However, in some situations this conversion was done previously by caller (e.g. if root dir should be subdirectory of a directory returned by {@link Intent#ACTION_OPEN_DOCUMENT_TREE}).
+     *                        In these cases, converted Uri will point to original root directory which is not always the wanted behaviour.
+     *                        Thus, this parameter allows caller to control whether conversion should be done or not.
+     *                        If set to true, then given Uri is considered to be a document uri already and no conversion is done.
+     *                        If set to false, uri is considered to be a pure tree uri as returned e.g. by {@link Intent#ACTION_OPEN_DOCUMENT_TREE}) and it is converted.
+     */
+    public ContentResolverResourceProvider(ContentResolver contentResolver, Uri relativeRootUri, boolean isDocumentUri) {
+        this.contentResolver = contentResolver;
+        this.relativeRootUri = relativeRootUri;
+        this.isDocumentUri = isDocumentUri;
+
+        refreshCache();
+    }
+
+    /**
+     * Build uri cache for one dir level (recursive function).
+     */
+    private void buildCacheLevel(String prefix, Uri dirUri) {
+        List<DocumentInfo> docs = queryDir(dirUri);
+        for (DocumentInfo doc : docs) {
+            if (doc.isDirectory) {
+                buildCacheLevel(prefix + doc.name + "/", doc.uri);
+            } else {
+                // Store both relative urls and absolute urls
+                resourceUriCache.put(CanvasAdapter.PREFIX_FILE + prefix + doc.name, doc.uri);
+                resourceUriCache.put(CanvasAdapter.PREFIX_FILE + "/" + prefix + doc.name, doc.uri);
+            }
+        }
+    }
+
+    @Override
+    public InputStream createInputStream(String relativePath, String source) throws FileNotFoundException {
+        Uri docUri = resourceUriCache.get(source);
+        if (docUri != null) {
+            return contentResolver.openInputStream(docUri);
+        }
+        return null;
+    }
+
+    /**
+     * Query the content of a directory using scoped storage.
+     *
+     * @return a list of arrays with info [0: name (String), 1: uri (Uri), 2: isDir (boolean)]
+     */
+    private List<DocumentInfo> queryDir(Uri dirUri) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return Collections.emptyList();
+        }
+        if (dirUri == null) {
+            return Collections.emptyList();
+        }
+
+        List<DocumentInfo> result = new ArrayList<>();
+        Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(dirUri, DocumentsContract.getDocumentId(dirUri));
+
+        String[] columns = new String[]{
+                DocumentsContract.Document.COLUMN_DOCUMENT_ID,
+                DocumentsContract.Document.COLUMN_DISPLAY_NAME,
+                DocumentsContract.Document.COLUMN_MIME_TYPE
+        };
+
+        Cursor c = null;
+        try {
+            c = contentResolver.query(childrenUri, columns, null, null, null);
+
+            while (c.moveToNext()) {
+                String documentId = c.getString(0);
+                String name = c.getString(1);
+                String mimeType = c.getString(2);
+
+                Uri uri = DocumentsContract.buildDocumentUriUsingTree(dirUri, documentId);
+                boolean isDir = DocumentsContract.Document.MIME_TYPE_DIR.equals(mimeType);
+                result.add(new DocumentInfo(name, uri, isDir));
+            }
+
+            return result;
+        } finally {
+            IOUtils.closeQuietly(c);
+        }
+    }
+
+    /**
+     * Refresh the uri cache by recreating it.
+     */
+    private void refreshCache() {
+        resourceUriCache.clear();
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return;
+        }
+        if (relativeRootUri == null) {
+            return;
+        }
+
+        Uri dirUri = relativeRootUri;
+        if (!isDocumentUri) {
+            // Convert "tree uri" to a "document uri"
+            dirUri = DocumentsContract.buildDocumentUriUsingTree(dirUri, DocumentsContract.getTreeDocumentId(dirUri));
+        }
+        buildCacheLevel("", dirUri);
+    }
+}

vtm-app/AndroidManifest.xml

@@ -15,6 +15,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/application_name"
+        android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true">
 
         <!-- android:theme="@style/Theme.TileMap" -->

vtm-app/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     implementation project(':vtm-extras')
     implementation project(':vtm-themes')
     // https://github.com/square/okhttp/issues/4481
-    implementation 'com.squareup.okhttp3:okhttp:3.12.5'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.13'
     implementation "org.slf4j:slf4j-android:$slf4jVersion"
 }
 

vtm-app/src/org/oscim/app/MapLayers.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.util.Collections;
 
 public class MapLayers {
 
@@ -183,7 +184,9 @@ public class MapLayers {
 
         switch (id) {
             case R.id.menu_layer_openstreetmap:
-                mBackgroundLayer = new BitmapTileLayer(App.map, DefaultSources.OPENSTREETMAP.build());
+                UrlTileSource tileSource = DefaultSources.OPENSTREETMAP.build();
+                tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
+                mBackgroundLayer = new BitmapTileLayer(App.map, tileSource);
                 break;
 
             case R.id.menu_layer_naturalearth:

vtm-app/src/org/oscim/app/POISearch.java

@@ -23,19 +23,14 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
-
 import org.oscim.android.canvas.AndroidGraphics;
 import org.oscim.core.BoundingBox;
 import org.oscim.core.GeoPoint;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
 import org.oscim.map.Map;
-import org.osmdroid.location.FlickrPOIProvider;
-import org.osmdroid.location.FourSquareProvider;
-import org.osmdroid.location.GeoNamesPOIProvider;
-import org.osmdroid.location.NominatimPOIProvider;
-import org.osmdroid.location.POI;
-import org.osmdroid.location.PicasaPOIProvider;
+import org.osmdroid.location.*;
 import org.osmdroid.overlays.DefaultInfoWindow;
 import org.osmdroid.overlays.ExtendedMarkerItem;
 import org.osmdroid.overlays.ItemizedOverlayWithBubble;
@@ -45,7 +40,7 @@ import java.util.List;
 
 public class POISearch {
     private final ArrayList<POI> mPOIs;
-    ItemizedOverlayWithBubble<ExtendedMarkerItem> poiMarkers;
+    ItemizedOverlayWithBubble poiMarkers;
     MarkerSymbol[] mMarkers;
 
     private static final int MDEFAULT = 0;
@@ -57,9 +52,9 @@ public class POISearch {
     POISearch() {
         mPOIs = new ArrayList<POI>();
         //POI markers:
-        final ArrayList<ExtendedMarkerItem> poiItems = new ArrayList<ExtendedMarkerItem>();
+        final ArrayList<MarkerInterface> poiItems = new ArrayList<>();
 
-        poiMarkers = new ItemizedOverlayWithBubble<ExtendedMarkerItem>(App.map,
+        poiMarkers = new ItemizedOverlayWithBubble(App.map,
                 App.activity,
                 null,
                 poiItems,

vtm-app/src/org/oscim/app/RouteSearch.java

@@ -24,10 +24,10 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-
 import org.oscim.android.canvas.AndroidGraphics;
 import org.oscim.core.GeoPoint;
 import org.oscim.layers.PathLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
 import org.osmdroid.location.GeocoderNominatim;
@@ -48,7 +48,7 @@ public class RouteSearch {
 
     private final PathLayer mRouteOverlay;
     //private final ItemizedOverlayWithBubble<ExtendedOverlayItem> mRouteMarkers;
-    private final ItemizedOverlayWithBubble<ExtendedMarkerItem> mItineraryMarkers;
+    private final ItemizedOverlayWithBubble mItineraryMarkers;
 
     private final RouteBar mRouteBar;
 
@@ -63,9 +63,9 @@ public class RouteSearch {
         mViaPoints = new ArrayList<GeoPoint>();
 
         // Itinerary markers:
-        ArrayList<ExtendedMarkerItem> waypointsItems = new ArrayList<ExtendedMarkerItem>();
+        ArrayList<MarkerInterface> waypointsItems = new ArrayList<>();
 
-        mItineraryMarkers = new ItemizedOverlayWithBubble<ExtendedMarkerItem>(App.map,
+        mItineraryMarkers = new ItemizedOverlayWithBubble(App.map,
                 App.activity,
                 null,
                 waypointsItems,

vtm-app/src/org/oscim/app/filefilter/ValidRenderTheme.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2016 devemux86
+ * Copyright 2016-2020 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
@@ -15,40 +15,30 @@
  */
 package org.oscim.app.filefilter;
 
-import org.oscim.theme.ExternalRenderTheme;
-import org.oscim.theme.ThemeFile;
-import org.oscim.theme.XmlThemeBuilder;
+import org.oscim.theme.ThemeLoader;
 import org.oscim.tiling.TileSource.OpenResult;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
 
 import java.io.File;
 
-import javax.xml.parsers.SAXParserFactory;
-
 /**
  * Accepts all valid render theme XML files.
  */
 public final class ValidRenderTheme implements ValidFileFilter {
-    private OpenResult openResult;
+    private OpenResult mOpenResult;
 
     @Override
     public boolean accept(File file) {
         try {
-            ThemeFile theme = new ExternalRenderTheme(file.getAbsolutePath());
-            XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder(theme);
-            XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
-            xmlReader.setContentHandler(renderThemeHandler);
-            xmlReader.parse(new InputSource(theme.getRenderThemeAsStream()));
-            this.openResult = OpenResult.SUCCESS;
+            ThemeLoader.load(file.getAbsolutePath());
+            mOpenResult = OpenResult.SUCCESS;
         } catch (Exception e) {
-            this.openResult = new OpenResult(e.getMessage());
+            mOpenResult = new OpenResult(e.getMessage());
         }
-        return this.openResult.isSuccess();
+        return mOpenResult.isSuccess();
     }
 
     @Override
     public OpenResult getFileOpenResult() {
-        return this.openResult;
+        return mOpenResult;
     }
 }

vtm-app/src/org/osmdroid/overlays/ItemizedOverlayWithBubble.java

@@ -2,7 +2,6 @@ package org.osmdroid.overlays;
 
 import android.content.Context;
 import android.util.Log;
-
 import org.oscim.app.App;
 import org.oscim.core.GeoPoint;
 import org.oscim.core.MapPosition;
@@ -10,6 +9,7 @@ import org.oscim.core.Point;
 import org.oscim.event.Event;
 import org.oscim.event.MotionEvent;
 import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.map.Map;
@@ -22,14 +22,12 @@ import java.util.List;
  * taps on an overlay item, and displays item attributes. <br>
  * Items must be ExtendedMarkerItem. <br>
  *
- * @param <Item> ...
  * @author M.Kergall
  * @see ExtendedMarkerItem
  * @see InfoWindow
  */
-public class ItemizedOverlayWithBubble<Item extends MarkerItem> extends
-        ItemizedLayer<Item> implements
-        ItemizedLayer.OnItemGestureListener<Item>, Map.UpdateListener {
+public class ItemizedOverlayWithBubble extends ItemizedLayer
+        implements ItemizedLayer.OnItemGestureListener<MarkerInterface>, Map.UpdateListener {
 
     /* only one for all items of this overlay => one at a time */
     protected InfoWindow mBubble;
@@ -40,7 +38,7 @@ public class ItemizedOverlayWithBubble<Item extends MarkerItem> extends
     static int layoutResId = 0;
 
     public ItemizedOverlayWithBubble(Map map, Context context,
-                                     MarkerSymbol marker, List<Item> list, InfoWindow bubble) {
+                                     MarkerSymbol marker, List<MarkerInterface> list, InfoWindow bubble) {
         super(map, list, marker, null);
 
         if (bubble != null) {
@@ -66,12 +64,12 @@ public class ItemizedOverlayWithBubble<Item extends MarkerItem> extends
     }
 
     public ItemizedOverlayWithBubble(Map map, Context context,
-                                     MarkerSymbol marker, List<Item> aList) {
+                                     MarkerSymbol marker, List<MarkerInterface> aList) {
         this(map, context, marker, aList, null);
     }
 
     @Override
-    public boolean onItemLongPress(int index, MarkerItem item) {
+    public boolean onItemLongPress(int index, MarkerInterface item) {
         if (mBubble.isOpen())
             hideBubble();
         else
@@ -80,7 +78,7 @@ public class ItemizedOverlayWithBubble<Item extends MarkerItem> extends
     }
 
     @Override
-    public boolean onItemSingleTapUp(int index, MarkerItem item) {
+    public boolean onItemSingleTapUp(int index, MarkerInterface item) {
         showBubble(index);
 
         return true;
@@ -121,7 +119,6 @@ public class ItemizedOverlayWithBubble<Item extends MarkerItem> extends
      *
      * @param index of the overlay item to show
      */
-    @SuppressWarnings("unchecked")
     public void showBubbleOnItem(int index) {
         ExtendedMarkerItem item = (ExtendedMarkerItem) (mItemList.get(index));
         mItemWithBubble = item;
@@ -131,7 +128,7 @@ public class ItemizedOverlayWithBubble<Item extends MarkerItem> extends
             mMap.animator().animateTo(item.geoPoint);
 
             mMap.updateMap(true);
-            setFocus((Item) item);
+            setFocus(item);
         }
     }
 
@@ -179,7 +176,7 @@ public class ItemizedOverlayWithBubble<Item extends MarkerItem> extends
     }
 
     @Override
-    public synchronized boolean removeItem(final Item item) {
+    public synchronized boolean removeItem(final MarkerInterface item) {
         boolean result = super.removeItem(item);
         if (mItemWithBubble == item) {
             hideBubble();

vtm-desktop/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'maven'
 
 dependencies {
     api project(':vtm-gdx')
-    api 'com.github.blackears:svgSalamander:v1.1.1'
+    api 'com.formdev:svgSalamander:1.1.2.4'
 }
 
 sourceSets {

vtm-desktop/src/org/oscim/awt/AwtGraphics.java

@@ -23,11 +23,9 @@ import org.oscim.backend.Platform;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Canvas;
 import org.oscim.backend.canvas.Paint;
+import org.oscim.theme.XmlThemeResourceProvider;
 
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
@@ -119,7 +117,7 @@ public class AwtGraphics extends CanvasAdapter {
     }
 
     @Override
-    public Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, int width, int height, int percent) throws IOException {
-        return createBitmap(relativePathPrefix, src, width, height, percent);
+    public Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, XmlThemeResourceProvider resourceProvider, int width, int height, int percent) throws IOException {
+        return createBitmap(relativePathPrefix, src, resourceProvider, width, height, percent);
     }
 }

vtm-gdx/src/org/oscim/gdx/InputHandler.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2021 devemux86
  * Copyright 2017 Longri
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -22,7 +22,6 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.Input.Buttons;
 import com.badlogic.gdx.InputProcessor;
-
 import org.oscim.layers.GenericLayer;
 import org.oscim.layers.GroupLayer;
 import org.oscim.layers.Layer;
@@ -79,19 +78,19 @@ public class InputHandler implements InputProcessor {
                 break;
 
             case Input.Keys.UP:
-                mViewport.moveMap(0, -50);
-                mMap.updateMap(true);
-                break;
-            case Input.Keys.DOWN:
                 mViewport.moveMap(0, 50);
                 mMap.updateMap(true);
                 break;
+            case Input.Keys.DOWN:
+                mViewport.moveMap(0, -50);
+                mMap.updateMap(true);
+                break;
             case Input.Keys.LEFT:
-                mViewport.moveMap(-50, 0);
+                mViewport.moveMap(50, 0);
                 mMap.updateMap(true);
                 break;
             case Input.Keys.RIGHT:
-                mViewport.moveMap(50, 0);
+                mViewport.moveMap(-50, 0);
                 mMap.updateMap(true);
                 break;
             case Input.Keys.D:
@@ -110,6 +109,15 @@ public class InputHandler implements InputProcessor {
                 mMap.animator().animateZoom(500, 2, 0, 0);
                 mMap.updateMap(false);
                 break;
+            case Input.Keys.MINUS:
+                mMap.animator().animateZoom(500, 0.5, 0, 0);
+                mMap.updateMap(true);
+                break;
+            case Input.Keys.PLUS:
+            case Input.Keys.EQUALS:
+                mMap.animator().animateZoom(500, 2, 0, 0);
+                mMap.updateMap(true);
+                break;
 
             case Input.Keys.NUM_1:
                 mMap.setTheme(VtmThemes.DEFAULT);

vtm-http/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'maven'
 dependencies {
     api project(':vtm')
     // https://github.com/square/okhttp/issues/4481
-    api 'com.squareup.okhttp3:okhttp:3.12.5'
+    api 'com.squareup.okhttp3:okhttp:3.12.13'
 }
 
 sourceSets {

vtm-ios-example/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'

vtm-ios-example/src/org/oscim/ios/test/IOSPathLayerTest.java

@@ -19,7 +19,6 @@
 package org.oscim.ios.test;
 
 import com.badlogic.gdx.graphics.glutils.GLVersion;
-
 import org.oscim.backend.GLAdapter;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeoPoint;
@@ -74,7 +73,7 @@ public class IOSPathLayerTest extends GdxMap {
 
         mMap.setMapPosition(0, 0, 1 << 2);
 
-        tex = Utils.loadTexture("", "patterns/pike.png", 0, 0, 100);
+        tex = Utils.loadTexture("", "patterns/pike.png", null, 0, 0, 100);
 //        tex = new TextureItem(CanvasAdapter.getBitmapAsset("", "patterns/pike.png"));
         tex.mipmap = true;
 

vtm-ios/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'

vtm-ios/src/org/oscim/ios/backend/IosGraphics.java

@@ -21,6 +21,7 @@ import org.oscim.backend.Platform;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Canvas;
 import org.oscim.backend.canvas.Paint;
+import org.oscim.theme.XmlThemeResourceProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +71,7 @@ public class IosGraphics extends CanvasAdapter {
     }
 
     @Override
-    protected Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, int width, int height, int percent) throws IOException {
-        return createBitmap(relativePathPrefix, src, width, height, percent);
+    protected Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, XmlThemeResourceProvider resourceProvider, int width, int height, int percent) throws IOException {
+        return createBitmap(relativePathPrefix, src, resourceProvider, width, height, percent);
     }
 }

vtm-jeo/build.gradle

@@ -3,10 +3,7 @@ apply plugin: 'maven'
 
 dependencies {
     api project(':vtm')
-    api('org.jeo:jeo:0-SNAPSHOT') {
-        exclude group: 'org.slf4j', module: 'slf4j-jdk14'
-    }
-    api('org.jeo:jeo-carto:0-SNAPSHOT') {
+    api('com.github.jeo.jeo:jeo-carto:master-SNAPSHOT') {
         exclude group: 'org.slf4j', module: 'slf4j-jdk14'
     }
 }

vtm-jeo/src/org/oscim/jeo/JeoUtils.java

@@ -1,6 +1,6 @@
 package org.oscim.jeo;
 
-import org.jeo.map.RGB;
+import io.jeo.map.RGB;
 
 public class JeoUtils {
     public static int color(RGB rgb) {

vtm-jeo/src/org/oscim/layers/JeoTileSource.java

@@ -16,8 +16,8 @@
  */
 package org.oscim.layers;
 
-import org.jeo.tile.Tile;
-import org.jeo.tile.TileDataset;
+import io.jeo.tile.Tile;
+import io.jeo.tile.TileDataset;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.layers.tile.MapTile;
@@ -30,9 +30,7 @@ import org.slf4j.LoggerFactory;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import static org.oscim.tiling.QueryResult.FAILED;
-import static org.oscim.tiling.QueryResult.SUCCESS;
-import static org.oscim.tiling.QueryResult.TILE_NOT_FOUND;
+import static org.oscim.tiling.QueryResult.*;
 
 public class JeoTileSource extends TileSource {
     static final Logger log = LoggerFactory.getLogger(JeoTileSource.class);

vtm-jeo/src/org/oscim/layers/JeoVectorLayer.java

@@ -19,16 +19,11 @@ package org.oscim.layers;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.LineString;
-
-import org.jeo.geom.Geom;
-import org.jeo.map.CartoCSS;
-import org.jeo.map.RGB;
-import org.jeo.map.Rule;
-import org.jeo.map.RuleList;
-import org.jeo.map.Style;
-import org.jeo.vector.Feature;
-import org.jeo.vector.VectorDataset;
-import org.jeo.vector.VectorQuery;
+import io.jeo.geom.Geom;
+import io.jeo.map.*;
+import io.jeo.vector.Feature;
+import io.jeo.vector.VectorDataset;
+import io.jeo.vector.VectorQuery;
 import org.oscim.jeo.JeoUtils;
 import org.oscim.map.Map;
 import org.oscim.renderer.bucket.LineBucket;
@@ -77,7 +72,7 @@ public class JeoVectorLayer extends JtsLayer {
             VectorQuery q = new VectorQuery().bounds(b);
             if (dbg)
                 log.debug("query {}", b);
-            for (Feature f : mDataset.cursor(q)) {
+            for (Feature f : mDataset.read(q)) {
                 if (dbg)
                     log.debug("feature {}", f);
 

vtm-jeo/src/org/oscim/layers/JtsLayer.java

@@ -21,13 +21,8 @@ package org.oscim.layers;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
-
-import org.jeo.geom.CoordinatePath;
-import org.oscim.core.Box;
-import org.oscim.core.GeometryBuffer;
-import org.oscim.core.MapPosition;
-import org.oscim.core.MercatorProjection;
-import org.oscim.core.Tile;
+import io.jeo.geom.CoordinatePath;
+import org.oscim.core.*;
 import org.oscim.layers.vector.AbstractVectorLayer;
 import org.oscim.map.Map;
 import org.oscim.renderer.bucket.LineBucket;

vtm-jeo/src/org/oscim/layers/OSMIndoorLayer.java

@@ -21,13 +21,12 @@ package org.oscim.layers;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.LineString;
-
-import org.jeo.map.CartoCSS;
-import org.jeo.map.RGB;
-import org.jeo.map.Rule;
-import org.jeo.map.Style;
-import org.jeo.vector.Feature;
-import org.jeo.vector.VectorDataset;
+import io.jeo.map.CartoCSS;
+import io.jeo.map.RGB;
+import io.jeo.map.Rule;
+import io.jeo.map.Style;
+import io.jeo.vector.Feature;
+import io.jeo.vector.VectorDataset;
 import org.oscim.backend.canvas.Color;
 import org.oscim.jeo.JeoUtils;
 import org.oscim.map.Map;

vtm-jeo/src/org/oscim/test/JeoTest.java

@@ -18,21 +18,15 @@
 package org.oscim.test;
 
 import com.vividsolutions.jts.geom.Geometry;
-
-import org.jeo.carto.Carto;
-import org.jeo.data.Dataset;
-import org.jeo.data.mem.MemVector;
-import org.jeo.data.mem.MemWorkspace;
-import org.jeo.geojson.GeoJSONDataset;
-import org.jeo.geojson.GeoJSONReader;
-import org.jeo.geom.GeomBuilder;
-import org.jeo.map.Style;
-import org.jeo.vector.Feature;
-import org.jeo.vector.Features;
-import org.jeo.vector.Schema;
-import org.jeo.vector.SchemaBuilder;
-import org.jeo.vector.VectorDataset;
-import org.jeo.vector.VectorQuery;
+import io.jeo.carto.Carto;
+import io.jeo.data.Dataset;
+import io.jeo.data.mem.MemVectorDataset;
+import io.jeo.data.mem.MemWorkspace;
+import io.jeo.geojson.GeoJSONDataset;
+import io.jeo.geojson.GeoJSONReader;
+import io.jeo.geom.GeomBuilder;
+import io.jeo.map.Style;
+import io.jeo.vector.*;
 import org.oscim.backend.canvas.Color;
 import org.oscim.layers.OSMIndoorLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
@@ -42,11 +36,7 @@ import org.oscim.renderer.MapRenderer;
 import org.oscim.theme.styles.TextStyle;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 
 public class JeoTest {
 
@@ -101,13 +91,13 @@ public class JeoTest {
         GeoJSONReader r = new GeoJSONReader();
 
         @SuppressWarnings("resource")
-        MemWorkspace mem = new MemWorkspace();
+        MemWorkspace mem = new MemWorkspace("");
 
         //mem.put("layer", data);
         try {
             Schema s = new SchemaBuilder("way").schema();
 
-            MemVector memData = mem.create(s);
+            MemVectorDataset memData = mem.create(s);
 
             for (Feature f : r.features(is)) {
                 //System.out.println("loaded: " + f);
@@ -133,7 +123,7 @@ public class JeoTest {
 
         if (memory) {
             @SuppressWarnings("resource")
-            MemWorkspace mem = new MemWorkspace();
+            MemWorkspace mem = new MemWorkspace("");
 
             //mem.put("layer", data);
             try {
@@ -141,9 +131,9 @@ public class JeoTest {
                 Schema s = data.schema();
                 VectorQuery q = new VectorQuery();
 
-                MemVector memData = mem.create(s);
+                MemVectorDataset memData = mem.create(s);
 
-                for (Feature f : data.cursor(q)) {
+                for (Feature f : data.read(q)) {
                     memData.add(f);
                 }
 
@@ -160,14 +150,14 @@ public class JeoTest {
         GeomBuilder gb = new GeomBuilder(4326);
 
         @SuppressWarnings("resource")
-        MemWorkspace mem = new MemWorkspace();
+        MemWorkspace mem = new MemWorkspace("");
         Schema schema = new SchemaBuilder(layer)
                 .field("geometry", Geometry.class)
                 .field("id", Integer.class)
                 .field("name", String.class)
                 .field("cost", Double.class).schema();
 
-        MemVector data;
+        MemVectorDataset data;
         try {
             data = mem.create(schema);
         } catch (UnsupportedOperationException e) {
@@ -181,15 +171,16 @@ public class JeoTest {
         Geometry g = gb.point(0, 0).toPoint();
         //g.setSRID(4326);
 
-        data.add(Features.create(null, data.schema(),
+
+        data.add(new ListFeature(data.schema(),
                 g, 1, "anvil",
                 10.99));
 
-        data.add(Features.create(null, data.schema(),
+        data.add(new ListFeature(data.schema(),
                 gb.points(10, 10, 20, 20).toLineString(),
                 2, "bomb", 11.99));
 
-        data.add(Features.create(null, data.schema(),
+        data.add(new ListFeature(data.schema(),
                 gb.point(100, 10).toPoint().buffer(10),
                 3, "dynamite", 12.99));
 

vtm-jeo/src/org/oscim/theme/carto/BasicFeature.java

@@ -0,0 +1,452 @@
+/* Copyright 2013 The jeo project. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.oscim.theme.carto;
+
+import com.vividsolutions.jts.geom.Geometry;
+import io.jeo.util.Util;
+import io.jeo.vector.Feature;
+import io.jeo.vector.Field;
+import io.jeo.vector.Schema;
+import io.jeo.vector.SchemaBuilder;
+import org.osgeo.proj4j.CoordinateReferenceSystem;
+
+import java.util.*;
+
+/**
+ * Basic feature implementation.
+ *
+ * @author Justin Deoliveira, Boundless
+ * <p>
+ * Adapted by Jan Lippert to the changes made in https://github.com/jeo/jeo/commit/e28695ccc8530ae6d1a2dff1fbd1e11449ef949f
+ */
+public class BasicFeature implements Feature {
+
+    /**
+     * feature identifier
+     */
+    protected String id;
+
+    /**
+     * Underlying feature storage.
+     */
+    protected Storage storage;
+
+    /**
+     * Constructor taking a feature identifier.
+     *
+     * @param id The feature id, if <code>null</code> an identifier will be generated.
+     */
+    public BasicFeature(String id) {
+        this(id, (Schema) null);
+    }
+
+    /**
+     * Constructor taking a feature identifier and an explicit schema object.
+     *
+     * @param id     The feature id, if <code>null</code> an identifier will be generated.
+     * @param schema The feature schema, if <code>null</code> the schema will be always be derived
+     */
+    public BasicFeature(String id, Schema schema) {
+        this(id, (Storage)
+                (schema != null ? new ListStorage(null, schema) : new MapStorage(null, schema)));
+    }
+
+    /**
+     * Constructs a feature from an identifier and a list of values.
+     *
+     * @param id     The feature id, if <code>null</code> an identifier will be generated.
+     * @param values The feature values.
+     */
+    public BasicFeature(String id, List<Object> values) {
+        this(id, values, null);
+    }
+
+    /**
+     * Constructs a feature from an identifier, a list of values, and a schema.
+     *
+     * @param id     The feature id, if <code>null</code> an identifier will be generated.
+     * @param values The feature values.
+     * @param schema The feature schema, if <code>null</code> the schema will be always be derived
+     */
+    public BasicFeature(String id, List<Object> values, Schema schema) {
+        this(id, new ListStorage(values, schema));
+    }
+
+    /**
+     * Constructs a feature from an identifier and a map of values.
+     *
+     * @param id     The feature id, if <code>null</code> an identifier will be generated.
+     * @param values The feature values.
+     */
+    public BasicFeature(String id, Map<String, Object> values) {
+        this(id, values, null);
+    }
+
+    /**
+     * Constructs a feature from an identifier, a map of values, and a schema.
+     *
+     * @param id     The feature id, if <code>null</code> an identifier will be generated.
+     * @param values The feature values.
+     * @param schema The feature schema, if <code>null</code> the schema will be always be derived
+     */
+    public BasicFeature(String id, Map<String, Object> values, Schema schema) {
+        this(id, new MapStorage(values, schema));
+    }
+
+    /**
+     * Constructor taking an identifier and feature storage object directly.
+     * <p>
+     * This constructor is typically only used for subclasses that need to implement custom feature
+     * storage.
+     * </p>
+     */
+    protected BasicFeature(String id, Storage storage) {
+        this.id = id != null ? id : Util.uuid();
+        this.storage = storage;
+    }
+
+    @Override
+    public String id() {
+        return id;
+    }
+
+    /*@Override
+    public CoordinateReferenceSystem getCRS() {
+        return crs;
+    }*/
+
+    public BasicFeature crs(CoordinateReferenceSystem crs) {
+        storage.crs(crs);
+        return this;
+    }
+
+    @Override
+    public boolean has(String key) {
+        return storage.has(key);
+    }
+
+    @Override
+    public Object get(String key) {
+        return storage.get(key);
+    }
+
+    @Override
+    public BasicFeature put(String key, Object val) {
+        storage.put(key, val);
+        return this;
+    }
+
+    @Override
+    public BasicFeature put(Geometry g) {
+        //TODO:optimize before triggering schema creation
+        Field gf = storage.schema(true).geometry();
+        if (gf == null) {
+            throw new IllegalArgumentException("Feature schema has no geometry");
+        }
+
+        return put(gf.name(), g);
+    }
+
+
+    @Override
+    public Geometry geometry() {
+        return storage.geometry();
+    }
+
+    @Override
+    public Map<String, Object> map() {
+        return storage.map();
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder(id).append(map()).toString();
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((storage == null) ? 0 : storage.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        BasicFeature other = (BasicFeature) obj;
+        if (id == null) {
+            return other.id == null;
+        }
+
+        return id.equals(other.id);
+    }
+
+
+    protected static abstract class Storage {
+        Schema schema;
+        CoordinateReferenceSystem crs;
+
+        protected Storage(Schema schema) {
+            this.schema = schema;
+        }
+
+        protected Storage crs(CoordinateReferenceSystem crs) {
+            this.crs = crs;
+            return this;
+        }
+
+        protected Schema schema() {
+            return schema(true);
+        }
+
+        protected Schema schema(boolean derive) {
+            if (schema == null && derive) {
+                schema = buildSchema();
+
+                // hack to apply crs override
+                if (crs != null && schema.crs() == null) {
+                    schema = SchemaBuilder.crs(schema, crs);
+                }
+            }
+            return schema;
+        }
+
+        protected Geometry geometry() {
+            if (schema != null) {
+                Field f = schema.geometry();
+                if (f != null) {
+                    return (Geometry) get(f.name());
+                }
+            }
+
+            return findGeometry();
+        }
+
+        protected CoordinateReferenceSystem crs() {
+            if (crs != null) {
+                return crs;
+            }
+
+            if (schema != null) {
+                return schema.crs();
+            }
+            return null;
+        }
+
+        /**
+         * Method for subclasses to implement to build a schema for the feature from its underlying
+         * attributes.
+         */
+        protected abstract Schema buildSchema();
+
+        /**
+         * Method for subclasses to implement in order to find a geometry object when no schema
+         * information is available.
+         */
+        protected abstract Geometry findGeometry();
+
+        protected abstract Object get(String key);
+
+        protected abstract Object get(int index);
+
+        protected abstract void put(String key, Object value);
+
+        protected abstract void set(int index, Object value);
+
+        protected abstract List<Object> list();
+
+        protected abstract Map<String, Object> map();
+
+        protected abstract boolean has(String key);
+    }
+
+    static class ListStorage extends Storage {
+
+        List<Object> list;
+
+        ListStorage(List<Object> values, Schema schema) {
+            super(schema);
+            this.list = pad(values, schema);
+        }
+
+        List<Object> pad(List<Object> values, Schema schema) {
+            //copy list passed in
+            values = values != null ? new ArrayList<Object>(values) : new ArrayList<Object>();
+
+            //expand up to size of schema if necessary
+            if (schema != null) {
+                while (values.size() < schema.size()) {
+                    values.add(null);
+                }
+            }
+            return values;
+        }
+
+        @Override
+        protected Geometry findGeometry() {
+            for (Object o : list) {
+                if (o instanceof Geometry) {
+                    return (Geometry) o;
+                }
+            }
+
+            return null;
+        }
+
+        @Override
+        protected Schema buildSchema() {
+            List<Field> fields = new ArrayList<Field>();
+            int i = 0;
+            boolean g = false;
+            for (Object o : list) {
+                if (o instanceof Geometry && !g) {
+                    //first geometry
+                    fields.add(new Field("geometry", o.getClass()));
+                    g = true;
+                } else {
+                    //regular field
+                    fields.add(new Field(String.format(Locale.ROOT, "field%d", i++), o != null ? o.getClass() : null));
+                }
+            }
+            return new Schema("feature", fields);
+        }
+
+        @Override
+        protected boolean has(String key) {
+            return schema().indexOf(key) >= 0;
+        }
+
+        @Override
+        protected Object get(int i) {
+            return list.get(i);
+        }
+
+        @Override
+        protected void set(int i, Object value) {
+            list.set(i, value);
+        }
+
+        @Override
+        protected Object get(String key) {
+            int i = schema().indexOf(key);
+            return i != -1 ? get(i) : null;
+        }
+
+        @Override
+        protected void put(String key, Object val) {
+            int i = schema().indexOf(key);
+            if (i == -1) {
+                throw new IllegalArgumentException("No such key " + key);
+            }
+            set(i, val);
+        }
+
+        @Override
+        protected List<Object> list() {
+            return Collections.unmodifiableList(list);
+        }
+
+        @Override
+        protected Map<String, Object> map() {
+            LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
+            for (Field f : schema()) {
+                map.put(f.name(), get(f.name()));
+            }
+            return map;
+        }
+    }
+
+    static class MapStorage extends Storage {
+
+        Map<String, Object> map;
+
+        MapStorage(Map<String, Object> values, Schema schema) {
+            super(schema);
+            this.map = values != null ?
+                    new LinkedHashMap<String, Object>(values) : new LinkedHashMap<String, Object>();
+        }
+
+        @Override
+        protected Schema buildSchema() {
+            List<Field> fields = new ArrayList<Field>();
+            for (Map.Entry<String, Object> e : map.entrySet()) {
+                fields.add(new Field(e.getKey(), e.getValue() != null ? e.getValue().getClass() : null));
+            }
+
+            return new Schema("feature", fields);
+        }
+
+        @Override
+        protected Geometry findGeometry() {
+            for (Object obj : map.values()) {
+                if (obj instanceof Geometry) {
+                    return (Geometry) obj;
+                }
+            }
+
+            return null;
+        }
+
+        @Override
+        protected boolean has(String key) {
+            return map.containsKey(key);
+        }
+
+        @Override
+        protected Object get(String key) {
+            return map.get(key);
+        }
+
+        @Override
+        protected void put(String key, Object val) {
+            if (!map.containsKey(key)) {
+                //new field, clear cached schema
+                schema = null;
+            }
+            map.put(key, val);
+        }
+
+        @Override
+        protected Object get(int index) {
+            return Util.get(map, index);
+        }
+
+        @Override
+        protected void set(int index, Object value) {
+            Util.set(map, index, value);
+        }
+
+        @Override
+        protected List<Object> list() {
+            List<Object> list = new ArrayList<Object>();
+            for (Field f : schema()) {
+                list.add(get(f.name()));
+            }
+            return list;
+        }
+
+        @Override
+        protected Map<String, Object> map() {
+            return Collections.unmodifiableMap(map);
+        }
+    }
+}

vtm-jeo/src/org/oscim/theme/carto/MatcherFeature.java

@@ -16,11 +16,9 @@
  */
 package org.oscim.theme.carto;
 
-import org.jeo.vector.BasicFeature;
 import org.oscim.core.Tag;
 import org.oscim.core.TagSet;
 
-import java.util.List;
 import java.util.Map;
 
 import static java.lang.System.out;
@@ -64,27 +62,10 @@ class MatcherFeature extends BasicFeature {
         return null;
     }
 
-    @Override
-    public List<Object> list() {
-        out.println("EEEK list()");
-        return null;
-    }
 
     @Override
     public Map<String, Object> map() {
         out.println("EEEK map()");
         return null;
     }
-
-    @Override
-    public Object get(int arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public BasicFeature set(int arg0, Object arg1) {
-        // TODO Auto-generated method stub
-        return null;
-    }
 }

vtm-jeo/src/org/oscim/theme/carto/RenderTheme.java

@@ -1,11 +1,7 @@
 package org.oscim.theme.carto;
 
-import org.jeo.carto.Carto;
-import org.jeo.map.CartoCSS;
-import org.jeo.map.RGB;
-import org.jeo.map.Rule;
-import org.jeo.map.RuleList;
-import org.jeo.map.Style;
+import io.jeo.carto.Carto;
+import io.jeo.map.*;
 import org.oscim.core.GeometryBuffer.GeometryType;
 import org.oscim.core.MapElement;
 import org.oscim.core.Tag;
@@ -19,9 +15,9 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import static io.jeo.map.CartoCSS.BACKGROUND_COLOR;
+import static io.jeo.map.CartoCSS.OPACITY;
 import static java.lang.System.out;
-import static org.jeo.map.CartoCSS.BACKGROUND_COLOR;
-import static org.jeo.map.CartoCSS.OPACITY;
 
 public class RenderTheme implements IRenderTheme {
 

vtm-jts/src/org/oscim/layers/vector/VectorLayer.java

@@ -1,6 +1,7 @@
 /*
  * Copyright 2014 Hannes Janetzek
  * Copyright 2016-2019 devemux86
+ * Copyright 2020 marq24
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -201,11 +202,11 @@ public class VectorLayer extends AbstractVectorLayer<Drawable> implements Gestur
 
             for (Drawable d : tmpDrawables) {
                 Style style = d.getStyle();
-                draw(t, level, d, style);
 
-                if (style != lastStyle)
+                if (lastStyle != null && lastStyle != style)
                     level += 2;
 
+                draw(t, level, d, style);
                 lastStyle = style;
             }
         }

vtm-jts/src/org/oscim/layers/vector/geometries/PointDrawable.java

@@ -26,7 +26,7 @@ public class PointDrawable extends JtsDrawable {
     }
 
     public PointDrawable(GeoPoint point, Style style) {
-        this(point.getLongitude(), point.getLatitude(), style);
+        this(point.getLatitude(), point.getLongitude(), style);
     }
 
     public PointDrawable(double lat, double lon, Style style) {

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

@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Hannes Janetzek
- * Copyright 2017-2019 devemux86
+ * Copyright 2017-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -22,19 +22,22 @@ import org.oscim.core.BoundingBox;
 import org.oscim.gdx.GdxMapApp;
 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.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
+import java.util.Collections;
+
 public class AnimatorTest extends GdxMapApp {
 
     @Override
     public void createLayers() {
         MapRenderer.setBackgroundColor(0xff000000);
 
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         mMap.setMapPosition(0, 0, 1 << 4);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2017 Longri
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -23,17 +23,19 @@ import org.oscim.backend.canvas.Paint;
 import org.oscim.core.GeoPoint;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.atlas.TextureAtlas;
 import org.oscim.renderer.atlas.TextureRegion;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 import org.oscim.utils.TextureAtlasUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -46,9 +48,10 @@ public class AtlasMultiTextureTest extends MarkerLayerTest {
         // Map events receiver
         mMap.layers().add(new MapEventsReceiver(mMap));
 
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         mMap.setMapPosition(0, 0, 1 << 2);
@@ -64,7 +67,7 @@ public class AtlasMultiTextureTest extends MarkerLayerTest {
         paint.setTextSize(12);
         paint.setStrokeWidth(2);
         paint.setColor(Color.BLACK);
-        List<MarkerItem> pts = new ArrayList<>();
+        List<MarkerInterface> pts = new ArrayList<>();
         for (double lat = -90; lat <= 90; lat += 5) {
             for (double lon = -180; lon <= 180; lon += 5) {
                 String title = lat + "/" + lon;
@@ -84,29 +87,32 @@ public class AtlasMultiTextureTest extends MarkerLayerTest {
         // With iOS we must flip the Y-Axis
         TextureAtlasUtils.createTextureRegions(inputMap, regionsMap, atlasList, true, false);
 
-        mMarkerLayer = new ItemizedLayer<>(mMap, new ArrayList<MarkerItem>(), (MarkerSymbol) null, this);
+        mMarkerLayer = new ItemizedLayer(mMap, new ArrayList<MarkerInterface>(), (MarkerSymbol) null, this);
         mMap.layers().add(mMarkerLayer);
 
         mMarkerLayer.addItems(pts);
 
         // set all markers
-        for (MarkerItem item : pts) {
-            MarkerSymbol markerSymbol = new MarkerSymbol(regionsMap.get(item.getTitle()), HotspotPlace.BOTTOM_CENTER);
-            item.setMarker(markerSymbol);
+        for (MarkerInterface item : pts) {
+            MarkerItem markerItem = (MarkerItem) item;
+            MarkerSymbol markerSymbol = new MarkerSymbol(regionsMap.get(markerItem.getTitle()), HotspotPlace.BOTTOM_CENTER);
+            markerItem.setMarker(markerSymbol);
         }
 
         System.out.println("Atlas count: " + atlasList.size());
     }
 
     @Override
-    public boolean onItemSingleTapUp(int index, MarkerItem item) {
-        System.out.println("Marker tap " + item.getTitle());
+    public boolean onItemSingleTapUp(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        System.out.println("Marker tap " + markerItem.getTitle());
         return true;
     }
 
     @Override
-    public boolean onItemLongPress(int index, MarkerItem item) {
-        System.out.println("Marker long press " + item.getTitle());
+    public boolean onItemLongPress(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        System.out.println("Marker long press " + markerItem.getTitle());
         return true;
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 devemux86
+ * Copyright 2016-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -20,8 +20,11 @@ import com.badlogic.gdx.Input;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
+import java.util.Collections;
+
 public class BitmapTileTest extends GdxMapApp {
 
     private BitmapTileLayer mLayer = null;
@@ -33,7 +36,9 @@ public class BitmapTileTest extends GdxMapApp {
             mMap.layers().remove(mShaded);
             mShaded = null;
             mMap.layers().remove(mLayer);
-            mLayer = new BitmapTileLayer(mMap, DefaultSources.OPENSTREETMAP.build());
+            UrlTileSource tileSource = DefaultSources.OPENSTREETMAP.build();
+            tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
+            mLayer = new BitmapTileLayer(mMap, tileSource);
             mMap.layers().add(mLayer);
             mMap.clearMap();
             return true;
@@ -64,7 +69,9 @@ public class BitmapTileTest extends GdxMapApp {
     public void createLayers() {
         MapRenderer.setBackgroundColor(0xff888888);
 
-        mLayer = new BitmapTileLayer(mMap, DefaultSources.OPENSTREETMAP.build());
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP.build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
+        mLayer = new BitmapTileLayer(mMap, tileSource);
         mMap.layers().add(mLayer);
 
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2017 nebular
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -22,12 +22,13 @@ import org.oscim.core.GeoPoint;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.marker.*;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ClusterMarkerLayerTest extends MarkerLayerTest {
@@ -41,9 +42,10 @@ public class ClusterMarkerLayerTest extends MarkerLayerTest {
             // Map events receiver
             mMap.layers().add(new MapEventsReceiver(mMap));
 
-            TileSource tileSource = DefaultSources.OPENSTREETMAP
+            UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                     .httpFactory(new OkHttpEngine.OkHttpFactory())
                     .build();
+            tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
             mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
             mMap.setMapPosition(53.08, 8.83, 1 << 15);
@@ -67,15 +69,15 @@ public class ClusterMarkerLayerTest extends MarkerLayerTest {
                     };
                 }
             };
-            mMarkerLayer = new ItemizedLayer<>(
+            mMarkerLayer = new ItemizedLayer(
                     mMap,
-                    new ArrayList<MarkerItem>(),
+                    new ArrayList<MarkerInterface>(),
                     markerRendererFactory,
                     this);
             mMap.layers().add(mMarkerLayer);
 
             // Create some markers spaced STEP degrees
-            List<MarkerItem> pts = new ArrayList<>();
+            List<MarkerInterface> pts = new ArrayList<>();
             GeoPoint center = mMap.getMapPosition().getGeoPoint();
             for (int x = -COUNT; x < COUNT; x++) {
                 for (int y = -COUNT; y < COUNT; y++) {

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

@@ -45,7 +45,7 @@ public class ExternalRenderThemeTest extends GdxMapApp {
 
         try {
             IRenderTheme theme = ThemeLoader.load(name);
-            mapLayer.setRenderTheme(theme);
+            mapLayer.setTheme(theme);
             MapRenderer.setBackgroundColor(theme.getMapBackground());
         } catch (ThemeException e) {
             e.printStackTrace();
@@ -80,7 +80,7 @@ public class ExternalRenderThemeTest extends GdxMapApp {
             // IRenderTheme theme =
             // ThemeLoader.load("themes/elevate/theme.xml");
             // IRenderTheme theme = ThemeLoader.load("themes/vmap/theme.xml");
-            l.setRenderTheme(theme);
+            l.setTheme(theme);
             MapRenderer.setBackgroundColor(theme.getMapBackground());
         } catch (ThemeException e) {
             e.printStackTrace();

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

@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Hannes Janetzek
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -28,12 +28,13 @@ import org.oscim.layers.vector.PathLayer;
 import org.oscim.layers.vector.geometries.Style;
 import org.oscim.map.Map;
 import org.oscim.renderer.bucket.TextureItem;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class LineTexTest extends GdxMapApp {
@@ -45,9 +46,10 @@ public class LineTexTest extends GdxMapApp {
 
     @Override
     public void createLayers() {
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         mMap.setMapPosition(0, 0, 1 << 2);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2019 telemaxx
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -25,6 +25,7 @@ import org.oscim.event.MotionEvent;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.Layer;
 import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -41,7 +42,7 @@ import java.util.List;
 
 import static org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
 
-public class MarkerLayerLabelsTest extends GdxMapApp implements ItemizedLayer.OnItemGestureListener<MarkerItem> {
+public class MarkerLayerLabelsTest extends GdxMapApp implements ItemizedLayer.OnItemGestureListener<MarkerInterface> {
 
     private static final int FG_COLOR = 0xFF000000; // 100 percent black. AARRGGBB
     private static final int BG_COLOR = 0x80FF69B4; // 50 percent pink. AARRGGBB
@@ -87,11 +88,11 @@ public class MarkerLayerLabelsTest extends GdxMapApp implements ItemizedLayer.On
             //Bitmap bitmapPoi = CanvasAdapter.decodeBitmap(getClass().getResourceAsStream("/res/marker_poi2.png"));
             MarkerSymbol symbol = new MarkerSymbol(bitmapPoi, HotspotPlace.CENTER, false);
 
-            ItemizedLayer<MarkerItem> markerLayer = new ItemizedLayer<>(mMap, new ArrayList<MarkerItem>(), symbol, this);
+            ItemizedLayer markerLayer = new ItemizedLayer(mMap, new ArrayList<MarkerInterface>(), symbol, this);
             mMap.layers().add(markerLayer);
 
             // creating some poi's
-            List<MarkerItem> pts = new ArrayList<>();
+            List<MarkerInterface> pts = new ArrayList<>();
             pts.add(new MarkerItem("Brandenburger Tor", "#1789-1793", new GeoPoint(52.516275, 13.377704)));
             pts.add(new MarkerItem("Siegessaeule, hidden description", "this is a hidden Description without a #", new GeoPoint(52.514543, 13.350119)));
             pts.add(new MarkerItem("Gleisdreieck, without description", "", new GeoPoint(52.499562, 13.374063)));
@@ -101,9 +102,10 @@ public class MarkerLayerLabelsTest extends GdxMapApp implements ItemizedLayer.On
                     + "is drawn on the map\n"
                     + "the rest is surpressed", new GeoPoint(52.509352, 13.375739)));
 
-            for (MarkerItem mi : pts) {
-                System.out.println("title: " + mi.title);
-                mi.setMarker(createAdvancedSymbol(mi, bitmapPoi));
+            for (MarkerInterface mi : pts) {
+                MarkerItem markerItem = (MarkerItem) mi;
+                System.out.println("title: " + markerItem.title);
+                markerItem.setMarker(createAdvancedSymbol(markerItem, bitmapPoi));
             }
 
             markerLayer.addItems(pts);
@@ -198,14 +200,16 @@ public class MarkerLayerLabelsTest extends GdxMapApp implements ItemizedLayer.On
     }
 
     @Override
-    public boolean onItemSingleTapUp(int index, MarkerItem item) {
-        System.out.println("Marker tap " + item.getTitle());
+    public boolean onItemSingleTapUp(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        System.out.println("Marker tap " + markerItem.getTitle());
         return true;
     }
 
     @Override
-    public boolean onItemLongPress(int index, MarkerItem item) {
-        System.out.println("Marker long press " + item.getTitle());
+    public boolean onItemLongPress(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        System.out.println("Marker long press " + markerItem.getTitle());
         return true;
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 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
@@ -23,25 +23,27 @@ import org.oscim.event.MotionEvent;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.Layer;
 import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.map.Map;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
 
-public class MarkerLayerTest extends GdxMapApp implements ItemizedLayer.OnItemGestureListener<MarkerItem> {
+public class MarkerLayerTest extends GdxMapApp implements ItemizedLayer.OnItemGestureListener<MarkerInterface> {
 
     static final boolean BILLBOARDS = true;
     MarkerSymbol mFocusMarker;
-    ItemizedLayer<MarkerItem> mMarkerLayer;
+    ItemizedLayer mMarkerLayer;
 
     @Override
     public void createLayers() {
@@ -49,9 +51,10 @@ public class MarkerLayerTest extends GdxMapApp implements ItemizedLayer.OnItemGe
             // Map events receiver
             mMap.layers().add(new MapEventsReceiver(mMap));
 
-            TileSource tileSource = DefaultSources.OPENSTREETMAP
+            UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                     .httpFactory(new OkHttpEngine.OkHttpFactory())
                     .build();
+            tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
             mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
             mMap.setMapPosition(0, 0, 1 << 2);
@@ -69,10 +72,10 @@ public class MarkerLayerTest extends GdxMapApp implements ItemizedLayer.OnItemGe
             else
                 mFocusMarker = new MarkerSymbol(bitmapFocus, HotspotPlace.CENTER, false);
 
-            mMarkerLayer = new ItemizedLayer<>(mMap, new ArrayList<MarkerItem>(), symbol, this);
+            mMarkerLayer = new ItemizedLayer(mMap, new ArrayList<MarkerInterface>(), symbol, this);
             mMap.layers().add(mMarkerLayer);
 
-            List<MarkerItem> pts = new ArrayList<>();
+            List<MarkerInterface> pts = new ArrayList<>();
             for (double lat = -90; lat <= 90; lat += 5) {
                 for (double lon = -180; lon <= 180; lon += 5)
                     pts.add(new MarkerItem(lat + "/" + lon, "", new GeoPoint(lat, lon)));
@@ -84,24 +87,26 @@ public class MarkerLayerTest extends GdxMapApp implements ItemizedLayer.OnItemGe
     }
 
     @Override
-    public boolean onItemSingleTapUp(int index, MarkerItem item) {
-        if (item.getMarker() == null)
-            item.setMarker(mFocusMarker);
+    public boolean onItemSingleTapUp(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        if (markerItem.getMarker() == null)
+            markerItem.setMarker(mFocusMarker);
         else
-            item.setMarker(null);
+            markerItem.setMarker(null);
 
-        System.out.println("Marker tap " + item.getTitle());
+        System.out.println("Marker tap " + markerItem.getTitle());
         return true;
     }
 
     @Override
-    public boolean onItemLongPress(int index, MarkerItem item) {
-        if (item.getMarker() == null)
-            item.setMarker(mFocusMarker);
+    public boolean onItemLongPress(int index, MarkerInterface item) {
+        MarkerItem markerItem = (MarkerItem) item;
+        if (markerItem.getMarker() == null)
+            markerItem.setMarker(mFocusMarker);
         else
-            item.setMarker(null);
+            markerItem.setMarker(null);
 
-        System.out.println("Marker long press " + item.getTitle());
+        System.out.println("Marker long press " + markerItem.getTitle());
         return true;
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  * Copyright 2019 Gustl22
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -30,9 +30,12 @@ import org.oscim.map.Viewport;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 import org.oscim.tiling.source.overpass.OverpassTileSource;
 
+import java.util.Collections;
+
 /**
  * Use Overpass API data for vector layer.
  * Only for developing as can be error-prone.
@@ -51,7 +54,7 @@ public class OverpassTest extends GdxMapApp {
                 .build();
         VectorTileLayer l = map.setBaseMap(tileSource);
 
-        TileSource bitmapTileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource bitmapTileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .zoomMax(15)
                 .fadeSteps(new BitmapTileLayer.FadeStep[]{
@@ -59,6 +62,7 @@ public class OverpassTest extends GdxMapApp {
                         new BitmapTileLayer.FadeStep(16, Viewport.MAX_ZOOM_LEVEL, 0f, 0f)
                 })
                 .build();
+        bitmapTileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
         mMap.layers().add(new BitmapTileLayer(mMap, bitmapTileSource));
 
         BuildingLayer.RAW_DATA = true;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -26,11 +26,12 @@ import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.vector.PathLayer;
 import org.oscim.map.Map.UpdateListener;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class PathLayerTest extends GdxMapApp {
@@ -41,9 +42,10 @@ public class PathLayerTest extends GdxMapApp {
 
     @Override
     public void createLayers() {
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         mMap.setMapPosition(0, 0, 1 << 2);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 devemux86
+ * Copyright 2016-2020 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -22,18 +22,21 @@ import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.vector.VectorLayer;
 import org.oscim.layers.vector.geometries.PointDrawable;
 import org.oscim.layers.vector.geometries.Style;
-import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
+import org.oscim.tiling.source.UrlTileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources;
 import org.oscim.utils.ColorUtil;
 
+import java.util.Collections;
+
 public class VectorLayerTest extends GdxMapApp {
 
     @Override
     public void createLayers() {
-        TileSource tileSource = DefaultSources.OPENSTREETMAP
+        UrlTileSource tileSource = DefaultSources.OPENSTREETMAP
                 .httpFactory(new OkHttpEngine.OkHttpFactory())
                 .build();
+        tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
         mMap.layers().add(new BitmapTileLayer(mMap, tileSource));
 
         mMap.setMapPosition(0, 0, 1 << 2);

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

@@ -17,8 +17,8 @@
  */
 package org.oscim.test.jeo;
 
-import org.jeo.map.Style;
-import org.jeo.vector.VectorDataset;
+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;

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

@@ -39,7 +39,7 @@ public class ThemeTest extends GdxMapApp {
 
         VectorTileLayer l = mMap.setBaseMap(ts);
 
-        l.setRenderTheme(new RenderTheme());
+        l.setTheme(new RenderTheme());
 
         MapRenderer.setBackgroundColor(0xffcccccc);
 

vtm-tests/build.gradle

@@ -13,4 +13,5 @@ dependencies {
 sourceSets {
     main.java.srcDirs = ['src']
     test.java.srcDirs = ['test']
+    test.resources.srcDirs = ['resources']
 }

vtm-tests/test/org/oscim/theme/ZipXmlThemeResourceProviderTest.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2021 eddiemuc
+ * Copyright 2021 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.theme;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.oscim.utils.IOUtils;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+
+public class ZipXmlThemeResourceProviderTest {
+
+    @Test
+    public void openZip() throws IOException {
+        ZipInputStream zis = new ZipInputStream(new BufferedInputStream(ZipXmlThemeResourceProviderTest.class.getResourceAsStream("/xmlthemetest.zip")));
+        Assert.assertNotNull(zis);
+
+        ZipXmlThemeResourceProvider zts = new ZipXmlThemeResourceProvider(zis);
+
+        // All files contained
+        Assert.assertNotNull(zts.createInputStream(null, "file:one.xml"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:two.xml"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:res/three.xml"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:res/blue_star_1.svg"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:res/test.txt"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:res/sub/four.xml"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:res/sub/blue_star_sub_1.svg"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:res/sub/blue_star_sub_2.svg"));
+
+        //Relative Reference ok
+        Assert.assertNotNull(zts.createInputStream("", "file:res/sub/blue_star_sub_2.svg"));
+        Assert.assertNotNull(zts.createInputStream("res", "file:sub/blue_star_sub_2.svg"));
+        Assert.assertNotNull(zts.createInputStream("/", "file:res/sub/blue_star_sub_2.svg"));
+        Assert.assertNotNull(zts.createInputStream("/res", "file:sub/blue_star_sub_2.svg"));
+        Assert.assertNotNull(zts.createInputStream("res/", "file:/sub/blue_star_sub_2.svg"));
+
+        // Can get same files using various other formats
+        Assert.assertNotNull(zts.createInputStream(null, "res/sub/blue_star_sub_2.svg"));
+        Assert.assertNotNull(zts.createInputStream(null, "/res/sub/blue_star_sub_2.svg"));
+        Assert.assertNotNull(zts.createInputStream(null, "file:/res/sub/blue_star_sub_2.svg"));
+
+        // Dirs NOT contained!
+        Assert.assertNull(zts.createInputStream(null, "file:res/"));
+
+        Assert.assertEquals(8, zts.getCount());
+
+        List<String> xmlThemes = zts.getXmlThemes();
+        Assert.assertEquals(4, xmlThemes.size());
+        Assert.assertTrue(xmlThemes.contains("one.xml"));
+        Assert.assertTrue(xmlThemes.contains("two.xml"));
+        Assert.assertTrue(xmlThemes.contains("res/three.xml"));
+        Assert.assertTrue(xmlThemes.contains("res/sub/four.xml"));
+
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new InputStreamReader(zts.createInputStream(null, "file:res/test.txt")));
+            String line = reader.readLine();
+            Assert.assertEquals(line, "This is a test");
+        } finally {
+            IOUtils.closeQuietly(reader);
+        }
+    }
+
+    @Test
+    public void openEmpty() throws IOException {
+        Assert.assertTrue(new ZipXmlThemeResourceProvider(null).getXmlThemes().isEmpty());
+    }
+
+    @Test
+    public void scanZipForXmlThemes() throws IOException {
+        ZipInputStream zis = new ZipInputStream(new BufferedInputStream(ZipXmlThemeResourceProviderTest.class.getResourceAsStream("/xmlthemetest.zip")));
+        Assert.assertNotNull(zis);
+
+        List<String> xmlThemes = ZipXmlThemeResourceProvider.scanXmlThemes(zis);
+
+        Assert.assertEquals(4, xmlThemes.size());
+        Assert.assertTrue(xmlThemes.contains("one.xml"));
+        Assert.assertTrue(xmlThemes.contains("two.xml"));
+        Assert.assertTrue(xmlThemes.contains("res/three.xml"));
+        Assert.assertTrue(xmlThemes.contains("res/sub/four.xml"));
+    }
+}

vtm-theme-comparator/build.gradle

@@ -10,11 +10,11 @@ dependencies {
     implementation 'com.fifesoft:rsyntaxtextarea:2.6.1'
     implementation 'com.jtattoo:JTattoo:1.6.11'
 
-    implementation 'org.mapsforge:mapsforge-core:0.13.0'
-    implementation 'org.mapsforge:mapsforge-map:0.13.0'
-    implementation 'org.mapsforge:mapsforge-map-awt:0.13.0'
-    implementation 'org.mapsforge:mapsforge-map-reader:0.13.0'
-    implementation 'org.mapsforge:mapsforge-themes:0.13.0'
+    implementation 'org.mapsforge:mapsforge-core:0.16.0'
+    implementation 'org.mapsforge:mapsforge-map:0.16.0'
+    implementation 'org.mapsforge:mapsforge-map-awt:0.16.0'
+    implementation 'org.mapsforge:mapsforge-map-reader:0.16.0'
+    implementation 'org.mapsforge:mapsforge-themes:0.16.0'
     implementation 'net.sf.kxml:kxml2:2.3.0'
 }
 

vtm-themes/resources/assets/vtm/default.xml

@@ -165,6 +165,11 @@
     <style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
     <style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
 
+    <!--###### SYMBOL styles ######-->
+
+    <!-- oneway -->
+    <style-symbol id="oneway" repeat="true" src="assets:symbols/oneway.svg" />
+
 
     <!--###### ASSIGNMENT ######-->
 
@@ -451,12 +456,14 @@
         <m k="lock" v="yes|true">
             <line stroke="#f8f8f8" use="fix" width="0.5" />
         </m>
+
+        <text fill="#404000" k="name" size="14" stroke="#aaffffff" stroke-width="2.0" />
     </m>
 
     <m e="way">
         <m closed="yes" k="natural" v="water">
             <area use="water" />
-            <caption area-size="0.4" fill="#404000" k="name" size="16" stroke="#aaffffff"
+            <caption area-size="0.2" fill="#404000" k="name" size="16" stroke="#aaffffff"
                 stroke-width="2.0" />
             <!--<line use="water:outline" />-->
         </m>
@@ -1079,7 +1086,7 @@
             <m k="area" v="~|false|no">
                 <m k="highway">
                     <m k="oneway" v="yes|true" zoom-min="16">
-                        <symbol repeat="true" src="assets:symbols/oneway.svg" />
+                        <symbol use="oneway" />
                     </m>
                 </m>
             </m>

vtm-themes/resources/assets/vtm/mapzen.xml

@@ -129,6 +129,9 @@
     <style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
     <style-area fade="15" fill="#f2f0eb" id="building" />
 
+    <!-- oneway -->
+    <style-symbol id="oneway" repeat="true" src="assets:symbols/oneway.svg" />
+
     <m closed="yes" e="way" k="layer" v="water">
         <area mesh="true" use="water" />
     </m>
@@ -397,6 +400,8 @@
             <m k="rank" v="9" zoom-min="9">
                 <line fade="9" use="water" width="0.1" />
             </m>
+
+            <text fill="#404000" k="name" size="14" stroke="#aaffffff" stroke-width="2.0" />
         </m>
         <!-- TODO this breaks the rendering -->
         <!--<m v="riverbank|dock">
@@ -417,7 +422,7 @@
     <m e="way">
         <m closed="yes" k="kind" v="water">
             <area use="water" />
-            <caption area-size="0.4" fill="#404000" k="name" size="16" stroke="#aaffffff"
+            <caption area-size="0.2" fill="#404000" k="name" size="16" stroke="#aaffffff"
                 stroke-width="2.0" />
             <!--<line use="water:outline" />-->
         </m>
@@ -1038,7 +1043,7 @@
             <m k="area" v="~|false|no">
                 <m k="kind_detail">
                     <m k="oneway" v="yes|true" zoom-min="16">
-                        <symbol repeat="true" src="assets:symbols/oneway.svg" />
+                        <symbol use="oneway" />
                     </m>
                 </m>
             </m>

vtm-themes/resources/assets/vtm/newtron.xml

@@ -118,6 +118,11 @@
     <style-line cap="butt" id="water:outline" stroke="#647b8c" width="1.0" />
     <style-line cap="butt" id="water" stroke="#cca4bbcc" width="0.6" />
 
+    <!--###### SYMBOL styles ######-->
+
+    <!-- oneway -->
+    <style-symbol id="oneway" repeat="true" src="assets:symbols/oneway.svg" />
+
 
     <!--###### ASSIGNMENT ######-->
 
@@ -369,11 +374,13 @@
             <m k="lock" v="yes|true">
                 <line cap="butt" stroke="#f8f8f8" width="1.5" />
             </m>
+
+            <text fill="#404000" k="name" size="14" stroke="#aaffffff" stroke-width="2.0" />
         </m>
 
         <m k="natural" v="water">
             <area use="water" />
-            <caption area-size="0.4" fill="#404000" k="name" size="16" stroke="#aaffffff"
+            <caption area-size="0.2" fill="#404000" k="name" size="16" stroke="#aaffffff"
                 stroke-width="2.0" />
             <!--<line use="water:outline" width="0.5" fix="true" />-->
         </m>
@@ -1080,7 +1087,7 @@
             <m k="area" v="~|false|no">
                 <m k="highway">
                     <m k="oneway" v="yes|true" zoom-min="16">
-                        <symbol repeat="true" src="assets:symbols/oneway.svg" />
+                        <symbol use="oneway" />
                     </m>
                 </m>
             </m>

vtm-themes/resources/assets/vtm/openmaptiles.xml

@@ -162,6 +162,11 @@
     <!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/> -->
     <style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
 
+    <!--###### SYMBOL styles ######-->
+
+    <!-- oneway -->
+    <style-symbol id="oneway" repeat="true" src="assets:symbols/oneway.svg" />
+
 
     <!--###### ASSIGNMENT ######-->
 
@@ -332,7 +337,7 @@
 
         <m k="oneway" v="1" zoom-min="16">
             <m k="class" v="motorway|trunk|primary|secondary|tertiary|minor">
-                <symbol repeat="true" src="assets:symbols/oneway.svg" />
+                <symbol use="oneway" />
             </m>
         </m>
     </m>
@@ -363,7 +368,7 @@
     </m>
 
     <m k="layer" v="water_name">
-        <caption area-size="0.4" fill="#404000" k="name" size="16" stroke="#aaffffff"
+        <caption area-size="0.2" fill="#404000" k="name" size="16" stroke="#aaffffff"
             stroke-width="2.0" />
     </m>
 
@@ -382,6 +387,8 @@
                 <line use="river" width="0.3" />
             </m>
         </m>
+
+        <text fill="#404000" k="name" size="14" stroke="#aaffffff" stroke-width="2.0" />
     </m>
 
     <!-- building -->