From bd9306c955678ecd666d0125317143ff8f2a62cb Mon Sep 17 00:00:00 2001 From: Emux Date: Fri, 31 Mar 2023 11:21:26 +0300 Subject: [PATCH] Mapsforge: use latest version --- settings.gradle | 1 + vtm-android-example/build.gradle | 10 +++++----- .../src/org/oscim/android/test/PoiSearchActivity.java | 2 +- vtm-theme-comparator/build.gradle | 10 +++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/settings.gradle b/settings.gradle index 4660fb4e..a9fab67b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,6 +10,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url 'https://jitpack.io' } } } diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 77cb1533..0f2f3e79 100644 --- a/vtm-android-example/build.gradle +++ b/vtm-android-example/build.gradle @@ -16,11 +16,11 @@ dependencies { implementation project(':vtm-gdx') implementation project(':vtm-gdx-poi3d') - implementation 'org.mapsforge:mapsforge-poi-android:0.18.0' - runtimeOnly 'org.mapsforge:sqlite-android:0.18.0:natives-armeabi-v7a' - runtimeOnly 'org.mapsforge:sqlite-android:0.18.0:natives-arm64-v8a' - runtimeOnly 'org.mapsforge:sqlite-android:0.18.0:natives-x86' - runtimeOnly 'org.mapsforge:sqlite-android:0.18.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 { diff --git a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java index 7bbd86bf..b0809949 100644 --- a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java @@ -297,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); } diff --git a/vtm-theme-comparator/build.gradle b/vtm-theme-comparator/build.gradle index ee04871b..2b66444c 100644 --- a/vtm-theme-comparator/build.gradle +++ b/vtm-theme-comparator/build.gradle @@ -10,11 +10,11 @@ dependencies { implementation 'com.fifesoft:rsyntaxtextarea:2.6.1' implementation 'com.jtattoo:JTattoo:1.6.11' - implementation 'org.mapsforge:mapsforge-core:0.18.0' - implementation 'org.mapsforge:mapsforge-map:0.18.0' - implementation 'org.mapsforge:mapsforge-map-awt:0.18.0' - implementation 'org.mapsforge:mapsforge-map-reader:0.18.0' - implementation 'org.mapsforge:mapsforge-themes:0.18.0' + implementation 'org.mapsforge:mapsforge-core:master-SNAPSHOT' + implementation 'org.mapsforge:mapsforge-map:master-SNAPSHOT' + implementation 'org.mapsforge:mapsforge-map-awt:master-SNAPSHOT' + implementation 'org.mapsforge:mapsforge-map-reader:master-SNAPSHOT' + implementation 'org.mapsforge:mapsforge-themes:master-SNAPSHOT' implementation 'net.sf.kxml:kxml2:2.3.0' }