From fce9791cd66128f04de12e416359a49ff2e181a8 Mon Sep 17 00:00:00 2001 From: Emux Date: Wed, 31 Aug 2022 12:47:54 +0300 Subject: [PATCH 1/5] MapRenderer: catch unexpected errors (#957) --- vtm/src/org/oscim/renderer/MapRenderer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vtm/src/org/oscim/renderer/MapRenderer.java b/vtm/src/org/oscim/renderer/MapRenderer.java index c3466c04..24dbee1a 100644 --- a/vtm/src/org/oscim/renderer/MapRenderer.java +++ b/vtm/src/org/oscim/renderer/MapRenderer.java @@ -1,7 +1,7 @@ /* * Copyright 2012, 2013 Hannes Janetzek * Copyright 2016 Longri - * Copyright 2018 devemux86 + * Copyright 2018-2022 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -34,7 +34,7 @@ import java.nio.ShortBuffer; import static org.oscim.backend.GLAdapter.gl; public class MapRenderer { - static final Logger log = LoggerFactory.getLogger(MapRenderer.class); + private static final Logger log = LoggerFactory.getLogger(MapRenderer.class); /** * scale factor used for short vertices @@ -93,7 +93,11 @@ public class MapRenderer { mMap.beginFrame(); - draw(); + try { + draw(); + } catch (Throwable t) { + log.error(t.getMessage(), t); + } mMap.doneFrame(rerender); From e09af9502adcb3df3c7bbabd2cbfdcb6c586b76e Mon Sep 17 00:00:00 2001 From: Emux Date: Wed, 31 Aug 2022 13:04:42 +0300 Subject: [PATCH 2/5] MapDatabase: minor improvements (#958) --- vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java | 4 +--- vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java index c2b54028..4594e04c 100644 --- a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java +++ b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java @@ -308,13 +308,11 @@ public class MapDatabase implements ITileDataSource { processBlocks(sink, queryParameters, subFileParameter, tile.getBoundingBox(), Selector.ALL, new MapReadResult()); else processBlocks(sink, queryParameters, subFileParameter); + sink.completed(QueryResult.SUCCESS); } catch (Throwable t) { log.error(t.getMessage(), t); sink.completed(QueryResult.FAILED); - return; } - - sink.completed(QueryResult.SUCCESS); } @Override diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java index 2f7569c5..74451a64 100644 --- a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java +++ b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java @@ -74,12 +74,11 @@ public class MultiMapDatabase implements ITileDataSource { mapDatabase.query(tile, dataSink); } } + sink.completed(QueryResult.SUCCESS); } catch (Throwable t) { log.error(t.getMessage(), t); sink.completed(QueryResult.FAILED); - return; } - sink.completed(QueryResult.SUCCESS); } @Override From efd85ea3d981fff5839d6550b198f3ac9e74fa57 Mon Sep 17 00:00:00 2001 From: Emux Date: Fri, 16 Sep 2022 14:17:17 +0300 Subject: [PATCH 3/5] Update Gradle (#960) --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index dab7c28b..3e927b11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true # AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK +# Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Enables namespacing of each library's R class so that its R class includes only the diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..41dfb879 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 76fa6bdfc6da2b8b8ab50f8800fef4a55ee7001d Mon Sep 17 00:00:00 2001 From: Emux Date: Thu, 22 Sep 2022 10:19:19 +0300 Subject: [PATCH 4/5] vtm-playground fatJar, fixes #961 --- vtm-android-example/build.gradle | 2 +- vtm-playground/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index b222e345..08f1bb2e 100644 --- a/vtm-android-example/build.gradle +++ b/vtm-android-example/build.gradle @@ -58,7 +58,7 @@ android { lintOptions { abortOnError false } packagingOptions { - exclude 'META-INF/services/org.jeo.data.Driver' + exclude 'META-INF/services/io.jeo.data.Driver' exclude 'META-INF/LICENSE' exclude 'META-INF/NOTICE' } diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle index 8ec0b2b2..06cb0a77 100644 --- a/vtm-playground/build.gradle +++ b/vtm-playground/build.gradle @@ -32,7 +32,7 @@ run { task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) { classifier 'jar-with-dependencies' from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } - exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF' + exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/services/io.jeo.data.Driver' manifest { attributes 'Main-Class': "${mainClassName}" } From 332a694d653db2d49e044f3b91945e014766319a Mon Sep 17 00:00:00 2001 From: Emux Date: Thu, 20 Oct 2022 14:06:57 +0300 Subject: [PATCH 5/5] Update documentation --- docs/Integration.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Integration.md b/docs/Integration.md index 291578a9..891dde42 100644 --- a/docs/Integration.md +++ b/docs/Integration.md @@ -16,27 +16,27 @@ implementation 'org.slf4j:slf4j-api:1.7.28' ### Android ```groovy -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-android:[CURRENT-VERSION]' implementation 'com.caverock:androidsvg:1.4' ``` ### Android (libGDX) ```groovy -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-android:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]' -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 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]' implementation 'com.badlogicgames.gdx:gdx:1.9.10' implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.10' implementation 'com.caverock:androidsvg:1.4'