0.19.0 (#1037)

See: https://github.com/mapsforge/mapsforge/pull/1369

.github/workflows/android.yml

@@ -0,0 +1,32 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
+    - name: Publish
+      if: github.event_name != 'pull_request'
+      env:
+        SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      run: ./gradlew -PSONATYPE_USERNAME="$SONATYPE_USERNAME" -PSONATYPE_PASSWORD="$SONATYPE_PASSWORD" publish

.travis.yml

@@ -1,32 +0,0 @@
-sudo: false
-language: android
-jdk:
-- openjdk8
-env:
-  global:
-  - ANDROID=29
-  - ANDROID_BUILD_TOOLS=29.0.2
-  - 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=
-android:
-  components:
-  - tools
-  - platform-tools
-  - tools
-  - build-tools-$ANDROID_BUILD_TOOLS
-  - android-$ANDROID
-before_install:
-- yes | sdkmanager "platforms;android-$ANDROID"
-script:
-- ./gradlew clean build
-after_success:
-- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-  ./gradlew uploadArchives -PSONATYPE_USERNAME="${SONATYPE_USERNAME}" -PSONATYPE_PASSWORD="${SONATYPE_PASSWORD}";
-  fi
-notifications:
-  email:
-    recipients:
-    - secure: fOInp4SGBqiIMgnsGceQTa0SuFLaAoxAF15W0crhuljGlqSgnbnBjh0xFEF4P5+q3VT3DgDZs53GVVo6S9gEl8AWJy84KGuUX1M/CQKUQC4bwNXJdHfY3MIy6D50da6UfwWeNS4ienKh2Rj6w2TapN9M8C9nJJZk9aJFc9NWZmWTVboHZd4oUDeeRBJ6KSk1Ay7L/mmxv4cMCXaW7pPJixvUFESKNYgK4KAN3zYpym2UijrQ8zf7OVcYnTorcAuXUZDk8EvwdHl3rIAdlbVqvyZ8rmoQ2Da/Q2VlWUL/HrHUVJtCPZ+T+dNUag4a8joIDqWKwcyk76PElmgft3azb7GERb+bkZz1ToQc2IvuOeUk2SsuXWZugoEQImKWl/yWeirWBLrwzieaVh4j04dMSn/Npc1yL5kjX9EuiM6MFHdYPianMpvhFiaYKihjzW0GPV6sfuY7xS8cA9L9DjAsXoHIXIxc/+hRA+bpPUl+qMaQdGjJmNJJ2VPFnOY0XCsDDQDIVa3nZOA6aXMUG2c4H26RJZPe7uvfRiuL86n3KAmkoXSwne9t8WYMgl89LMsU5XxjBvwz2Qa1HqG09tVs6nhB23easrhEYEf/ZsGg0DIIL1FImUHj+wUUfZXeyFmbiE6lD/i2+3a5DqzZGHbXUDCoUIagObMf8fe2z5+0K/Q=
-    on_success: always
-    on_failure: always

README.md

@@ -1,5 +1,4 @@
 [![Maven Central](https://img.shields.io/maven-central/v/org.mapsforge/vtm.svg)](https://search.maven.org/search?q=g:org.mapsforge)
-[![Build Status](https://travis-ci.org/mapsforge/vtm.svg?branch=master)](https://travis-ci.org/mapsforge/vtm)
 [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](http://www.gnu.org/licenses/lgpl-3.0)
 
 # V™
@@ -12,7 +11,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
@@ -30,6 +29,7 @@ If you have any questions or problems, don't hesitate to ask our public [forum](
   - iOS (libGDX/RoboVM, [instructions](docs/ios.md))
   - Desktop (libGDX/LWJGL, [instructions](docs/desktop.md))
   - HTML5/WebGL (libGDX/GWT, [instructions](docs/web.md))
+- Building VTM: set `ANDROID_HOME` environment variable with the Android SDK installation directory
 
 ### Projects
 - **vtm** core library
@@ -47,8 +47,7 @@ If you have any questions or problems, don't hesitate to ask our public [forum](
 - **vtm-web-app** HTML5/GWT application
 
 ## WebGL Demo
-[OpenScienceMap](http://opensciencemap.org/s3db/#scale=17,rot=61,tilt=51,lat=53.075,lon=8.807) view of Bremen.
-- Hold right mouse button to change view direction.
+[OpenScienceMap](https://oscim.ogiqvo.com/vtm/#scale=17,rot=61,tilt=51,lat=53.075,lon=8.807) view of Bremen. Running [nextzen2oscimv4](https://github.com/schedul-xor/nextzen2oscimv4) server which contains OSM data in Germany. Notice: nextzen2oscimv4 server is still unstable.
 
 ## Applications
 - VTM is used by many [applications](docs/Applications.md).

build.gradle

@@ -1,21 +1,12 @@
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    }
+plugins {
+    id 'com.android.application' version '7.4.2' apply false
 }
 
 allprojects {
     group = 'org.mapsforge'
     version = 'master-SNAPSHOT'
-    ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
-    ext.androidBuildVersionTools = "29.0.2"
-    ext.gdxVersion = "1.9.10"
+    ext.gdxVersion = "1.11.0"
     ext.gwtVersion = "2.8.2"
     ext.slf4jVersion = "1.7.28"
 
@@ -28,28 +19,29 @@ allprojects {
     }
 }
 
-static def androidCompileSdk() { return 29 }
+static def androidCompileSdk() { return 33 }
 
 // 14 for Support Library, 16 for sqlite-android
-static def androidMinSdk() { return 16 }
+static def androidMinSdk() { return 21 }
 
-static def androidTargetSdk() { return 29 }
+static def androidTargetSdk() { return 33 }
 
 static def versionCode() { return 1 }
 
 def versionName() { return version }
 
 subprojects {
-    repositories {
-        google()
-        maven { url 'https://repo.boundlessgeo.com/main/' }
-        jcenter()
-        maven { url 'https://jitpack.io' }
-    }
-
     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')) {
+                if (project.name == 'vtm-desktop-lwjgl3' || project.name == 'vtm-playground' || project.name == 'vtm-theme-comparator')
+                    options.compilerArgs.addAll(['--release', '8'])
+                else
+                    options.compilerArgs.addAll(['--release', '7'])
+            }
+        }
     }
 }

deploy.gradle

@@ -1,83 +1,63 @@
 apply plugin: 'signing'
 
-if (project.hasProperty("android")) {
-    task sourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-    }
-
-    task javadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    }
-} else {
-    task sourcesJar(type: Jar) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
+java {
+    withJavadocJar()
+    withSourcesJar()
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-
-signing {
-    required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD)
-            }
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD)
-            }
-
-            pom.project {
-                packaging 'jar'
-
-                name 'vtm'
-                description 'OpenGL vector map library written in Java - running on Android, iOS, Desktop and within the browser.'
-                url 'https://github.com/mapsforge/vtm'
-
+publishing {
+    publications {
+        maven(MavenPublication) {
+            pom {
+                name = 'VTM'
+                description = 'OpenGL vector map library - running on Android, iOS, Desktop and browser.'
+                url = 'https://github.com/mapsforge/vtm'
                 licenses {
                     license {
-                        name 'GNU Lesser GPL'
-                        url 'http://www.gnu.org/licenses/lgpl.html'
-                        distribution 'repo'
+                        name = 'GNU Lesser GPL'
+                        url = 'https://www.gnu.org/licenses/lgpl.html'
                     }
                 }
-
-                scm {
-                    connection 'scm:git:https://github.com/mapsforge/vtm'
-                    developerConnection 'scm:git:https://github.com/mapsforge/vtm'
-                    url 'https://github.com/mapsforge/vtm'
-                }
-
                 developers {
                     developer {
-                        id 'hannes.janetzek'
-                        name 'Hannes Janetzek'
-                        email 'hannes.janetzek@gmail.com'
+                        id = 'hannes.janetzek'
+                        name = 'Hannes Janetzek'
+                        email = 'hannes.janetzek@gmail.com'
                     }
                     developer {
-                        id 'devemux86'
-                        name 'Emux'
-                        email 'devemux86@gmail.com'
+                        id = 'devemux86'
+                        name = 'Emux'
+                        email = 'devemux86@gmail.com'
                     }
                 }
+                scm {
+                    connection = 'scm:git:https://github.com/mapsforge/vtm'
+                    developerConnection = 'scm:git:https://github.com/mapsforge/vtm'
+                    url = 'https://github.com/mapsforge/vtm'
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+            def snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            credentials {
+                username = SONATYPE_USERNAME
+                password = SONATYPE_PASSWORD
             }
         }
     }
 }
+
+signing {
+    required { !version.endsWith('SNAPSHOT') }
+    sign publishing.publications.maven
+}
+
+javadoc {
+    if (JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
+    }
+}

docs/Applications.md

@@ -3,21 +3,22 @@
 |**Name**|**Type**|**License/Cost**|**Platforms**|**Sources**|
 |--------|--------|----------------|-------------|-----------|
 | [AdvRider WD](https://play.google.com/store/apps/details?id=com.abware.watchdog_client) |  Tool-set for the adventure rider | Proprietary/Free | Android | Closed |
-| [Cachebox 3.0](https://github.com/Longri/cachebox3.0) | Geocaching application | Apache 2.0/Free | Android, Desktop, iOS | Open |
-| [Cruiser](http://wiki.openstreetmap.org/wiki/Cruiser) | Map and navigation application | Proprietary/Free | Android, Desktop | Closed |
+| [Cachebox 3.0](https://github.com/Longri/cachebox3.0) | Geocaching application | Apache 2.0/Free | Android, iOS, Desktop | Open |
+| [Cartograph Maps 3](https://www.cartograph.eu) | Map viewing and track recording | Proprietary/Free (in-app purchases) | Android, iOS, Desktop | Closed |
+| [Cruiser](https://wiki.openstreetmap.org/wiki/Cruiser) | Map and navigation platform | 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 |
-| [MapTrek](http://maptrek.mobi) | Application for outdoor activities | GPL3/Free and Commercial | Android | Open |
+| [Kurviger](https://play.google.com/store/apps/details?id=gr.talent.kurviger) | Route planner specialized on motorcyclists | Proprietary/Free (in-app purchases) | Android | Closed |
 | [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 |
 | [Navi Cyprus](https://play.google.com/store/apps/developer?id=Talent+S.A.) | Map and navigation application | Proprietary/Free and Commercial | Android | Closed |
 | [Pocket Maps](https://github.com/junjunguo/PocketMaps) | Offline maps, routing & tracking functions | MIT/Free | Android | Open |
 | Tokyo Ogiqvo | Visualize App | Commercial | [Android](https://play.google.com/store/apps/details?id=com.ogiqvo.view.tokyo&hl=ja), [iOS](https://itunes.apple.com/us/app/tokyo-ogiqvo/id1097100677?mt=8) | Closed |
 | [topoGuide](http://www.topoguide.gr/index-en.php) | Digital guides for the outdoor | Proprietary/Free and Commercial | Android | Closed |
+| [Trekarta](https://github.com/andreynovikov/trekarta) | Application for outdoor activities | GPL3/Free and Commercial | Android | Open |
 | [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,72 @@
 # Changelog
 
+## New since 0.19.0
+
+- Minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.20.0)
+
+## Version 0.19.0 (2023-04-26)
+
+- Render themes: line texture improvements [#1008](https://github.com/mapsforge/vtm/pull/1008)
+- Biker map theme [#995](https://github.com/mapsforge/vtm/pull/995)
+- MVT simplification [#956](https://github.com/mapsforge/vtm/pull/956)
+  - `Parameters.SIMPLIFICATION_TOLERANCE`, `Parameters.SIMPLIFICATION_EXCEPTIONS`
+- libGDX 1.11.0 [#972](https://github.com/mapsforge/vtm/pull/972) [#977](https://github.com/mapsforge/vtm/pull/977)
+- Disable `vtm-jeo` [#997](https://github.com/mapsforge/vtm/pull/997)
+- Minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.19.0)
+
+## Version 0.18.0 (2022-06-18)
+
+- Mapsforge: deduplicate maps [#903](https://github.com/mapsforge/vtm/pull/903)
+- Fix overlapping map regions [#903](https://github.com/mapsforge/vtm/pull/903) [#905](https://github.com/mapsforge/vtm/pull/905)
+- Fix `vtm-jni64.dll` [#911](https://github.com/mapsforge/vtm/pull/911)
+- Mapsforge: simplification exceptions [#906](https://github.com/mapsforge/vtm/pull/906)
+  - `Parameters.SIMPLIFICATION_EXCEPTIONS`
+- Minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.18.0)
+
+## Version 0.17.0 (2022-01-03)
+
+- Drawable style point reduction option [#862](https://github.com/mapsforge/vtm/pull/862)
+- Drawable style texture repeat option [#862](https://github.com/mapsforge/vtm/pull/862)
+- Draggable marker Android sample [#869](https://github.com/mapsforge/vtm/pull/869)
+- Move cluster experiment in samples [#858](https://github.com/mapsforge/vtm/pull/858)
+- 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`
+- 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`
+- 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)
+- 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)
@@ -12,7 +79,7 @@
   - `MapView.OPENGL_VERSION`
 - Android: threaded system initialization
   - `Parameters.THREADED_INIT`
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.13.0)
 
 ## Version 0.12.0 (2019-09-17)
@@ -29,14 +96,14 @@
   - `Parameters.POLY_LABEL`
 - Android 10 compatibility [#728](https://github.com/mapsforge/vtm/issues/728)
 - libGDX 1.9.10 [#731](https://github.com/mapsforge/vtm/issues/731)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.12.0)
 
 ## Version 0.11.1 (2019-04-12)
 
 - MBTiles raster tile source (Android) [#708](https://github.com/mapsforge/vtm/pull/708)
 - Fix Android 4.2 crash [#713](https://github.com/mapsforge/vtm/issues/713)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.11.1)
 
 ## Version 0.11.0 (2019-03-25)
@@ -62,7 +129,7 @@
 - OpenGL ES 3.0 support [#646](https://github.com/mapsforge/vtm/issues/646)
 - OpenGL ES 2.0 complete [#642](https://github.com/mapsforge/vtm/pull/642)
 - libGDX 1.9.9 [#635](https://github.com/mapsforge/vtm/issues/635)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.11.0)
 
 ## Version 0.10.0 (2018-08-28)
@@ -98,7 +165,7 @@
 - Android 9 compatibility [#550](https://github.com/mapsforge/vtm/issues/550)
 - JTS (LocationTech) [#484](https://github.com/mapsforge/vtm/issues/484)
 - SVG Salamander (JitPack) [#560](https://github.com/mapsforge/vtm/issues/560)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.10.0)
 
 ## Version 0.9.2 (2018-01-04)
@@ -111,7 +178,7 @@
 
 - LwHttp engine fix http headers [#460](https://github.com/mapsforge/vtm/issues/460)
 - S3DBLayer renamed to S3DBTileLayer [#452](https://github.com/mapsforge/vtm/issues/452)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.9.1)
 
 ## Version 0.9.0 (2017-12-03)
@@ -140,7 +207,7 @@
 - Gradle 4 / Android plugin 3 support [#433](https://github.com/mapsforge/vtm/issues/433)
 - libGDX 1.9.7 [#434](https://github.com/mapsforge/vtm/issues/434)
 - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.9.0)
 
 ## Version 0.8.0 (2017-07-19)
@@ -166,7 +233,7 @@
 - Gretty plugin at web modules [#338](https://github.com/mapsforge/vtm/issues/338)
 - libGDX 1.9.6 [#333](https://github.com/mapsforge/vtm/issues/333)
 - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.8.0)
 
 ## Version 0.7.0 (2017-02-26)
@@ -194,10 +261,10 @@
 - Fix theme parsing in non-Latin locales [#297](https://github.com/mapsforge/vtm/issues/297)
 - libGDX 1.9.5 [#270](https://github.com/mapsforge/vtm/issues/270)
 - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41)
-- Many other minor improvements and bug fixes
+- 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 +281,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)
@@ -223,5 +292,5 @@
 - SNAPSHOT builds publish to Sonatype OSSRH [#165](https://github.com/mapsforge/vtm/issues/165)
 - libGDX 1.9.4 [#164](https://github.com/mapsforge/vtm/issues/164)
 - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41)
-- Many other minor improvements and bug fixes
+- Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.6.0)

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

@@ -15,29 +15,29 @@ implementation 'org.slf4j:slf4j-api:1.7.28'
 
 ### Android
 ```groovy
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
 implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
 implementation 'com.caverock:androidsvg:1.4'
 ```
 
 ### Android (libGDX)
 ```groovy
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
+runtimeOnly 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
 implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
-implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
 implementation 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]'
+runtimeOnly 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-v7a'
+runtimeOnly 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-arm64-v8a'
+runtimeOnly 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86'
+runtimeOnly 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
 implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]'
-implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-v7a'
-implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-arm64-v8a'
-implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86'
-implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
-implementation 'com.badlogicgames.gdx:gdx:1.9.10'
-implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.10'
+implementation 'com.badlogicgames.gdx:gdx:1.11.0'
+implementation 'com.badlogicgames.gdx:gdx-backend-android:1.11.0'
 implementation 'com.caverock:androidsvg:1.4'
 ```
 
@@ -47,37 +47,35 @@ 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'
+runtimeOnly 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-linux'
+runtimeOnly 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-osx'
+runtimeOnly 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows'
+implementation 'com.badlogicgames.gdx:gdx:1.11.0'
+runtimeOnly 'com.badlogicgames.gdx:gdx-platform:1.11.0:natives-desktop'
+implementation 'guru.nidi.com.kitfox:svgSalamander:1.1.3'
+implementation 'net.sf.kxml:kxml2:2.3.0'
 ```
 
 ### Desktop (LWJGL)
 ```groovy
-implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10'
+implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]'
+implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.11.0'
 implementation 'org.lwjgl.lwjgl:lwjgl:2.9.3'
-implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux'
-implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx'
-implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-windows'
+runtimeOnly 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux'
+runtimeOnly 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx'
+runtimeOnly 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-windows'
 ```
 
 ### Desktop (LWJGL 3)
 ```groovy
-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'
-implementation 'org.lwjgl:lwjgl:3.2.3:natives-macos'
-implementation 'org.lwjgl:lwjgl:3.2.3:natives-windows'
+implementation 'org.mapsforge:vtm-desktop-lwjgl3:[CURRENT-VERSION]'
+implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl3:1.11.0'
+implementation 'org.lwjgl:lwjgl:3.3.1'
+runtimeOnly 'org.lwjgl:lwjgl:3.3.1:natives-linux'
+runtimeOnly 'org.lwjgl:lwjgl:3.3.1:natives-macos'
+runtimeOnly 'org.lwjgl:lwjgl:3.3.1:natives-windows'
 ```
 
 ### JTS geometries
@@ -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,11 @@
 # 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/) | [Mirror (fast)](http://ftp-stud.hs-esslingen.de/pub/Mirrors/download.mapsforge.org/)
+- [OpenAndroMaps](https://www.openandromaps.org/en/)
+- [OpenMaps](https://openmaps.eu/)
+- [paws.cz](https://osm.paws.cz/)
 - [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,7 +6,7 @@
 # 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
@@ -15,5 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
 # 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
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=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-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

jni/build.gradle

@@ -1,7 +1,7 @@
-apply plugin: 'java-library'
+apply plugin: 'java'
 
 dependencies {
-    api "com.badlogicgames.gdx:gdx-jnigen:$gdxVersion"
+    implementation "com.badlogicgames.gdx:gdx-jnigen:$gdxVersion"
 }
 
 sourceSets {

jni/jni/build-windows64.xml

@@ -0,0 +1,203 @@
+<project name="vtm-jni-Windows-64" basedir="." default="postcompile">
+	
+	<!-- include the environment -->
+	<property environment="env"/>	
+	
+	<!-- output directory for temporary object files -->
+	<property name="buildDir" value="target/windows64" />
+	
+	<!-- output directory for the shared library -->
+	<property name="libsDir" value="../libs/windows64" />
+	
+	<!-- the name of the shared library -->
+	<property name="libName" value="vtm-jni64.dll"/>
+	
+	<!-- the jni header jniPlatform to use -->
+	<property name="jniPlatform" value="win32"/>
+	
+	<!-- the compiler to use when compiling c files -->
+	<property name="cCompiler" value="gcc"/>
+	
+	<!-- the compiler to use when compiling c++ files -->
+	<property name="cppCompiler" value="g++"/>
+	
+	<!-- the command to use when archiving files -->
+	<property name="archiver" value="ar"/>
+	
+	<!-- the compilerPrefix for the C & C++ compilers -->
+	<property name="compilerPrefix" value="x86_64-w64-mingw32-"/>
+	
+	<!-- the compilerSuffix for the C & C++ compilers -->
+	<property name="compilerSuffix" value=".exe" />
+	
+	<!-- define gcc compiler, options and files to compile -->
+	<property name="gcc" value="${compilerPrefix}${cCompiler}${compilerSuffix}"/>	
+	<property name="gcc-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m64 -Wall -std=c99 -O2 -ffast-math -DNDEBUG"/>
+	<fileset id="gcc-files" dir="./">
+		<exclude name="target/"/>		
+		<include name="memcpy_wrap.c"/>
+		<include name="gl/utils.c"/>
+		<include name="libtess2/Source/bucketalloc.c"/>
+		<include name="libtess2/Source/dict.c"/>
+		<include name="libtess2/Source/geom.c"/>
+		<include name="libtess2/Source/mesh.c"/>
+		<include name="libtess2/Source/priorityq.c"/>
+		<include name="libtess2/Source/sweep.c"/>
+		<include name="libtess2/Source/tess.c"/>
+	</fileset>
+	
+	<!-- define g++ compiler, options and files to compile -->
+	<property name="g++" value="${compilerPrefix}${cppCompiler}${compilerSuffix}"/>
+	<property name="g++-opts" value="-c -Wall -O2 -mfpmath=sse -msse2 -fmessage-length=0 -m64 -Wall -std=c99 -O2 -ffast-math -DNDEBUG -fpermissive"/>
+	<fileset id="g++-files" dir="./">
+		<exclude name="target/"/>
+		<include name="**/*.cpp"/>
+	</fileset>
+
+	<!-- define linker and options -->
+	<property name="linker" value="${compilerPrefix}${cppCompiler}${compilerSuffix}"/>
+	<property name="linker-opts" value="-Wl,--kill-at -shared -static -static-libgcc -static-libstdc++ -m64"/>
+	<property name="libraries" value=""/>
+
+	<!-- define stripper -->
+	<property name="stripper" value="${compilerPrefix}strip${compilerSuffix}"/>
+	
+	<!-- cleans the build directory, removes all object files and shared libs -->
+	<target name="clean">
+		<delete includeemptydirs="true" quiet="true">
+			<fileset dir="${buildDir}"/>
+			<fileset dir="${libsDir}" includes="**/*"/>
+		</delete>
+	</target>
+	
+	<target name="precompile" depends="clean">
+		<condition property="compiler-found">
+			<and>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${g++}" filepath="${env.PATH}"/>
+					<available file="${g++}" filepath="${env.Path}"/>
+				</or>
+				<or>
+					<!-- Include both b/c Windows might be either -->
+					<available file="${gcc}" filepath="${env.PATH}"/>
+					<available file="${gcc}" filepath="${env.Path}"/>
+				</or>
+			</and>
+		</condition>
+		<condition property="has-compiler">
+			<equals arg1="${compiler-found}" arg2="true"/>
+		</condition>
+		<condition property="stripper-found">
+			<or>
+				<!-- Include both b/c Windows might be either -->
+				<available file="${stripper}" filepath="${env.PATH}"/>
+				<available file="${stripper}" filepath="${env.Path}"/>
+			</or>
+		</condition>
+		<condition property="should-strip">
+			<and>
+				<equals arg1="${stripper-found}" arg2="true"/>
+				<equals arg1="${release}" arg2="true"/>
+				<!-- Don't strip mac osx libs -->
+				<not>
+					<contains string="${libName}" substring="dylib"/>
+				</not>
+			</and>
+		</condition>
+		
+	</target>
+	
+	<target name="create-build-dir" depends="precompile" if="has-compiler">
+		<!-- FIXME this is pretty nasty :/ -->
+		<copy todir="${buildDir}">
+			<fileset refid="g++-files"/>
+			<fileset refid="gcc-files"/>
+		</copy>
+		<delete>
+			<fileset dir="${buildDir}">
+				<include name="*"/>
+				<exclude name="*.o"/>
+			</fileset>
+		</delete>
+	</target>
+
+	<!-- compiles all C and C++ files to object files in the build directory -->
+	<target name="compile" depends="create-build-dir" if="has-compiler">
+		<mkdir dir="${buildDir}"/>
+		<apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">
+			<arg line="${g++-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+			<arg value="-Ilibtess2/Include"/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="g++-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.cpp" to="*.o"/>
+				<mapper type="glob" from="*.mm" to="*.o"/>
+			</compositemapper>
+		</apply>
+		<apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">
+			<arg line="${gcc-opts}"/>
+			<arg value="-Ijni-headers"/>
+			<arg value="-Ijni-headers/${jniPlatform}"/>
+			<arg value="-I."/>
+						<arg value="-I."/>
+			<arg value="-Ilibtess2/Include"/>
+			<arg value="-Ilibtess2/Source"/>
+
+			<srcfile/>
+			<arg value="-o"/>
+			<targetfile/>
+			<fileset refid="gcc-files"/>
+			<compositemapper>
+				<mapper type="glob" from="*.c" to="*.o"/>
+				<mapper type="glob" from="*.m" to="*.o"/>
+			</compositemapper>
+		</apply>
+	</target>	
+
+	<!-- links the shared library based on the previously compiled object files -->	
+	<target name="link" depends="compile" if="has-compiler">
+		<fileset dir="${buildDir}" id="objFileSet">
+			<patternset>
+				<include name="**/*.o" />
+			</patternset>
+		</fileset>
+		<pathconvert pathsep=" " property="objFiles" refid="objFileSet" />
+		<mkdir dir="${libsDir}" />
+		<exec executable="${linker}" failonerror="true" dir="${buildDir}">
+			<arg line="${linker-opts}" />
+			<arg value="-o" />
+			<arg path="${libsDir}/${libName}" />
+			<arg line="${objFiles}"/>
+			<arg line="${libraries}" />
+		</exec>
+	</target>	
+
+	<!-- strips the shared library of debug symbols -->
+	<target name="strip" depends="link" if="should-strip">
+		<exec executable="${stripper}" failonerror="true" dir="${buildDir}">
+			<arg value="--strip-unneeded"/>
+			<arg path="${libsDir}/${libName}" />
+		</exec>
+	</target>
+	
+	<!-- copy dll into dev environment 
+	<target name="copyDLL" depends="link">
+		<copy 
+			file	="${libsDir}/${libName}" 
+			todir	="C:/DAT/MT/mytourbook/bundles/net.tourbook.ext.vtm.windows/natives"
+		/>
+	</target>
+	-->
+
+	<target name="postcompile" depends="strip">
+		
+	</target>
+</project>

jni/jni/gl/utils.c

@@ -102,7 +102,7 @@ matrix4_proj2D(float* mat, float* vec, float *out);
 
 jlong JNI(alloc)(JNIEnv *env, jclass* clazz)
 {
-  return (long) calloc(16, sizeof(float));
+  return (jlong) calloc(16, sizeof(float));
 }
 
 jobject JNI(getBuffer)(JNIEnv *env, jclass* clazz,jlong ptr){

jni/jni/org.oscim.utils.TessJNI.cpp

@@ -23,7 +23,7 @@
 //@line:131
  {
 		if (size <= 0)
-		   return (long)tessNewTess(0);
+		   return (jlong)tessNewTess(0);
 		if (size > 10)
 			size = 10;
 		TESSalloc ma;
@@ -39,7 +39,7 @@
 		ma.regionBucketSize = 1 << size;	 // 256
 		ma.extraVertices = 8;
 	    //ma.extraVertices = 256;
-	    return (long)tessNewTess(&ma);
+	    return (jlong)tessNewTess(&ma);
 	} 
 
 }

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" /> -->

settings.gradle

@@ -1,3 +1,19 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url 'https://jitpack.io' }
+    }
+}
 rootProject.name = 'vtm-parent'
 include ':vtm'
 include ':vtm-android'
@@ -14,7 +30,7 @@ include ':vtm-gdx-poi3d'
 include ':vtm-http'
 include ':vtm-ios'
 include ':vtm-ios-example'
-include ':vtm-jeo'
+//include ':vtm-jeo'
 include ':vtm-json'
 include ':vtm-jts'
 include ':vtm-models'

vtm-android-example/AndroidManifest.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.oscim.android.test"
     android:installLocation="auto"
     android:versionCode="1"
     android:versionName="1.0">
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
@@ -15,10 +15,12 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".Samples"
-            android:configChanges="keyboardHidden|orientation|screenSize">
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -33,6 +35,12 @@
         <activity
             android:name=".ClusterMarkerOverlayActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".DraggableMarkerOverlayActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".FragmentActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".GettingStarted"
             android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -42,9 +50,9 @@
         <activity
             android:name=".GdxPoi3DActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-        <activity
+        <!--<activity
             android:name=".JeoIndoorActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
+            android:configChanges="keyboardHidden|orientation|screenSize" />-->
         <activity
             android:name=".LineTexActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -60,12 +68,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

@@ -5,7 +5,7 @@ dependencies {
     implementation project(':vtm-android-mvt')
     implementation project(':vtm-extras')
     implementation project(':vtm-http')
-    implementation project(':vtm-jeo')
+    //implementation project(':vtm-jeo')
     implementation project(':vtm-json')
     implementation project(':vtm-jts')
     implementation project(':vtm-mvt')
@@ -16,27 +16,27 @@ 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:master-SNAPSHOT'
+    runtimeOnly 'org.mapsforge:sqlite-android:master-SNAPSHOT:natives-armeabi-v7a'
+    runtimeOnly 'org.mapsforge:sqlite-android:master-SNAPSHOT:natives-arm64-v8a'
+    runtimeOnly 'org.mapsforge:sqlite-android:master-SNAPSHOT:natives-x86'
+    runtimeOnly 'org.mapsforge:sqlite-android:master-SNAPSHOT:natives-x86_64'
 }
 
 android {
-    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "$androidBuildVersionTools"
+    namespace 'org.oscim.android.test'
+    compileSdk androidCompileSdk()
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         versionCode project.versionCode()
         versionName project.versionName()
-        minSdkVersion androidMinSdk()
-        targetSdkVersion androidTargetSdk()
+        minSdk androidMinSdk()
+        targetSdk androidTargetSdk()
     }
 
     sourceSets {
@@ -56,12 +56,14 @@ android {
         release.setRoot('build-types/release')
     }
 
-    lintOptions { abortOnError false }
+    lint {
+        abortOnError false
+    }
 
     packagingOptions {
-        exclude 'META-INF/services/org.jeo.data.Driver'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
+        resources {
+            excludes += ['META-INF/services/io.jeo.data.Driver', 'META-INF/LICENSE', 'META-INF/NOTICE']
+        }
     }
 
     /*buildTypes {
@@ -84,3 +86,7 @@ task run(dependsOn: 'installDebug') {
         proc.waitFor()
     }
 }
+
+if (System.getenv('ANDROID_HOME') == null) {
+    throw new GradleException("Environment variable ANDROID_HOME needs to be set to SDK folder")
+}

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

@@ -0,0 +1,10 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <org.oscim.android.drag.DragMapView
+        android:id="@+id/mapView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
+
+</RelativeLayout>

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>
@@ -26,7 +28,9 @@
     <string name="search_value">void or value</string>
     <string name="now">Now</string>
     <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="startup_message_mbtiles">To run this sample activity, you need an MBTiles database installed on storage.</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/cluster/ClusterMarkerRenderer.java

@@ -19,13 +19,13 @@
  * 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.layers.marker;
+package org.oscim.android.cluster;
 
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.core.MercatorProjection;
 import org.oscim.core.PointF;
 import org.oscim.core.Tile;
-import org.oscim.layers.marker.utils.ScreenUtils;
+import org.oscim.layers.marker.*;
 import org.oscim.layers.marker.utils.SparseIntArray;
 import org.oscim.renderer.GLViewport;
 import org.oscim.renderer.bucket.SymbolItem;
@@ -45,7 +45,7 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
     /**
      * default color of number inside the icon. Would be super-cool to cook this into the map theme
      */
-    private static int CLUSTER_COLORTEXT = 0xff8000c0;
+    private static final int CLUSTER_COLORTEXT = 0xff8000c0;
 
     /**
      * default color of circle background
@@ -84,12 +84,12 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
      * We use a flat Sparse array to calculate the clusters. The sparse array models a 2D map where every (x,y) denotes
      * a grid slot, ie. 64x64dp. For efficiency I use a linear sparsearray with ARRindex = SLOTypos * max_x + SLOTxpos"
      */
-    private SparseIntArray mGridMap = new SparseIntArray(200); // initial space for 200 markers, that's not a lot of memory, and in most cases will avoid resizing the array
+    private final SparseIntArray mGridMap = new SparseIntArray(200); // initial space for 200 markers, that's not a lot of memory, and in most cases will avoid resizing the array
 
     /**
      * Whether to enable clustering or disable the functionality
      */
-    private boolean mClusteringEnabled = false;
+    private final boolean mClusteringEnabled;
 
     /**
      * Constructs a clustered marker renderer
@@ -98,7 +98,7 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
      * @param defaultSymbol The default symbol
      * @param style         The desired style, or NULL to disable clustering
      */
-    public ClusterMarkerRenderer(MarkerLayer<MarkerInterface> markerLayer, MarkerSymbol defaultSymbol, ClusterMarkerRenderer.ClusterStyle style) {
+    public ClusterMarkerRenderer(MarkerLayer markerLayer, MarkerSymbol defaultSymbol, ClusterMarkerRenderer.ClusterStyle style) {
         super(markerLayer, defaultSymbol);
 
         mClusteringEnabled = style != null;
@@ -139,28 +139,28 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
      */
     private void repopulateCluster(int size, double scale) {
         /* the grid slot size in px. increase to group more aggressively. currently set to marker size */
-        final int GRIDSIZE = ScreenUtils.getPixels(MAP_GRID_SIZE_DP);
+        final int GRIDSIZE = ClusterUtils.getPixels(MAP_GRID_SIZE_DP);
 
-		/* the factor to map into Grid Coordinates (discrete squares of GRIDSIZE x GRIDSIZE) */
+        /* the factor to map into Grid Coordinates (discrete squares of GRIDSIZE x GRIDSIZE) */
         final double factor = (scale / GRIDSIZE);
 
-        InternalItem.Clustered[] tmp = new InternalItem.Clustered[size];
+        Clustered[] tmp = new Clustered[size];
 
         // clear grid map to count items that share the same "grid slot"
         mGridMap.clear();
 
         for (int i = 0; i < size; i++) {
-            InternalItem.Clustered it = tmp[i] = new InternalItem.Clustered();
+            Clustered it = tmp[i] = new Clustered();
 
             it.item = mMarkerLayer.createItem(i);
 
-			/* pre-project points */
+            /* pre-project points */
             MercatorProjection.project(it.item.getPoint(), mMapPoint);
             it.px = mMapPoint.x;
             it.py = mMapPoint.y;
 
             // items can be declared non-clusterable
-            if (!(it.item instanceof MarkerItem.NonClusterable)) {
+            if (!(it.item instanceof NonClusterable)) {
 
                 final int
                         absposx = (int) (it.px * factor),             // absolute item X position in the grid
@@ -244,7 +244,7 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
         int numVisible = 0;
 
         // Increase view to show items that are partially visible
-        mMarkerLayer.map().viewport().getMapExtents(mBox, Tile.SIZE / 2);
+        mMarkerLayer.map().viewport().getMapExtents(mBox, Tile.SIZE >> 1);
 
         long flip = (long) (Tile.SIZE * v.pos.scale) >> 1;
 
@@ -260,9 +260,9 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
         float cos = (float) Math.cos(angle);
         float sin = (float) Math.sin(angle);
 
-		/* check visibility */
+        /* check visibility */
         for (InternalItem itm : mItems) {
-            InternalItem.Clustered it = (InternalItem.Clustered) itm;
+            Clustered it = (Clustered) itm;
 
             it.changes = false;
             it.x = (float) ((it.px - mx) * scale);
@@ -299,7 +299,7 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
 
         //log.debug(numVisible + " " + changedVisible + " " + changesInvisible);
 
-		/* only update when zoomlevel changed, new items are visible
+        /* only update when zoomlevel changed, new items are visible
          * or more than 10 of the current items became invisible */
         //if ((numVisible == 0) && (changedVisible == 0 && changesInvisible < 10))
         //	return;
@@ -318,7 +318,7 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
         //log.debug(Arrays.toString(mItems));
 
         for (InternalItem itm : mItems) {
-            InternalItem.Clustered it = (InternalItem.Clustered) itm;
+            Clustered it = (Clustered) itm;
 
             // skip invisible AND clustered-out
             if ((!it.visible) || (it.clusteredOut))
@@ -387,7 +387,7 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
         // create and cache bitmap. This is unacceptable inside the GL thread,
         // so we'll call this routine at the beginning to pre-cache all bitmaps
 
-        ScreenUtils.ClusterDrawable drawable = new ScreenUtils.ClusterDrawable(
+        ClusterUtils.ClusterDrawable drawable = new ClusterUtils.ClusterDrawable(
                 MAP_MARKER_CLUSTER_SIZE_DP - CLUSTER_MAXSIZE + size, // make size dependent on cluster size
                 mStyleForeground,
                 mStyleBackground,

vtm-android-example/src/org/oscim/android/cluster/ClusterUtils.java

@@ -14,7 +14,7 @@
  * 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.layers.marker.utils;
+package org.oscim.android.cluster;
 
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
@@ -25,7 +25,7 @@ import org.oscim.backend.canvas.Paint;
  * A simple utility class to make clustered markers functionality self-contained.
  * Includes a method to translate between DPs and PXs and a circular icon generator.
  */
-public class ScreenUtils {
+public class ClusterUtils {
 
     /**
      * Get pixels from DPs
@@ -38,8 +38,9 @@ public class ScreenUtils {
     }
 
     public static class ClusterDrawable {
-        private Paint mPaintText = CanvasAdapter.newPaint();
-        private Paint mPaintCircle = CanvasAdapter.newPaint(), mPaintBorder = CanvasAdapter.newPaint();
+        private final Paint mPaintText = CanvasAdapter.newPaint();
+        private final Paint mPaintCircle = CanvasAdapter.newPaint();
+        private final Paint mPaintBorder = CanvasAdapter.newPaint();
         private int mSize;
         private String mText;
 
@@ -57,8 +58,8 @@ public class ScreenUtils {
         }
 
         private void setup(int sizedp, int foregroundColor, int backgroundColor) {
-            mSize = ScreenUtils.getPixels(sizedp);
-            mPaintText.setTextSize(ScreenUtils.getPixels((int) (sizedp * 0.6666666)));
+            mSize = ClusterUtils.getPixels(sizedp);
+            mPaintText.setTextSize(ClusterUtils.getPixels((int) (sizedp * 0.6666666)));
             mPaintText.setColor(foregroundColor);
 
             mPaintCircle.setColor(backgroundColor);

vtm-android-example/src/org/oscim/android/cluster/Clustered.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017 nebular
+ * Copyright 2017 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.android.cluster;
+
+import org.oscim.layers.marker.InternalItem;
+
+/**
+ * Extension for clustered items.
+ */
+public class Clustered extends InternalItem {
+    /**
+     * If this is >0, this item will be displayed as a cluster circle, with size clusterSize+1.
+     */
+    public int clusterSize;
+
+    /**
+     * If this is true, this item is hidden (because it's represented by another InternalItem acting as cluster.
+     */
+    public boolean clusteredOut;
+}

vtm-android-example/src/org/oscim/android/cluster/NonClusterable.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017 nebular
+ * Copyright 2017 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.android.cluster;
+
+import org.oscim.core.GeoPoint;
+import org.oscim.layers.marker.MarkerItem;
+
+/**
+ * If a MarkerItem is created using this convenience class instead of MarkerItem,
+ * this specific item will not be clusterable.
+ */
+public class NonClusterable extends MarkerItem {
+    public NonClusterable(String title, String description, GeoPoint geoPoint) {
+        super(null, title, description, geoPoint);
+    }
+
+    public NonClusterable(Object uid, String title, String description, GeoPoint geoPoint) {
+        super(uid, title, description, geoPoint);
+    }
+}

vtm-android-example/src/org/oscim/android/drag/DragAndDropListener.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 Frank Knoll
+ *
+ * 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.drag;
+
+import org.oscim.core.GeoPoint;
+
+public interface DragAndDropListener {
+
+    void startDragItemAtGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint);
+
+    void ongoingDragItemToGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint);
+
+    void dropItemAtGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint);
+}

vtm-android-example/src/org/oscim/android/drag/DragGestureHandler.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 Hannes Janetzek
+ * Copyright 2016 devemux86
+ * Copyright 2021 Frank Knoll
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.android.drag;
+
+import android.view.MotionEvent;
+import org.oscim.android.input.AndroidMotionEvent;
+import org.oscim.android.input.GestureHandler;
+import org.oscim.event.Gesture;
+import org.oscim.map.Map;
+
+class DragGestureHandler extends GestureHandler {
+
+    public static final Gesture START_DRAG = new Gesture() {
+    };
+    public static final Gesture ONGOING_DRAG = new Gesture() {
+    };
+    public static final Gesture END_DRAG = new Gesture() {
+    };
+
+    private final AndroidMotionEvent mMotionEvent;
+    private final Map mMap;
+    private boolean scrolling = false;
+
+    public DragGestureHandler(Map map) {
+        super(map);
+        mMotionEvent = new AndroidMotionEvent();
+        mMap = map;
+    }
+
+    public boolean isScrolling() {
+        return scrolling;
+    }
+
+    public void setScrolling(boolean scrolling) {
+        this.scrolling = scrolling;
+    }
+
+    @Override
+    public void onShowPress(MotionEvent e) {
+        scrolling = true;
+        mMap.handleGesture(START_DRAG, mMotionEvent.wrap(e));
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+        scrolling = true;
+        return mMap.handleGesture(ONGOING_DRAG, mMotionEvent.wrap(e2));
+    }
+}

vtm-android-example/src/org/oscim/android/drag/DragMapView.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2012 Hannes Janetzek
+ * Copyright 2016-2020 devemux86
+ * Copyright 2018-2019 Gustl22
+ * Copyright 2021 Frank Knoll
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.android.drag;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import org.oscim.android.MapView;
+import org.oscim.map.Map;
+import org.oscim.utils.Parameters;
+
+public class DragMapView extends MapView {
+
+    private DragGestureHandler gestureHandler;
+
+    public DragMapView(Context context) {
+        super(context);
+    }
+
+    public DragMapView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+
+        if (!Parameters.MAP_EVENT_LAYER2) {
+            gestureHandler = new DragGestureHandler(mMap);
+            mGestureDetector = new GestureDetector(context, gestureHandler);
+            mGestureDetector.setOnDoubleTapListener(gestureHandler);
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(android.view.MotionEvent motionEvent) {
+        if (!isClickable()) {
+            return false;
+        }
+
+        if (motionEvent.getAction() == android.view.MotionEvent.ACTION_UP) {
+            if (gestureHandler.isScrolling()) {
+                gestureHandler.setScrolling(false);
+                return ((Map) mMap).handleGesture(DragGestureHandler.END_DRAG, mMotionEvent.wrap(motionEvent));
+            }
+        }
+
+        return super.onTouchEvent(motionEvent);
+    }
+}

vtm-android-example/src/org/oscim/android/drag/DraggableItemizedLayer.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2012 osmdroid authors: Nicolas Gramlich, Theodore Hong, Fred Eisele
+ *
+ * Copyright 2013 Hannes Janetzek
+ * Copyright 2016-2021 devemux86
+ * Copyright 2016 Stephan Leuschner
+ * Copyright 2016 Pedinel
+ * Copyright 2019 Carlos Alberto Martínez Gadea
+ * Copyright 2021 Frank Knoll
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.android.drag;
+
+import org.oscim.core.GeoPoint;
+import org.oscim.event.Gesture;
+import org.oscim.event.GestureListener;
+import org.oscim.event.MotionEvent;
+import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
+import org.oscim.layers.marker.MarkerSymbol;
+import org.oscim.map.Map;
+
+import java.util.List;
+
+import static org.oscim.android.drag.DragGestureHandler.*;
+
+public class DraggableItemizedLayer extends ItemizedLayer implements GestureListener {
+
+    private final ItemDragger itemDragger;
+
+    public DraggableItemizedLayer(Map map,
+                                  List<MarkerInterface> markerItems,
+                                  MarkerSymbol defaultMarker,
+                                  OnItemGestureListener<MarkerInterface> listener) {
+        super(map, markerItems, defaultMarker, listener);
+        itemDragger = new ItemDragger(this, map);
+    }
+
+    @Override
+    protected boolean activateSelectedItems(MotionEvent event, ActiveItem task) {
+        return super.activateSelectedItems(event, task);
+    }
+
+    protected List<MarkerInterface> getMarkerItems() {
+        return mItemList;
+    }
+
+    @Override
+    public boolean onGesture(Gesture gesture, MotionEvent event) {
+        if (!isEnabled()) {
+            return false;
+        }
+
+        if (gesture == START_DRAG) {
+            return itemDragger.startDragItem(event, getGeoPoint(event));
+        } else if (gesture == ONGOING_DRAG) {
+            return itemDragger.ongoingDragItemTo(getGeoPoint(event));
+        } else if (gesture == END_DRAG) {
+            return itemDragger.dropItemAt(getGeoPoint(event));
+        } else {
+            itemDragger.noDrag();
+        }
+
+        return super.onGesture(gesture, event);
+    }
+
+    private GeoPoint getGeoPoint(MotionEvent event) {
+        return map().viewport().fromScreenPoint(event.getX(), event.getY());
+    }
+}

vtm-android-example/src/org/oscim/android/drag/DraggableMarkerItem.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012 osmdroid authors:
+ * Copyright 2012 Nicolas Gramlich
+ * Copyright 2012 Theodore Hong
+ * Copyright 2012 Fred Eisele
+ *
+ * Copyright 2014 Hannes Janetzek
+ * Copyright 2016 devemux86
+ * Copyright 2016 Erik Duisters
+ * Copyright 2017 Longri
+ * Copyright 2021 Frank Knoll
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.android.drag;
+
+import org.oscim.core.GeoPoint;
+import org.oscim.layers.marker.MarkerItem;
+
+public class DraggableMarkerItem extends MarkerItem {
+
+    private final DragAndDropListener dragAndDropListener;
+
+    public DraggableMarkerItem(String title, String description, GeoPoint geoPoint, DragAndDropListener dragAndDropListener) {
+        super(title, description, geoPoint);
+        this.dragAndDropListener = dragAndDropListener;
+    }
+
+    public DragAndDropListener getDragAndDropListener() {
+        return dragAndDropListener;
+    }
+}

vtm-android-example/src/org/oscim/android/drag/ItemDragger.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2021 Frank Knoll
+ *
+ * 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.drag;
+
+import org.oscim.core.GeoPoint;
+import org.oscim.event.MotionEvent;
+import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerItem;
+import org.oscim.layers.marker.MarkerLayer;
+import org.oscim.map.Map;
+
+class ItemDragger {
+
+    private final DraggableItemizedLayer draggableItemizedLayer;
+    private final DragAndDropListener dragItemAndRedrawListener;
+    private DraggableMarkerItem dragItem;
+
+    public ItemDragger(DraggableItemizedLayer draggableItemizedLayer, Map map) {
+        this.draggableItemizedLayer = draggableItemizedLayer;
+        this.dragItemAndRedrawListener = createDragItemAndRedrawListener(draggableItemizedLayer, map);
+    }
+
+    public boolean startDragItem(MotionEvent event, final GeoPoint geoPoint) {
+        dragItem = null;
+        return draggableItemizedLayer.activateSelectedItems(
+                event,
+                new ItemizedLayer.ActiveItem() {
+                    @Override
+                    public boolean run(int index) {
+                        dragItem = (DraggableMarkerItem) draggableItemizedLayer.getMarkerItems().get(index);
+                        dragItemAndRedrawListener.startDragItemAtGeoPoint(dragItem, geoPoint);
+                        return true;
+                    }
+                });
+    }
+
+    public boolean ongoingDragItemTo(GeoPoint geoPoint) {
+        if (dragItem == null) {
+            return false;
+        }
+        dragItemAndRedrawListener.ongoingDragItemToGeoPoint(dragItem, geoPoint);
+        return true;
+    }
+
+    public boolean dropItemAt(GeoPoint geoPoint) {
+        if (dragItem == null) {
+            return false;
+        }
+        dragItemAndRedrawListener.dropItemAtGeoPoint(dragItem, geoPoint);
+        return true;
+    }
+
+    public void noDrag() {
+        dragItem = null;
+    }
+
+    private DragAndDropListener createDragItemAndRedrawListener(final MarkerLayer markerLayer, final Map map) {
+        return new DragAndDropListener() {
+            @Override
+            public void startDragItemAtGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint) {
+                item.getDragAndDropListener().startDragItemAtGeoPoint(item, geoPoint);
+                updateLocationOfMarkerItemAndRedraw(item, geoPoint);
+            }
+
+            @Override
+            public void ongoingDragItemToGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint) {
+                item.getDragAndDropListener().ongoingDragItemToGeoPoint(item, geoPoint);
+                updateLocationOfMarkerItemAndRedraw(item, geoPoint);
+            }
+
+            @Override
+            public void dropItemAtGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint) {
+                item.getDragAndDropListener().dropItemAtGeoPoint(item, geoPoint);
+                updateLocationOfMarkerItemAndRedraw(item, geoPoint);
+            }
+
+            private void updateLocationOfMarkerItemAndRedraw(MarkerItem markerItem, GeoPoint location) {
+                markerItem.geoPoint = location;
+                markerLayer.populate();
+                map.render();
+            }
+        };
+    }
+}

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

@@ -192,6 +192,7 @@ public class FilePicker extends Activity implements AdapterView.OnItemClickListe
         // }
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected Dialog onCreateDialog(int id) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);

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,56 +73,42 @@ 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) {
-
-        switch (item.getItemId()) {
-            case R.id.theme_default:
-                mMap.setTheme(VtmThemes.DEFAULT);
+        int itemId = item.getItemId();
+        if (itemId == R.id.theme_default) {
+            mMap.setTheme(VtmThemes.DEFAULT);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_osmarender) {
+            mMap.setTheme(VtmThemes.OSMARENDER);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_osmagray) {
+            mMap.setTheme(VtmThemes.OSMAGRAY);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_tubes) {
+            mMap.setTheme(VtmThemes.TRONRENDER);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_newtron) {
+            mMap.setTheme(VtmThemes.NEWTRON);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.gridlayer) {
+            if (item.isChecked()) {
+                item.setChecked(false);
+                mMap.layers().remove(mGridLayer);
+            } else {
                 item.setChecked(true);
-                return true;
+                if (mGridLayer == null)
+                    mGridLayer = new TileGridLayer(mMap);
 
-            case R.id.theme_osmarender:
-                mMap.setTheme(VtmThemes.OSMARENDER);
-                item.setChecked(true);
-                return true;
-
-            case R.id.theme_osmagray:
-                mMap.setTheme(VtmThemes.OSMAGRAY);
-                item.setChecked(true);
-                return true;
-
-            case R.id.theme_tubes:
-                mMap.setTheme(VtmThemes.TRONRENDER);
-                item.setChecked(true);
-                return true;
-
-            case R.id.theme_newtron:
-                mMap.setTheme(VtmThemes.NEWTRON);
-                item.setChecked(true);
-                return true;
-
-            case R.id.gridlayer:
-                if (item.isChecked()) {
-                    item.setChecked(false);
-                    mMap.layers().remove(mGridLayer);
-                } else {
-                    item.setChecked(true);
-                    if (mGridLayer == null)
-                        mGridLayer = new TileGridLayer(mMap);
-
-                    mMap.layers().add(mGridLayer);
-                }
-                mMap.updateMap(true);
-                return true;
+                mMap.layers().add(mGridLayer);
+            }
+            mMap.updateMap(true);
+            return true;
         }
 
         return false;

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,37 @@
+/*
+ * 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.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+@SuppressWarnings("deprecation")
+public class BlankFragment extends android.app.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
@@ -17,16 +17,18 @@ package org.oscim.android.test;
 
 import android.graphics.BitmapFactory;
 import org.oscim.android.canvas.AndroidBitmap;
+import org.oscim.android.cluster.ClusterMarkerRenderer;
 import org.oscim.backend.canvas.Bitmap;
 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 +41,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 +66,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/DraggableMarkerOverlayActivity.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2014 Hannes Janetzek
+ * Copyright 2016-2020 devemux86
+ * Copyright 2021 Frank Knoll
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.android.test;
+
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.util.Log;
+import org.oscim.android.canvas.AndroidBitmap;
+import org.oscim.android.drag.DragAndDropListener;
+import org.oscim.android.drag.DraggableItemizedLayer;
+import org.oscim.android.drag.DraggableMarkerItem;
+import org.oscim.core.GeoPoint;
+import org.oscim.layers.marker.ItemizedLayer;
+import org.oscim.layers.marker.MarkerInterface;
+import org.oscim.layers.marker.MarkerSymbol;
+import org.oscim.layers.marker.MarkerSymbol.HotspotPlace;
+import org.oscim.layers.tile.bitmap.BitmapTileLayer;
+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 DraggableMarkerOverlayActivity extends MapActivity {
+
+    public DraggableMarkerOverlayActivity() {
+        super(R.layout.activity_map_draggable);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        createLayers();
+    }
+
+    void createLayers() {
+        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));
+
+        ItemizedLayer mMarkerLayer = new DraggableItemizedLayer(
+                mMap,
+                new ArrayList<MarkerInterface>(),
+                new MarkerSymbol(
+                        new AndroidBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.marker_poi)),
+                        HotspotPlace.BOTTOM_CENTER),
+                null);
+        mMap.layers().add(mMarkerLayer);
+
+        DragAndDropListener dragAndDropListener = new DragAndDropListener() {
+            @Override
+            public void startDragItemAtGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint) {
+                Log.i(DraggableMarkerOverlayActivity.this.getClass().getSimpleName(), "startDragItemAtGeoPoint: " + geoPoint);
+            }
+
+            @Override
+            public void ongoingDragItemToGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint) {
+                Log.i(DraggableMarkerOverlayActivity.this.getClass().getSimpleName(), "ongoingDragItemToGeoPoint: " + geoPoint);
+            }
+
+            @Override
+            public void dropItemAtGeoPoint(DraggableMarkerItem item, GeoPoint geoPoint) {
+                Log.i(DraggableMarkerOverlayActivity.this.getClass().getSimpleName(), "dropItemAtGeoPoint: " + geoPoint);
+            }
+        };
+
+        List<MarkerInterface> pts = new ArrayList<>();
+        for (double lat = -90; lat <= 90; lat += 45) {
+            for (double lon = -180; lon <= 180; lon += 45) {
+                pts.add(new DraggableMarkerItem(lat + "/" + lon, "", new GeoPoint(lat, lon), dragAndDropListener));
+            }
+        }
+
+        mMarkerLayer.addItems(pts);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        /* ignore saved position */
+        mMap.setMapPosition(0, 0, 1 << 2);
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * 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.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+@SuppressWarnings("deprecation")
+public class FragmentActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_map_fragment);
+
+        setTitle(getClass().getSimpleName());
+
+        if (savedInstanceState == null) {
+            android.app.Fragment mapFragment = MapFragment.newInstance();
+            android.app.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;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.replace_fragment) {
+            android.app.Fragment blankFragment = BlankFragment.newInstance();
+            android.app.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

@@ -15,172 +15,171 @@
  * 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.content.Context;
-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 org.oscim.backend.CanvasAdapter;
-import org.oscim.backend.canvas.Color;
-import org.oscim.layers.OSMIndoorLayer;
-import org.oscim.layers.tile.buildings.BuildingLayer;
-import org.oscim.layers.tile.vector.labeling.LabelLayer;
-import org.oscim.test.JeoTest;
-import org.oscim.theme.VtmThemes;
-import org.oscim.theme.styles.TextStyle;
-import org.oscim.utils.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Arrays;
-
-public class JeoIndoorActivity extends BaseMapActivity {
-    public static final Logger log = LoggerFactory.getLogger(JeoIndoorActivity.class);
-
-    // from http://overpass-turbo.eu/s/2vp
-    String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
-
-    private OSMIndoorLayer mIndoorLayer;
-
-    public JeoIndoorActivity() {
-        super(R.layout.jeo_indoor_map);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mMap.addTask(new Runnable() {
-            @Override
-            public void run() {
-                showToast("load data");
-                InputStream is = null;
-                try {
-                    //    File file = new File(Environment.getExternalStorageDirectory()
-                    //        .getAbsolutePath(), "osmindoor.json");
-                    //    is = new FileInputStream(file);
-
-                    URL url = new URL(PATH);
-                    URLConnection conn = url.openConnection();
-                    is = conn.getInputStream();
-                    loadJson(is);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } finally {
-                    IOUtils.closeQuietly(is);
-                }
-            }
-        });
-
-        mMap.setTheme(VtmThemes.DEFAULT);
-
-        mMap.layers().add(new BuildingLayer(mMap, mBaseLayer));
-        mMap.layers().add(new LabelLayer(mMap, mBaseLayer));
-
-        //    String file = Environment.getExternalStorageDirectory().getAbsolutePath();
-        //    VectorDataset data = (VectorDataset) JeoTest.getJsonData(file + "/states.json", true);
-        //    Style style = JeoTest.getStyle();
-        //    mMap.layers().add(new JeoVectorLayer(mMap, data, style));
-    }
-
-    void loadJson(InputStream is) {
-        showToast("got data");
-
-        VectorDataset data = JeoTest.readGeoJson(is);
-        Style style = JeoTest.getStyle();
-        TextStyle textStyle = TextStyle.builder()
-                .isCaption(true)
-                .fontSize(16 * CanvasAdapter.getScale()).color(Color.BLACK)
-                .strokeWidth(2.2f * CanvasAdapter.getScale()).strokeColor(Color.WHITE)
-                .build();
-        mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
-        mMap.layers().add(mIndoorLayer);
-
-        showToast("data ready");
-        mMap.updateMap(true);
-
-        mIndoorLayer.activeLevels[0] = true;
-        shift();
-    }
-
-    public void showToast(final String text) {
-        final Context ctx = this;
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast toast = Toast.makeText(ctx, text, Toast.LENGTH_SHORT);
-                toast.show();
-            }
-        });
-    }
-
-    boolean mShift = true;
-
-    public void shift() {
-        if (!mShift)
-            return;
-
-        mMap.postDelayed(new Runnable() {
-
-            @Override
-            public void run() {
-                for (int i = 0; i < 10; i++) {
-                    if (mIndoorLayer.activeLevels[i]) {
-                        mIndoorLayer.activeLevels[i] = false;
-                        mIndoorLayer.activeLevels[(i + 1) % 9] = true;
-                        mIndoorLayer.update();
-                        break;
-                    }
-                }
-                shift();
-            }
-        }, 200);
-
-    }
-
-    public void onClick(View v) {
-        mShift = false;
-
-        if (mIndoorLayer == null)
-            return;
-
-        int i = 0;
-
-        if (v instanceof ToggleButton) {
-            ToggleButton b = (ToggleButton) v;
-            i = (b.getTextOn().charAt(0) - '0') + 1;
-        }
-
-        if (i < 0 || i > 9)
-            i = 0;
-
-        mIndoorLayer.activeLevels[i] ^= true;
-        if (v instanceof ToggleButton)
-            ((ToggleButton) v).setChecked(mIndoorLayer.activeLevels[i]);
-        log.debug(Arrays.toString(mIndoorLayer.activeLevels));
-        mIndoorLayer.update();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        /* ignore saved position */
-        //mMap.setMapPosition(49.417, 8.673, 1 << 17);
-        mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
-    }
-}
+//package org.oscim.android.test;
+//
+//import android.content.Context;
+//import android.os.Bundle;
+//import android.view.View;
+//import android.widget.Toast;
+//import android.widget.ToggleButton;
+//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;
+//import org.oscim.layers.tile.buildings.BuildingLayer;
+//import org.oscim.layers.tile.vector.labeling.LabelLayer;
+//import org.oscim.test.JeoTest;
+//import org.oscim.theme.VtmThemes;
+//import org.oscim.theme.styles.TextStyle;
+//import org.oscim.utils.IOUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.net.URL;
+//import java.net.URLConnection;
+//import java.util.Arrays;
+//
+//public class JeoIndoorActivity extends BaseMapActivity {
+//    public static final Logger log = LoggerFactory.getLogger(JeoIndoorActivity.class);
+//
+//    // from http://overpass-turbo.eu/s/2vp
+//    String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
+//
+//    private OSMIndoorLayer mIndoorLayer;
+//
+//    public JeoIndoorActivity() {
+//        super(R.layout.jeo_indoor_map);
+//    }
+//
+//    @Override
+//    public void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//
+//        mMap.addTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                showToast("load data");
+//                InputStream is = null;
+//                try {
+//                    //    File file = new File(Environment.getExternalStorageDirectory()
+//                    //        .getAbsolutePath(), "osmindoor.json");
+//                    //    is = new FileInputStream(file);
+//
+//                    URL url = new URL(PATH);
+//                    URLConnection conn = url.openConnection();
+//                    is = conn.getInputStream();
+//                    loadJson(is);
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                } finally {
+//                    IOUtils.closeQuietly(is);
+//                }
+//            }
+//        });
+//
+//        mMap.setTheme(VtmThemes.DEFAULT);
+//
+//        mMap.layers().add(new BuildingLayer(mMap, mBaseLayer));
+//        mMap.layers().add(new LabelLayer(mMap, mBaseLayer));
+//
+//        //    String file = Environment.getExternalStorageDirectory().getAbsolutePath();
+//        //    VectorDataset data = (VectorDataset) JeoTest.getJsonData(file + "/states.json", true);
+//        //    Style style = JeoTest.getStyle();
+//        //    mMap.layers().add(new JeoVectorLayer(mMap, data, style));
+//    }
+//
+//    void loadJson(InputStream is) {
+//        showToast("got data");
+//
+//        VectorDataset data = JeoTest.readGeoJson(is);
+//        Style style = JeoTest.getStyle();
+//        TextStyle textStyle = TextStyle.builder()
+//                .isCaption(true)
+//                .fontSize(16 * CanvasAdapter.getScale()).color(Color.BLACK)
+//                .strokeWidth(2.2f * CanvasAdapter.getScale()).strokeColor(Color.WHITE)
+//                .build();
+//        mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
+//        mMap.layers().add(mIndoorLayer);
+//
+//        showToast("data ready");
+//        mMap.updateMap(true);
+//
+//        mIndoorLayer.activeLevels[0] = true;
+//        shift();
+//    }
+//
+//    public void showToast(final String text) {
+//        final Context ctx = this;
+//        runOnUiThread(new Runnable() {
+//            @Override
+//            public void run() {
+//                Toast toast = Toast.makeText(ctx, text, Toast.LENGTH_SHORT);
+//                toast.show();
+//            }
+//        });
+//    }
+//
+//    boolean mShift = true;
+//
+//    public void shift() {
+//        if (!mShift)
+//            return;
+//
+//        mMap.postDelayed(new Runnable() {
+//
+//            @Override
+//            public void run() {
+//                for (int i = 0; i < 10; i++) {
+//                    if (mIndoorLayer.activeLevels[i]) {
+//                        mIndoorLayer.activeLevels[i] = false;
+//                        mIndoorLayer.activeLevels[(i + 1) % 9] = true;
+//                        mIndoorLayer.update();
+//                        break;
+//                    }
+//                }
+//                shift();
+//            }
+//        }, 200);
+//
+//    }
+//
+//    public void onClick(View v) {
+//        mShift = false;
+//
+//        if (mIndoorLayer == null)
+//            return;
+//
+//        int i = 0;
+//
+//        if (v instanceof ToggleButton) {
+//            ToggleButton b = (ToggleButton) v;
+//            i = (b.getTextOn().charAt(0) - '0') + 1;
+//        }
+//
+//        if (i < 0 || i > 9)
+//            i = 0;
+//
+//        mIndoorLayer.activeLevels[i] ^= true;
+//        if (v instanceof ToggleButton)
+//            ((ToggleButton) v).setChecked(mIndoorLayer.activeLevels[i]);
+//        log.debug(Arrays.toString(mIndoorLayer.activeLevels));
+//        mIndoorLayer.update();
+//    }
+//
+//    @Override
+//    protected void onStop() {
+//        super.onStop();
+//    }
+//
+//    @Override
+//    protected void onResume() {
+//        super.onResume();
+//
+//        /* ignore saved position */
+//        //mMap.setMapPosition(49.417, 8.673, 1 << 17);
+//        mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
+//    }
+//}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-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
@@ -96,6 +96,7 @@ public class LocationActivity extends BitmapTileActivity implements LocationList
     public void onProviderEnabled(String provider) {
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void onStatusChanged(String provider, int status, Bundle extras) {
     }
@@ -103,7 +104,7 @@ public class LocationActivity extends BitmapTileActivity implements LocationList
     private void enableAvailableProviders() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
+                requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 0);
                 return;
             }
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-2021 devemux86
  * Copyright 2018 Longri
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -126,6 +126,7 @@ public class LocationTextureActivity extends BitmapTileActivity implements Locat
     public void onProviderEnabled(String provider) {
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void onStatusChanged(String provider, int status, Bundle extras) {
     }
@@ -133,7 +134,7 @@ public class LocationTextureActivity extends BitmapTileActivity implements Locat
     private void enableAvailableProviders() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
+                requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 0);
                 return;
             }
         }

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

@@ -41,7 +41,7 @@ public class MBTilesBitmapActivity extends BitmapTileActivity {
         if (!file.exists()) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this)
                     .setTitle(R.string.warning)
-                    .setMessage(getResources().getString(R.string.startup_message_mbtiles, file.getName(), file.getAbsolutePath()))
+                    .setMessage(getResources().getString(R.string.startup_message_mbtiles))
                     .setPositiveButton(R.string.exit, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {

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

@@ -45,7 +45,7 @@ public class MBTilesMvtActivity extends MapActivity {
         if (!file.exists()) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this)
                     .setTitle(R.string.warning)
-                    .setMessage(getResources().getString(R.string.startup_message_mbtiles, file.getName(), file.getAbsolutePath()))
+                    .setMessage(getResources().getString(R.string.startup_message_mbtiles))
                     .setPositiveButton(R.string.exit, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {

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

@@ -0,0 +1,124 @@
+/*
+ * 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.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 android.app.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
@@ -124,71 +114,87 @@ public class MapsforgeActivity extends MapActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-
-        switch (item.getItemId()) {
-            case R.id.theme_default:
-                mMap.setTheme(VtmThemes.DEFAULT);
+        int itemId = item.getItemId();
+        if (itemId == R.id.theme_default) {
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(VtmThemes.DEFAULT);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_osmarender) {
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(VtmThemes.OSMARENDER);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_osmagray) {
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(VtmThemes.OSMAGRAY);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_tubes) {
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(VtmThemes.TRONRENDER);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == R.id.theme_newtron) {
+            if (mTheme != null)
+                mTheme.dispose();
+            mTheme = mMap.setTheme(VtmThemes.NEWTRON);
+            item.setChecked(true);
+            return true;
+        } else if (itemId == 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;
+        } else if (itemId == R.id.theme_external) {
+            Intent intent;
+            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;
+        } else if (itemId == R.id.gridlayer) {
+            if (item.isChecked()) {
+                item.setChecked(false);
+                mMap.layers().remove(mGridLayer);
+            } else {
                 item.setChecked(true);
-                return true;
+                if (mGridLayer == null)
+                    mGridLayer = new TileGridLayer(mMap);
 
-            case R.id.theme_osmarender:
-                mMap.setTheme(VtmThemes.OSMARENDER);
-                item.setChecked(true);
-                return true;
-
-            case R.id.theme_osmagray:
-                mMap.setTheme(VtmThemes.OSMAGRAY);
-                item.setChecked(true);
-                return true;
-
-            case R.id.theme_tubes:
-                mMap.setTheme(VtmThemes.TRONRENDER);
-                item.setChecked(true);
-                return true;
-
-            case R.id.theme_newtron:
-                mMap.setTheme(VtmThemes.NEWTRON);
-                item.setChecked(true);
-                return true;
-
-            case R.id.theme_external:
-                startActivityForResult(new Intent(this, ThemeFilePicker.class),
-                        SELECT_THEME_FILE);
-                return true;
-
-            case R.id.gridlayer:
-                if (item.isChecked()) {
-                    item.setChecked(false);
-                    mMap.layers().remove(mGridLayer);
-                } else {
-                    item.setChecked(true);
-                    if (mGridLayer == null)
-                        mGridLayer = new TileGridLayer(mMap);
-
-                    mMap.layers().add(mGridLayer);
-                }
-                mMap.updateMap(true);
-                return true;
+                mMap.layers().add(mGridLayer);
+            }
+            mMap.updateMap(true);
+            return true;
         }
 
         return false;
     }
 
     @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 +203,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;
@@ -38,27 +37,29 @@ public class MapsforgeStyleActivity extends MapsforgeActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.style_1:
-                item.setChecked(true);
-                loadTheme("1");
-                mMap.clearMap();
-                Toast.makeText(this, "Show nature layers", Toast.LENGTH_SHORT).show();
-                return true;
-            case R.id.style_2:
-                item.setChecked(true);
-                loadTheme("2");
-                mMap.clearMap();
-                Toast.makeText(this, "Hide nature layers", Toast.LENGTH_SHORT).show();
-                return true;
-            default:
-                return false;
+        int itemId = item.getItemId();
+        if (itemId == R.id.style_1) {
+            item.setChecked(true);
+            loadTheme("1");
+            mMap.clearMap();
+            Toast.makeText(this, "Show nature layers", Toast.LENGTH_SHORT).show();
+            return true;
+        } else if (itemId == R.id.style_2) {
+            item.setChecked(true);
+            loadTheme("2");
+            mMap.clearMap();
+            Toast.makeText(this, "Hide nature layers", Toast.LENGTH_SHORT).show();
+            return true;
         }
+
+        return false;
     }
 
     @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
@@ -18,7 +18,6 @@ package org.oscim.android.test;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.BitmapFactory;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -41,6 +40,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 +57,15 @@ 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> {
+@SuppressWarnings("deprecation")
+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;
     }
 
@@ -273,7 +275,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
         }
     }
 
-    private class PoiSearchTask extends AsyncTask<BoundingBox, Void, Collection<PointOfInterest>> {
+    private class PoiSearchTask extends android.os.AsyncTask<BoundingBox, Void, Collection<PointOfInterest>> {
         private final WeakReference<PoiSearchActivity> weakActivity;
         private final String category;
         private final List<Tag> patterns;
@@ -295,7 +297,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
                 org.mapsforge.core.model.BoundingBox bb = new org.mapsforge.core.model.BoundingBox(
                         params[0].getMinLatitude(), params[0].getMinLongitude(),
                         params[0].getMaxLatitude(), params[0].getMaxLongitude());
-                return mPersistenceManager.findInRect(bb, categoryFilter, patterns, Integer.MAX_VALUE);
+                return mPersistenceManager.findInRect(bb, categoryFilter, patterns, null, Integer.MAX_VALUE);
             } catch (Throwable t) {
                 log.error(t.getMessage(), t);
             }
@@ -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));
@@ -128,9 +121,11 @@ public class Samples extends Activity {
         linearLayout.addView(createLabel("Experiments"));
         linearLayout.addView(createButton(ReverseGeocodeActivity.class));
         linearLayout.addView(createButton(ThemeStylerActivity.class));
-        linearLayout.addView(createButton(JeoIndoorActivity.class));
+        //linearLayout.addView(createButton(JeoIndoorActivity.class));
         linearLayout.addView(createButton(GdxPoi3DActivity.class));
         linearLayout.addView(createButton(OverpassActivity.class));
+        linearLayout.addView(createButton(DraggableMarkerOverlayActivity.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-example/src/org/oscim/android/test/ThemeStylerActivity.java

@@ -163,16 +163,13 @@ public class ThemeStylerActivity extends BaseMapActivity implements OnSeekBarCha
             return;
 
         HSV c = null;
-        switch (view.getId()) {
-            case R.id.checkBoxArea:
-                c = areaColor;
-                break;
-            case R.id.checkBoxLine:
-                c = lineColor;
-                break;
-            case R.id.checkBoxOutline:
-                c = outlineColor;
-                break;
+        int id = view.getId();
+        if (id == R.id.checkBoxArea) {
+            c = areaColor;
+        } else if (id == R.id.checkBoxLine) {
+            c = lineColor;
+        } else if (id == R.id.checkBoxOutline) {
+            c = outlineColor;
         }
         if (c == null)
             return;

vtm-android-gdx/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest package="org.oscim.gdx" />

vtm-android-gdx/build.gradle

@@ -1,57 +1,31 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'java-library'
+apply plugin: 'maven-publish'
 
 dependencies {
+    compileOnly files("${System.env.ANDROID_HOME}/platforms/android-${androidCompileSdk()}/android.jar")
     api project(':vtm')
     api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
 }
 
-android {
-    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "$androidBuildVersionTools"
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    defaultConfig {
-        versionCode project.versionCode()
-        versionName project.versionName()
-        minSdkVersion androidMinSdk()
-        targetSdkVersion androidTargetSdk()
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-        }
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
-
-    lintOptions { abortOnError false }
+sourceSets {
+    main.java.srcDirs = ['src']
 }
 
-android.libraryVariants.all { variant ->
-    def name = variant.buildType.name
-    if (name == "debug")
-        return
+file('natives').eachDir() { dir ->
+    task("nativesJar-${dir.name}", type: Jar) {
+        archiveClassifier = "natives-${dir.name}"
+        from(dir.path)
+    }
+}
 
-    def jar = project.tasks.create "jar${name.capitalize()}", Jar
-    jar.dependsOn variant.javaCompileProvider
-    jar.exclude '**/BuildConfig.class'
-    jar.exclude '**/R.class'
-    jar.exclude '**/R$*.class'
-    jar.from variant.javaCompileProvider.get().destinationDir
-    artifacts.add('archives', jar)
-
-    file('natives').eachDir() { dir ->
-        def nativesJar = project.tasks.create "nativesJar${name.capitalize()}-${dir.name}", Jar
-        nativesJar.classifier = "natives-${dir.name}"
-        nativesJar.from(dir.path)
-        artifacts.add('archives', nativesJar)
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            file('natives').eachDir() { dir ->
+                artifact tasks["nativesJar-${dir.name}"]
+            }
+        }
     }
 }
 
@@ -60,3 +34,7 @@ if (project.hasProperty("SONATYPE_USERNAME")) {
         project.apply from: "${rootProject.projectDir}/deploy.gradle"
     }
 }
+
+if (System.getenv('ANDROID_HOME') == null) {
+    throw new GradleException("Environment variable ANDROID_HOME needs to be set to SDK folder")
+}

vtm-android-gdx/src/org/oscim/gdx/AndroidGL.java

@@ -222,7 +222,7 @@ public class AndroidGL implements GL {
 
     @Override
     public String getActiveUniform(int program, int index, IntBuffer size, Buffer type) {
-        return androidGL.glGetActiveUniform(program, index, size, type);
+        return androidGL.glGetActiveUniform(program, index, size, (IntBuffer) type);
     }
 
     @Override

vtm-android-gdx/src/org/oscim/gdx/AndroidGL30.java

@@ -35,12 +35,12 @@ package org.oscim.gdx;
 
 import android.annotation.SuppressLint;
 import android.opengl.GLES30;
-
 import org.oscim.backend.GL30;
 
 /**
  * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGL30.java
  */
+@SuppressWarnings("deprecation")
 @SuppressLint("NewApi")
 public class AndroidGL30 extends AndroidGL implements GL30 {
     @Override

vtm-android-mvt/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest package="org.oscim.android.mvt" />

vtm-android-mvt/build.gradle

@@ -1,51 +1,22 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'java-library'
+apply plugin: 'maven-publish'
 
 dependencies {
+    compileOnly files("${System.env.ANDROID_HOME}/platforms/android-${androidCompileSdk()}/android.jar")
     api project(':vtm-android')
     api project(':vtm-mvt')
 }
 
-android {
-    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "$androidBuildVersionTools"
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    defaultConfig {
-        versionCode project.versionCode()
-        versionName project.versionName()
-        minSdkVersion androidMinSdk()
-        targetSdkVersion androidTargetSdk()
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-        }
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
-
-    lintOptions { abortOnError false }
+sourceSets {
+    main.java.srcDirs = ['src']
 }
 
-android.libraryVariants.all { variant ->
-    def name = variant.buildType.name
-    if (name == "debug")
-        return
-
-    def jar = project.tasks.create "jar${name.capitalize()}", Jar
-    jar.dependsOn variant.javaCompileProvider
-    jar.exclude '**/BuildConfig.class'
-    jar.exclude '**/R.class'
-    jar.exclude '**/R$*.class'
-    jar.from variant.javaCompileProvider.get().destinationDir
-    artifacts.add('archives', jar)
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+        }
+    }
 }
 
 if (project.hasProperty("SONATYPE_USERNAME")) {
@@ -53,3 +24,7 @@ if (project.hasProperty("SONATYPE_USERNAME")) {
         project.apply from: "${rootProject.projectDir}/deploy.gradle"
     }
 }
+
+if (System.getenv('ANDROID_HOME') == null) {
+    throw new GradleException("Environment variable ANDROID_HOME needs to be set to SDK folder")
+}

vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java

@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 Kostas Tzounopoulos
+ * Copyright 2022 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
@@ -27,7 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -134,7 +134,8 @@ public class MBTilesMvtTileDataSource extends MBTilesTileDataSource {
                 responseDataSink.completed(success ? QueryResult.SUCCESS : QueryResult.FAILED);
             } else
                 responseDataSink.completed(QueryResult.TILE_NOT_FOUND);
-        } catch (IOException e) {
+        } catch (Throwable t) {
+            log.error(t.getMessage(), t);
             responseDataSink.completed(QueryResult.FAILED);
         } finally {
             if (cursor != null)

vtm-android/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest package="org.oscim.android" />

vtm-android/build.gradle

@@ -1,57 +1,31 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'java-library'
+apply plugin: 'maven-publish'
 
 dependencies {
+    compileOnly files("${System.env.ANDROID_HOME}/platforms/android-${androidCompileSdk()}/android.jar")
     api project(':vtm')
     api 'com.caverock:androidsvg:1.4'
 }
 
-android {
-    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "$androidBuildVersionTools"
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    defaultConfig {
-        versionCode project.versionCode()
-        versionName project.versionName()
-        minSdkVersion androidMinSdk()
-        targetSdkVersion androidTargetSdk()
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-        }
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
-
-    lintOptions { abortOnError false }
+sourceSets {
+    main.java.srcDirs = ['src']
 }
 
-android.libraryVariants.all { variant ->
-    def name = variant.buildType.name
-    if (name == "debug")
-        return
+file('natives').eachDir() { dir ->
+    task("nativesJar-${dir.name}", type: Jar) {
+        archiveClassifier = "natives-${dir.name}"
+        from(dir.path)
+    }
+}
 
-    def jar = project.tasks.create "jar${name.capitalize()}", Jar
-    jar.dependsOn variant.javaCompileProvider
-    jar.exclude '**/BuildConfig.class'
-    jar.exclude '**/R.class'
-    jar.exclude '**/R$*.class'
-    jar.from variant.javaCompileProvider.get().destinationDir
-    artifacts.add('archives', jar)
-
-    file('natives').eachDir() { dir ->
-        def nativesJar = project.tasks.create "nativesJar${name.capitalize()}-${dir.name}", Jar
-        nativesJar.classifier = "natives-${dir.name}"
-        nativesJar.from(dir.path)
-        artifacts.add('archives', nativesJar)
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            file('natives').eachDir() { dir ->
+                artifact tasks["nativesJar-${dir.name}"]
+            }
+        }
     }
 }
 
@@ -60,3 +34,7 @@ if (project.hasProperty("SONATYPE_USERNAME")) {
         project.apply from: "${rootProject.projectDir}/deploy.gradle"
     }
 }
+
+if (System.getenv('ANDROID_HOME') == null) {
+    throw new GradleException("Environment variable ANDROID_HOME needs to be set to SDK folder")
+}

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).
@@ -92,6 +92,7 @@ public class MapView extends GLSurfaceView {
         this(context, null);
     }
 
+    @SuppressWarnings("deprecation")
     public MapView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
 
@@ -112,7 +113,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
@@ -106,6 +107,9 @@ public final class AndroidGraphics extends CanvasAdapter {
         return new AndroidBitmap(bitmap);
     }
 
+    /**
+     * @deprecated
+     */
     public static Bitmap drawableToBitmap(Resources res, int resId) {
         return drawableToBitmap(res.getDrawable(resId));
     }

vtm-android/src/org/oscim/android/gl/AndroidGL30.java

@@ -35,12 +35,12 @@ package org.oscim.android.gl;
 
 import android.annotation.SuppressLint;
 import android.opengl.GLES30;
-
 import org.oscim.backend.GL30;
 
 /**
  * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGL30.java
  */
+@SuppressWarnings("deprecation")
 @SuppressLint("NewApi")
 public class AndroidGL30 extends AndroidGL implements GL30 {
     @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-android/src/org/oscim/android/tiling/source/mbtiles/MBTilesBitmapTileDataSource.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2019 Andrea Antonello
- * Copyright 2019 devemux86
+ * Copyright 2019-2022 devemux86
  * Copyright 2019 Kostas Tzounopoulos
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -124,8 +124,8 @@ public class MBTilesBitmapTileDataSource extends MBTilesTileDataSource {
             Bitmap bitmap = CanvasAdapter.decodeBitmap(new ByteArrayInputStream(bytes));
             sink.setTileImage(bitmap);
             res = QueryResult.SUCCESS;
-        } catch (Exception e) {
-            log.debug("{} invalid bitmap", tile);
+        } catch (Throwable t) {
+            log.error(t.getMessage(), t);
         } finally {
             sink.completed(res);
         }

vtm-app/AndroidManifest.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.oscim.app"
     android:installLocation="auto"
     android:versionCode="1"
     android:versionName="1.0">
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -15,12 +15,14 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/application_name"
+        android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true">
 
         <!-- android:theme="@style/Theme.TileMap" -->
         <activity
             android:name=".TileMap"
             android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

vtm-app/build.gradle

@@ -5,24 +5,24 @@ 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"
 }
 
 android {
-    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "$androidBuildVersionTools"
+    namespace 'org.oscim.app'
+    compileSdk androidCompileSdk()
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         versionCode project.versionCode()
         versionName project.versionName()
-        minSdkVersion androidMinSdk()
-        targetSdkVersion androidTargetSdk()
+        minSdk androidMinSdk()
+        targetSdk androidTargetSdk()
     }
 
     sourceSets {
@@ -39,10 +39,13 @@ android {
         release.setRoot('build-types/release')
     }
 
-    lintOptions { abortOnError false }
+    lint {
+        abortOnError false
+    }
 
     packagingOptions {
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
+        resources {
+            excludes += ['META-INF/LICENSE', 'META-INF/NOTICE']
+        }
     }
 }

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 {
 
@@ -181,17 +182,15 @@ public class MapLayers {
         App.map.layers().remove(mBackgroundLayer);
         mBackgroundLayer = null;
 
-        switch (id) {
-            case R.id.menu_layer_openstreetmap:
-                mBackgroundLayer = new BitmapTileLayer(App.map, DefaultSources.OPENSTREETMAP.build());
-                break;
-
-            case R.id.menu_layer_naturalearth:
-                mBackgroundLayer = new BitmapTileLayer(App.map, DefaultSources.NE_LANDCOVER.build());
-                break;
-            default:
-                mBackgroundLayer = mBackroundPlaceholder;
-                id = -1;
+        if (id == R.id.menu_layer_openstreetmap) {
+            UrlTileSource tileSource = DefaultSources.OPENSTREETMAP.build();
+            tileSource.setHttpRequestHeaders(Collections.singletonMap("User-Agent", "vtm-playground"));
+            mBackgroundLayer = new BitmapTileLayer(App.map, tileSource);
+        } else if (id == R.id.menu_layer_naturalearth) {
+            mBackgroundLayer = new BitmapTileLayer(App.map, DefaultSources.NE_LANDCOVER.build());
+        } else {
+            mBackgroundLayer = mBackroundPlaceholder;
+            id = -1;
         }
 
         if (mBackgroundLayer instanceof BitmapTileLayer)

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,
@@ -298,23 +293,20 @@ public class POISearch {
     }
 
     public boolean onContextItemSelected(MenuItem item, GeoPoint geoPoint) {
-        switch (item.getItemId()) {
-            case R.id.menu_poi_nearby:
-                Intent intent = new Intent(App.activity, POIActivity.class);
-                intent.putExtra("ID", poiMarkers.getBubbledItemId());
-                App.activity.startActivityForResult(intent, TileMap.POIS_REQUEST);
-                return true;
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_poi_nearby) {
+            Intent intent = new Intent(App.activity, POIActivity.class);
+            intent.putExtra("ID", poiMarkers.getBubbledItemId());
+            App.activity.startActivityForResult(intent, TileMap.POIS_REQUEST);
+            return true;
+        } else if (itemId == R.id.menu_poi_clear) {
+            poiMarkers.removeAllItems();
+            mPOIs.clear();
+            App.map.updateMap(true);
 
-            case R.id.menu_poi_clear:
-                poiMarkers.removeAllItems();
-                mPOIs.clear();
-                App.map.updateMap(true);
-
-                return true;
-            default:
+            return true;
         }
+
         return false;
-
     }
-
 }

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,
@@ -321,39 +321,35 @@ public class RouteSearch {
     }
 
     boolean onContextItemSelected(MenuItem item, GeoPoint geoPoint) {
-        switch (item.getItemId()) {
-            case R.id.menu_route_departure:
-                mStartPoint = geoPoint;
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_route_departure) {
+            mStartPoint = geoPoint;
 
-                markerStart = putMarkerItem(markerStart, mStartPoint, START_INDEX,
-                        R.string.departure, R.drawable.marker_departure, -1);
+            markerStart = putMarkerItem(markerStart, mStartPoint, START_INDEX,
+                    R.string.departure, R.drawable.marker_departure, -1);
 
-                getRouteAsync();
-                return true;
+            getRouteAsync();
+            return true;
+        } else if (itemId == R.id.menu_route_destination) {
+            mDestinationPoint = geoPoint;
 
-            case R.id.menu_route_destination:
-                mDestinationPoint = geoPoint;
+            markerDestination = putMarkerItem(markerDestination, mDestinationPoint, DEST_INDEX,
+                    R.string.destination,
+                    R.drawable.marker_destination, -1);
 
-                markerDestination = putMarkerItem(markerDestination, mDestinationPoint, DEST_INDEX,
-                        R.string.destination,
-                        R.drawable.marker_destination, -1);
+            getRouteAsync();
+            return true;
+        } else if (itemId == R.id.menu_route_viapoint) {
+            GeoPoint viaPoint = geoPoint;
+            addViaPoint(viaPoint);
 
-                getRouteAsync();
-                return true;
-
-            case R.id.menu_route_viapoint:
-                GeoPoint viaPoint = geoPoint;
-                addViaPoint(viaPoint);
-
-                getRouteAsync();
-                return true;
-
-            case R.id.menu_route_clear:
-                clearOverlays();
-                return true;
-
-            default:
+            getRouteAsync();
+            return true;
+        } else if (itemId == R.id.menu_route_clear) {
+            clearOverlays();
+            return true;
         }
+
         return false;
     }
 

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

@@ -1,6 +1,6 @@
 /* Copyright 2010, 2011, 2012 mapsforge.org
  * Copyright 2012 Hannes Janetzek
- * Copyright 2016-2019 devemux86
+ * Copyright 2016-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
@@ -77,7 +77,7 @@ public class TileMap extends MapActivity implements MapEventsReceiver {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)
-                requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
+                requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 0);
         }
 
         setContentView(R.layout.activity_tilemap);
@@ -149,88 +149,62 @@ public class TileMap extends MapActivity implements MapEventsReceiver {
     @SuppressWarnings("deprecation")
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_info_about) {
+            startActivity(new Intent(this, InfoView.class));
+        } else if (itemId == R.id.menu_position) {
+        } else if (itemId == R.id.menu_poi_nearby) {
+            Intent intent = new Intent(this, POIActivity.class);
+            startActivityForResult(intent, TileMap.POIS_REQUEST);
+        } else if (itemId == R.id.menu_compass_2d) {
+            if (!item.isChecked()) {
+                // FIXME
+                //mMapView.getMapViewPosition().setTilt(0);
+                mCompass.setMode(Compass.Mode.C2D);
+            } else {
+                mCompass.setMode(Compass.Mode.OFF);
+            }
+        } else if (itemId == R.id.menu_compass_3d) {
+            if (!item.isChecked()) {
+                mCompass.setMode(Compass.Mode.C3D);
+            } else {
+                mCompass.setMode(Compass.Mode.OFF);
+            }
+        } else if (itemId == R.id.menu_position_my_location_enable) {
+            if (!item.isChecked()) {
+                mLocation.setMode(LocationHandler.Mode.SHOW);
+                mLocation.setCenterOnFirstFix();
+            } else {
+                mLocation.setMode(LocationHandler.Mode.OFF);
+            }
+        } else if (itemId == R.id.menu_position_follow_location) {
+            if (!item.isChecked()) {
+                mLocation.setMode(LocationHandler.Mode.SNAP);
+            } else {
+                mLocation.setMode(LocationHandler.Mode.OFF);
+            }
+        } else if (itemId == R.id.menu_layer_openstreetmap || itemId == R.id.menu_layer_naturalearth) {
+            int bgId = item.getItemId();
+            // toggle if already enabled
+            if (bgId == mMapLayers.getBackgroundId())
+                bgId = -1;
 
-        switch (item.getItemId()) {
-            case R.id.menu_info_about:
-                startActivity(new Intent(this, InfoView.class));
-                break;
-
-            case R.id.menu_position:
-                break;
-
-            case R.id.menu_poi_nearby:
-                Intent intent = new Intent(this, POIActivity.class);
-                startActivityForResult(intent, TileMap.POIS_REQUEST);
-                break;
-
-            case R.id.menu_compass_2d:
-                if (!item.isChecked()) {
-                    // FIXME
-                    //mMapView.getMapViewPosition().setTilt(0);
-                    mCompass.setMode(Compass.Mode.C2D);
-                } else {
-                    mCompass.setMode(Compass.Mode.OFF);
-                }
-                break;
-
-            case R.id.menu_compass_3d:
-                if (!item.isChecked()) {
-                    mCompass.setMode(Compass.Mode.C3D);
-                } else {
-                    mCompass.setMode(Compass.Mode.OFF);
-                }
-                break;
-
-            case R.id.menu_position_my_location_enable:
-                if (!item.isChecked()) {
-                    mLocation.setMode(LocationHandler.Mode.SHOW);
-                    mLocation.setCenterOnFirstFix();
-                } else {
-                    mLocation.setMode(LocationHandler.Mode.OFF);
-                }
-                break;
-
-            case R.id.menu_position_follow_location:
-                if (!item.isChecked()) {
-                    mLocation.setMode(LocationHandler.Mode.SNAP);
-                } else {
-                    mLocation.setMode(LocationHandler.Mode.OFF);
-                }
-                break;
-
-            case R.id.menu_layer_openstreetmap:
-            case R.id.menu_layer_naturalearth:
-                int bgId = item.getItemId();
-                // toggle if already enabled
-                if (bgId == mMapLayers.getBackgroundId())
-                    bgId = -1;
-
-                mMapLayers.setBackgroundMap(bgId);
-                mMap.updateMap(true);
-                break;
-
-            case R.id.menu_layer_grid:
-                mMapLayers.enableGridOverlay(this, !mMapLayers.isGridEnabled());
-                mMap.updateMap(true);
-                break;
-
-            case R.id.menu_position_enter_coordinates:
-                showDialog(DIALOG_ENTER_COORDINATES);
-                break;
-
-            //case R.id.menu_position_map_center:
-            //    MapPosition mapCenter = mBaseLayer.getMapFileCenter();
-            //    if (mapCenter != null)
-            //        mMap.setCenter(mapCenter.getGeoPoint());
-            //    break;
-
-            case R.id.menu_preferences:
-                startActivity(new Intent(this, EditPreferences.class));
-                overridePendingTransition(R.anim.slide_right, R.anim.slide_left2);
-                break;
-
-            default:
-                return false;
+            mMapLayers.setBackgroundMap(bgId);
+            mMap.updateMap(true);
+        } else if (itemId == R.id.menu_layer_grid) {
+            mMapLayers.enableGridOverlay(this, !mMapLayers.isGridEnabled());
+            mMap.updateMap(true);
+        } else if (itemId == R.id.menu_position_enter_coordinates) {
+            showDialog(DIALOG_ENTER_COORDINATES);
+        /*} else if (itemId == R.id.menu_position_map_center) {
+            MapPosition mapCenter = mBaseLayer.getMapFileCenter();
+            if (mapCenter != null)
+                mMap.setCenter(mapCenter.getGeoPoint());*/
+        } else if (itemId == R.id.menu_preferences) {
+            startActivity(new Intent(this, EditPreferences.class));
+            overridePendingTransition(R.anim.slide_right, R.anim.slide_left2);
+        } else {
+            return false;
         }
 
         toggleMenuCheck();