From 2c60f530a0b3572dcf26485f9487b78a41476d2f Mon Sep 17 00:00:00 2001 From: Emux Date: Sat, 15 Mar 2025 14:48:24 +0200 Subject: [PATCH] Update MapBox vector tile dependency --- docs/Changelog.md | 1 + docs/Integration.md | 8 ++++---- vtm-mvt/build.gradle | 2 +- vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/Changelog.md b/docs/Changelog.md index 897385d04..5ae925207 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -9,6 +9,7 @@ - Biker map theme improvements [#1192](https://github.com/mapsforge/vtm/issues/1192) - Rename `MapDatabase` to `MapFile` [#1184](https://github.com/mapsforge/vtm/pull/1184) - Rename `MultiMapDatabase` to `MultiMapFile` +- Update MapBox vector tile dependency - Minor improvements and bug fixes - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.25.0) diff --git a/docs/Integration.md b/docs/Integration.md index d501a662f..0a0b592c0 100644 --- a/docs/Integration.md +++ b/docs/Integration.md @@ -105,8 +105,8 @@ implementation 'com.squareup.okio:okio-jvm:3.6.0' ```groovy implementation '[PACKAGE]:vtm-android-mvt:[CURRENT-VERSION]' implementation '[PACKAGE]:vtm-mvt:[CURRENT-VERSION]' -implementation 'com.google.protobuf:protobuf-java:3.6.1' -implementation 'com.wdtinc:mapbox-vector-tile:3.1.0' +implementation 'com.google.protobuf:protobuf-java:3.24.2' +implementation 'io.github.ci-cmg:mapbox-vector-tile:4.0.6' implementation 'org.locationtech.jts:jts-core:1.20.0' ``` @@ -114,8 +114,8 @@ implementation 'org.locationtech.jts:jts-core:1.20.0' ```groovy implementation '[PACKAGE]:vtm-mvt:[CURRENT-VERSION]' -implementation 'com.google.protobuf:protobuf-java:3.6.1' -implementation 'com.wdtinc:mapbox-vector-tile:3.1.0' +implementation 'com.google.protobuf:protobuf-java:3.24.2' +implementation 'io.github.ci-cmg:mapbox-vector-tile:4.0.6' implementation 'org.locationtech.jts:jts-core:1.20.0' ``` diff --git a/vtm-mvt/build.gradle b/vtm-mvt/build.gradle index 672bab9a0..088e18491 100644 --- a/vtm-mvt/build.gradle +++ b/vtm-mvt/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'maven-publish' dependencies { api project(':vtm') - api 'com.wdtinc:mapbox-vector-tile:3.1.0' + api 'io.github.ci-cmg:mapbox-vector-tile:4.0.6' } sourceSets { diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java index fca5c31a9..ce2e426ff 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java @@ -18,10 +18,10 @@ */ package org.oscim.tiling.source.mvt; -import com.wdtinc.mapbox_vector_tile.adapt.jts.MvtReader; -import com.wdtinc.mapbox_vector_tile.adapt.jts.TagKeyValueMapConverter; -import com.wdtinc.mapbox_vector_tile.adapt.jts.model.JtsLayer; -import com.wdtinc.mapbox_vector_tile.adapt.jts.model.JtsMvt; +import edu.colorado.cires.cmg.mvt.adapt.jts.MvtReader; +import edu.colorado.cires.cmg.mvt.adapt.jts.TagKeyValueMapConverter; +import edu.colorado.cires.cmg.mvt.adapt.jts.model.JtsLayer; +import edu.colorado.cires.cmg.mvt.adapt.jts.model.JtsMvt; import org.locationtech.jts.geom.*; import org.locationtech.jts.simplify.TopologyPreservingSimplifier; import org.oscim.core.MapElement;