From b0fe79a17442a5d7abcd06f65c5507cf59a194e9 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Fri, 5 Apr 2024 15:22:39 +0200 Subject: [PATCH] Update MapLibre Java (Turf and GeoJSON) (#2237) --- .../android/MapLibreAndroid/proguard-rules.pro | 2 +- .../src/cpp/geojson/feature.hpp | 2 +- .../src/cpp/geojson/feature_collection.hpp | 2 +- .../src/cpp/geojson/geometry.hpp | 2 +- .../src/cpp/geojson/geometry_collection.hpp | 2 +- .../src/cpp/geojson/line_string.hpp | 2 +- .../src/cpp/geojson/multi_line_string.hpp | 2 +- .../src/cpp/geojson/multi_point.hpp | 2 +- .../src/cpp/geojson/multi_polygon.hpp | 2 +- .../MapLibreAndroid/src/cpp/geojson/point.hpp | 2 +- .../src/cpp/geojson/polygon.hpp | 2 +- .../org/maplibre/android/geometry/LatLng.kt | 6 +++--- .../android/location/LayerFeatureProvider.java | 4 ++-- .../android/location/LayerSourceProvider.java | 2 +- .../location/LocationLayerController.java | 2 +- .../location/SymbolLocationLayerRenderer.java | 4 ++-- .../org/maplibre/android/maps/MapLibreMap.java | 4 ++-- .../org/maplibre/android/maps/NativeMap.java | 4 ++-- .../maplibre/android/maps/NativeMapView.java | 4 ++-- .../org/maplibre/android/maps/Projection.java | 2 +- .../offline/OfflineGeometryRegionDefinition.kt | 6 +++--- .../android/style/expressions/Expression.java | 6 +++--- .../style/sources/CustomGeometrySource.kt | 4 ++-- .../android/style/sources/GeoJsonSource.kt | 6 +++--- .../style/sources/GeometryTileProvider.kt | 2 +- .../android/style/sources/VectorSource.kt | 2 +- .../location/LocationLayerControllerTest.kt | 2 +- .../style/expressions/ExpressionTest.kt | 4 ++-- .../android/location/LocationComponentTest.kt | 2 +- .../location/LocationIndicatorLayerTest.java | 12 ++++++------ .../utils/MapLibreLocationTestingUtils.kt | 2 +- .../android/offline/OfflineDownloadTest.kt | 2 +- .../android/testapp/camera/CameraForTest.java | 4 ++-- .../geometry/GeoJsonConversionTest.java | 18 +++++++++--------- .../testapp/style/BackgroundLayerTest.java | 12 ++++++------ .../android/testapp/style/CircleLayerTest.java | 12 ++++++------ .../android/testapp/style/ExpressionTest.java | 4 ++-- .../testapp/style/FillExtrusionLayerTest.java | 12 ++++++------ .../android/testapp/style/FillLayerTest.java | 12 ++++++------ .../testapp/style/GeoJsonSourceTests.java | 6 +++--- .../testapp/style/HeatmapLayerTest.java | 12 ++++++------ .../testapp/style/HillshadeLayerTest.java | 12 ++++++------ .../android/testapp/style/LineLayerTest.java | 12 ++++++------ .../android/testapp/style/RasterLayerTest.java | 12 ++++++------ .../android/testapp/style/SymbolLayerTest.java | 12 ++++++------ .../android/testapp/style/layer.junit.ejs | 12 ++++++------ .../activity/annotation/JsonApiActivity.kt | 4 ++-- .../activity/camera/LatLngBoundsActivity.kt | 6 +++--- .../QueryRenderedFeaturesBoxCountActivity.kt | 2 +- ...ueryRenderedFeaturesBoxHighlightActivity.kt | 2 +- .../QueryRenderedFeaturesPropertiesActivity.kt | 2 +- .../feature/QuerySourceFeaturesActivity.kt | 6 +++--- .../snapshot/MapSnapshotterActivity.kt | 6 +++--- .../style/AnimatedSymbolLayerActivity.kt | 8 ++++---- .../style/CollectionUpdateOnStyleChange.kt | 8 ++++---- .../activity/style/CustomSpriteActivity.kt | 6 +++--- .../style/DistanceExpressionActivity.kt | 6 +++--- .../activity/style/DraggableMarkerActivity.kt | 6 +++--- .../activity/style/FillExtrusionActivity.kt | 4 ++-- .../style/GeoJsonClusteringActivity.kt | 2 +- .../activity/style/GridSourceActivity.kt | 8 ++++---- .../activity/style/ImageInLabelActivity.kt | 6 +++--- .../activity/style/RuntimeStyleActivity.kt | 8 ++++---- .../activity/style/StretchableImageActivity.kt | 6 +++--- .../activity/style/SymbolGeneratorActivity.kt | 2 +- .../activity/style/SymbolLayerActivity.kt | 6 +++--- .../style/ZoomFunctionSymbolLayerActivity.kt | 6 +++--- .../turf/MapSnapshotterWithinExpression.kt | 2 +- .../turf/PhysicalUnitCircleActivity.kt | 4 ++-- .../activity/turf/WithinExpressionActivity.kt | 2 +- .../android/testapp/utils/GeoParseUtil.kt | 4 ++-- platform/android/gradle/libs.versions.toml | 2 +- 72 files changed, 190 insertions(+), 190 deletions(-) diff --git a/platform/android/MapLibreAndroid/proguard-rules.pro b/platform/android/MapLibreAndroid/proguard-rules.pro index 582dcf583..809a0bcb0 100644 --- a/platform/android/MapLibreAndroid/proguard-rules.pro +++ b/platform/android/MapLibreAndroid/proguard-rules.pro @@ -23,7 +23,7 @@ -dontwarn org.codehaus.** # config for mapbox-sdk-geojson:3.0.1 --keep class com.mapbox.geojson.** { *; } +-keep class org.maplibre.geojson.** { *; } -dontwarn com.google.auto.value.** # config for additional notes diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp index aee45262e..9d2d13a8a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp @@ -10,7 +10,7 @@ namespace geojson { class Feature { public: - static constexpr auto Name() { return "com/mapbox/geojson/Feature"; }; + static constexpr auto Name() { return "org/maplibre/geojson/Feature"; }; static mbgl::GeoJSONFeature convert(jni::JNIEnv&, const jni::Object&); static jni::Local>> convert(jni::JNIEnv&, const std::vector&); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp index 66e92eaca..6e64f084c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp @@ -12,7 +12,7 @@ namespace geojson { class FeatureCollection { public: - static constexpr auto Name() { return "com/mapbox/geojson/FeatureCollection"; }; + static constexpr auto Name() { return "org/maplibre/geojson/FeatureCollection"; }; static mbgl::FeatureCollection convert(jni::JNIEnv&, const jni::Object&); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp index 4bf55c858..5f0d5cb39 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp @@ -12,7 +12,7 @@ namespace geojson { class Geometry { public: - static constexpr auto Name() { return "com/mapbox/geojson/Geometry"; }; + static constexpr auto Name() { return "org/maplibre/geojson/Geometry"; }; static jni::Local> New(jni::JNIEnv&, mbgl::Geometry); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp index a8e4d41bb..a99bd14ff 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp @@ -11,7 +11,7 @@ namespace geojson { class GeometryCollection { public: using SuperTag = Geometry; - static constexpr auto Name() { return "com/mapbox/geojson/GeometryCollection"; }; + static constexpr auto Name() { return "org/maplibre/geojson/GeometryCollection"; }; static constexpr auto Type() { return "GeometryCollection"; }; static jni::Local> New(jni::JNIEnv&, diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp index 63d2a1e19..482805460 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp @@ -16,7 +16,7 @@ namespace geojson { class LineString { public: using SuperTag = Geometry; - static constexpr auto Name() { return "com/mapbox/geojson/LineString"; }; + static constexpr auto Name() { return "org/maplibre/geojson/LineString"; }; static constexpr auto Type() { return "LineString"; }; static jni::Local> New(jni::JNIEnv&, const mbgl::LineString&); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp index d4e85cd6e..6620075c7 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp @@ -15,7 +15,7 @@ namespace geojson { class MultiLineString { public: using SuperTag = Geometry; - static constexpr auto Name() { return "com/mapbox/geojson/MultiLineString"; }; + static constexpr auto Name() { return "org/maplibre/geojson/MultiLineString"; }; static constexpr auto Type() { return "MultiLineString"; }; static jni::Local> New(jni::JNIEnv&, const mbgl::MultiLineString&); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp index a3ca49b73..a9b4560cb 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp @@ -16,7 +16,7 @@ namespace geojson { class MultiPoint { public: using SuperTag = Geometry; - static constexpr auto Name() { return "com/mapbox/geojson/MultiPoint"; }; + static constexpr auto Name() { return "org/maplibre/geojson/MultiPoint"; }; static constexpr auto Type() { return "MultiPoint"; }; static jni::Local> New(jni::JNIEnv&, const mbgl::MultiPoint&); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp index fd7b08016..b3056d784 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp @@ -15,7 +15,7 @@ namespace geojson { class MultiPolygon { public: using SuperTag = Geometry; - static constexpr auto Name() { return "com/mapbox/geojson/MultiPolygon"; }; + static constexpr auto Name() { return "org/maplibre/geojson/MultiPolygon"; }; static constexpr auto Type() { return "MultiPolygon"; }; static jni::Local> New(jni::JNIEnv&, const mbgl::MultiPolygon&); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp index b5d71ecae..b60ccacfb 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp @@ -13,7 +13,7 @@ namespace geojson { class Point { public: using SuperTag = Geometry; - static constexpr auto Name() { return "com/mapbox/geojson/Point"; }; + static constexpr auto Name() { return "org/maplibre/geojson/Point"; }; static constexpr auto Type() { return "Point"; }; static jni::Local> New(jni::JNIEnv&, const mbgl::Point&); diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp index 758e0dfb9..a272efe2b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp @@ -15,7 +15,7 @@ namespace geojson { class Polygon { public: using SuperTag = Geometry; - static constexpr auto Name() { return "com/mapbox/geojson/Polygon"; }; + static constexpr auto Name() { return "org/maplibre/geojson/Polygon"; }; static constexpr auto Type() { return "Polygon"; }; static jni::Local> New(jni::JNIEnv &, const mbgl::Polygon &); diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLng.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLng.kt index e92743675..e3244988a 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLng.kt +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLng.kt @@ -5,10 +5,10 @@ import android.os.Parcel import android.os.Parcelable import androidx.annotation.FloatRange import androidx.annotation.Keep -import com.mapbox.geojson.Point +import org.maplibre.geojson.Point import org.maplibre.android.constants.GeometryConstants -import com.mapbox.turf.TurfConstants -import com.mapbox.turf.TurfMeasurement +import org.maplibre.turf.TurfConstants +import org.maplibre.turf.TurfMeasurement import kotlin.math.abs /** diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java index a28fe1454..dcb283d80 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java @@ -3,8 +3,8 @@ package org.maplibre.android.location; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Point; class LayerFeatureProvider { diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerSourceProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerSourceProvider.java index 95fe70b55..ecc0e6f40 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerSourceProvider.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerSourceProvider.java @@ -2,7 +2,7 @@ package org.maplibre.android.location; import androidx.annotation.NonNull; -import com.mapbox.geojson.Feature; +import org.maplibre.geojson.Feature; import org.maplibre.android.style.expressions.Expression; import org.maplibre.android.style.layers.CircleLayer; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerController.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerController.java index 3430d93f6..284931d6b 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerController.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerController.java @@ -6,7 +6,7 @@ import android.graphics.PointF; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Feature; +import org.maplibre.geojson.Feature; import org.maplibre.android.location.modes.RenderMode; import org.maplibre.android.log.Logger; import org.maplibre.android.maps.MapLibreMap; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java index 1c6cfe161..2983e322a 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java @@ -46,8 +46,8 @@ import androidx.annotation.Nullable; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Point; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.location.modes.RenderMode; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java index 47748d9bd..6e283c49e 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java @@ -20,8 +20,8 @@ import com.mapbox.android.gestures.MoveGestureDetector; import com.mapbox.android.gestures.RotateGestureDetector; import com.mapbox.android.gestures.ShoveGestureDetector; import com.mapbox.android.gestures.StandardScaleGestureDetector; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Geometry; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Geometry; import org.maplibre.android.MapStrictMode; import org.maplibre.android.annotations.Annotation; import org.maplibre.android.annotations.BaseMarkerOptions; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMap.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMap.java index 48993886b..bcbacfc2c 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMap.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMap.java @@ -8,8 +8,8 @@ import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Geometry; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Geometry; import org.maplibre.android.annotations.Marker; import org.maplibre.android.annotations.Polygon; import org.maplibre.android.annotations.Polyline; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMapView.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMapView.java index 9caea12b7..8d10e4901 100755 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMapView.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMapView.java @@ -12,8 +12,8 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Geometry; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Geometry; import org.maplibre.android.LibraryLoader; import org.maplibre.android.MapStrictMode; import org.maplibre.android.annotations.Icon; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Projection.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Projection.java index 2bde9ea97..442a44b90 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Projection.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Projection.java @@ -5,7 +5,7 @@ import android.graphics.PointF; import androidx.annotation.FloatRange; import androidx.annotation.NonNull; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import org.maplibre.android.constants.GeometryConstants; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.geometry.LatLngBounds; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt index 590f7d55a..f532fc669 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt @@ -3,9 +3,9 @@ package org.maplibre.android.offline import android.os.Parcel import android.os.Parcelable import androidx.annotation.Keep -import com.mapbox.geojson.Feature -import com.mapbox.geojson.Geometry -import com.mapbox.turf.TurfMeasurement +import org.maplibre.geojson.Feature +import org.maplibre.geojson.Geometry +import org.maplibre.turf.TurfMeasurement import org.maplibre.android.geometry.LatLngBounds import org.maplibre.android.geometry.LatLngBounds.Companion.from diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/Expression.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/Expression.java index 5c6153c55..3022b348d 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/Expression.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/Expression.java @@ -13,9 +13,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonNull; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import com.mapbox.geojson.GeoJson; -import com.mapbox.geojson.Polygon; -import com.mapbox.geojson.gson.GeometryGeoJson; +import org.maplibre.geojson.GeoJson; +import org.maplibre.geojson.Polygon; +import org.maplibre.geojson.gson.GeometryGeoJson; import org.maplibre.android.style.layers.PropertyFactory; import org.maplibre.android.style.layers.PropertyValue; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt index 529a66127..69a656a1d 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt @@ -3,8 +3,8 @@ package org.maplibre.android.style.sources import androidx.annotation.Keep import androidx.annotation.UiThread import androidx.annotation.WorkerThread -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection import org.maplibre.android.geometry.LatLngBounds import org.maplibre.android.geometry.LatLngBounds.Companion.from import org.maplibre.android.style.expressions.Expression diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt index 89f5c239f..62ab7306d 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt @@ -2,9 +2,9 @@ package org.maplibre.android.style.sources import androidx.annotation.Keep import androidx.annotation.UiThread -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Geometry +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Geometry import org.maplibre.android.style.expressions.Expression import java.net.URI import java.net.URL diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt index 37a420cd7..067b2443d 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt @@ -1,7 +1,7 @@ package org.maplibre.android.style.sources import androidx.annotation.WorkerThread -import com.mapbox.geojson.FeatureCollection +import org.maplibre.geojson.FeatureCollection import org.maplibre.android.geometry.LatLngBounds /** diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/VectorSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/VectorSource.kt index d989dab05..8727c69a3 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/VectorSource.kt +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/VectorSource.kt @@ -4,7 +4,7 @@ import android.net.Uri import androidx.annotation.Keep import androidx.annotation.Size import androidx.annotation.UiThread -import com.mapbox.geojson.Feature +import org.maplibre.geojson.Feature import org.maplibre.android.style.expressions.Expression import java.net.URL import java.util.* diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt index 96f439601..3deb34b28 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt @@ -2,7 +2,7 @@ package org.maplibre.android.location import android.graphics.Bitmap import com.google.gson.JsonElement -import com.mapbox.geojson.Feature +import org.maplibre.geojson.Feature import org.maplibre.android.geometry.LatLng import org.maplibre.android.location.MapLibreAnimator.AnimationsValueChangeListener import org.maplibre.android.location.modes.RenderMode diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt index 481ad3bb7..2d4533872 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt @@ -1,8 +1,8 @@ package com.mapbox.mapboxsdk.style.expressions import android.graphics.Color -import com.mapbox.geojson.Point -import com.mapbox.geojson.Polygon +import org.maplibre.geojson.Point +import org.maplibre.geojson.Polygon import org.maplibre.android.style.expressions.Expression.FormatOption import org.maplibre.android.style.layers.PropertyFactory import org.maplibre.android.style.layers.PropertyValue diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt index 70f8739f4..6ad527f07 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt @@ -13,7 +13,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner import androidx.test.rule.GrantPermissionRule -import com.mapbox.geojson.Point +import org.maplibre.geojson.Point import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng import org.maplibre.android.location.LocationComponentConstants.* diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java index 142f6b349..0941b45e8 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt index e644e8531..27c66d6b4 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt @@ -7,7 +7,7 @@ import android.graphics.drawable.Drawable import android.location.Location import android.os.Handler import android.os.Looper -import com.mapbox.geojson.Feature +import org.maplibre.geojson.Feature import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.style.layers.Property diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt index 2efd7c15c..f5e041a99 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt @@ -2,7 +2,7 @@ package org.maplibre.android.offline import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner import androidx.test.rule.ActivityTestRule -import com.mapbox.geojson.Point +import org.maplibre.geojson.Point import org.maplibre.android.log.Logger import org.maplibre.android.maps.Style import org.maplibre.android.testapp.activity.FeatureOverviewActivity diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java index ed9d26ce3..697a72f38 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java @@ -3,8 +3,8 @@ package org.maplibre.android.testapp.camera; import androidx.annotation.NonNull; import androidx.test.annotation.UiThreadTest; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.camera.CameraPosition; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.geometry.LatLngBounds; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java index fdcb83d92..1a57d39dd 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java @@ -3,9 +3,9 @@ package org.maplibre.android.testapp.geometry; import androidx.test.annotation.UiThreadTest; import com.google.gson.JsonArray; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.style.expressions.Expression; import org.maplibre.android.style.layers.PropertyFactory; @@ -19,12 +19,12 @@ import org.junit.Test; import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.matcher.ViewMatchers.isRoot; -import static com.mapbox.geojson.Feature.fromGeometry; -import static com.mapbox.geojson.FeatureCollection.fromFeatures; -import static com.mapbox.geojson.GeometryCollection.fromGeometries; -import static com.mapbox.geojson.LineString.fromLngLats; -import static com.mapbox.geojson.MultiLineString.fromLineString; -import static com.mapbox.geojson.MultiPolygon.fromPolygon; +import static org.maplibre.geojson.Feature.fromGeometry; +import static org.maplibre.geojson.FeatureCollection.fromFeatures; +import static org.maplibre.geojson.GeometryCollection.fromGeometries; +import static org.maplibre.geojson.LineString.fromLngLats; +import static org.maplibre.geojson.MultiLineString.fromLineString; +import static org.maplibre.geojson.MultiPolygon.fromPolygon; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.junit.Assert.assertFalse; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java index c16ee31e3..fac599c95 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java index c25bc0b46..e4949786a 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java index bed4c7aab..0469b01ac 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java @@ -1,7 +1,7 @@ package org.maplibre.android.testapp.style; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Point; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.style.expressions.Expression; import org.maplibre.android.style.layers.CircleLayer; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java index 18e3bc3a5..f966f0943 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java index 70b9677ed..a73ecf856 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java index 3045384d8..20eb1802e 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java @@ -1,8 +1,8 @@ package org.maplibre.android.testapp.style; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.geojson.Point; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.style.layers.CircleLayer; import org.maplibre.android.style.layers.Layer; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java index 1f9cd0600..0f38307de 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java index 69f54fbe7..4deee30ff 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java index d0611ef8d..dc4d6b521 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java index 7d663c9b5..f7a1815e5 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java index cf316d63e..acdc16f93 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java @@ -6,12 +6,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs index 3edb44933..f16691afc 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs @@ -14,12 +14,12 @@ import android.graphics.Color; import androidx.test.annotation.UiThreadTest; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.Polygon; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.MultiPoint; +import org.maplibre.geojson.MultiPolygon; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.Polygon; import org.maplibre.android.maps.BaseLayerTest; import org.junit.Before; import timber.log.Timber; diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt index 2c3d8f98d..df55b1caa 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt @@ -6,8 +6,8 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import androidx.core.graphics.drawable.toBitmap -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import okhttp3.Call import okhttp3.Callback import okhttp3.HttpUrl.Companion.toHttpUrl diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt index 7d30a15d1..b11ef8194 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt @@ -5,9 +5,9 @@ import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.FeatureCollection.fromJson -import com.mapbox.geojson.Point +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.FeatureCollection.fromJson +import org.maplibre.geojson.Point import org.maplibre.android.geometry.LatLng import org.maplibre.android.geometry.LatLngBounds import org.maplibre.android.maps.MapLibreMap diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt index dc3b37b0f..60a70822f 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt @@ -7,7 +7,7 @@ import android.view.MenuItem import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Feature +import org.maplibre.geojson.Feature import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.Style diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt index 5a135ce43..9205ae5b1 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt @@ -6,7 +6,7 @@ import android.os.Bundle import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.FeatureCollection +import org.maplibre.geojson.FeatureCollection import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.Style diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt index a8d40cc00..a8825ef24 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt @@ -8,7 +8,7 @@ import android.view.View import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Feature +import org.maplibre.geojson.Feature import org.maplibre.android.annotations.BaseMarkerOptions import org.maplibre.android.annotations.Marker import org.maplibre.android.maps.MapView diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt index f0e7264a4..440e73c22 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt @@ -7,9 +7,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.gson.JsonObject -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt index 3cfeefc93..bfff86afd 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt @@ -9,9 +9,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import com.google.gson.JsonObject import com.google.gson.JsonPrimitive -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.camera.CameraPosition import org.maplibre.android.constants.MapLibreConstants import org.maplibre.android.geometry.LatLng diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt index 6d278d8b5..fd3aa154a 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt @@ -12,9 +12,9 @@ import android.view.animation.LinearInterpolator import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import com.google.gson.JsonObject -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap @@ -25,7 +25,7 @@ import org.maplibre.android.style.layers.PropertyFactory import org.maplibre.android.style.layers.SymbolLayer import org.maplibre.android.style.sources.GeoJsonSource import org.maplibre.android.testapp.R -import com.mapbox.turf.TurfMeasurement +import org.maplibre.turf.TurfMeasurement import java.util.* /** diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt index e7df00b3c..7047e5c1b 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt @@ -5,10 +5,10 @@ import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.LineString -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.LineString +import org.maplibre.geojson.Point import org.maplibre.android.geometry.LatLng import org.maplibre.android.geometry.LatLngBounds import org.maplibre.android.maps.MapLibreMap diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt index 081a43cd9..2db164d80 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt @@ -6,9 +6,9 @@ import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapView diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt index c6196eeb9..a6b1b89ee 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt @@ -4,7 +4,7 @@ import android.graphics.Color import android.os.Bundle import android.os.PersistableBundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Point +import org.maplibre.geojson.Point import org.maplibre.android.camera.CameraPosition import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapLibreMap @@ -17,8 +17,8 @@ import org.maplibre.android.style.layers.PropertyFactory.* import org.maplibre.android.style.layers.SymbolLayer import org.maplibre.android.style.sources.GeoJsonSource import org.maplibre.android.testapp.databinding.ActivityWithinExpressionBinding -import com.mapbox.turf.TurfConstants -import com.mapbox.turf.TurfTransformation +import org.maplibre.turf.TurfConstants +import org.maplibre.turf.TurfTransformation /** * An Activity that showcases the within expression to filter features outside a geometry diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt index 300877142..af6262ff1 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt @@ -9,9 +9,9 @@ import androidx.appcompat.app.AppCompatActivity import com.google.android.material.snackbar.Snackbar import com.mapbox.android.gestures.AndroidGesturesManager import com.mapbox.android.gestures.MoveGestureDetector -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.annotations.IconFactory import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt index 195a726e6..787b3c85c 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt @@ -3,8 +3,8 @@ package org.maplibre.android.testapp.activity.style import android.graphics.Color import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Point -import com.mapbox.geojson.Polygon +import org.maplibre.geojson.Point +import org.maplibre.geojson.Polygon import org.maplibre.android.camera.CameraPosition import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt index 89e72ce2e..f225cc523 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt @@ -8,7 +8,7 @@ import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat -import com.mapbox.geojson.Feature +import org.maplibre.geojson.Feature import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapView diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt index 2c1ab838f..b73bd8dfe 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt @@ -3,10 +3,10 @@ package org.maplibre.android.testapp.activity.style import android.graphics.Color import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.MultiLineString -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.MultiLineString +import org.maplibre.geojson.Point import org.maplibre.android.geometry.LatLngBounds import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt index e1ab20d4e..ef0832883 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt @@ -3,9 +3,9 @@ package org.maplibre.android.testapp.activity.style import android.graphics.Color import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.OnMapReadyCallback diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt index 9d2346e23..16e5eacb3 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt @@ -7,10 +7,10 @@ import android.view.Menu import android.view.MenuItem import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point -import com.mapbox.geojson.Polygon +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point +import org.maplibre.geojson.Polygon import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapView diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt index 710687c5b..e67e0bfc8 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt @@ -3,9 +3,9 @@ package org.maplibre.android.testapp.activity.style import android.os.AsyncTask import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.maps.* import org.maplibre.android.style.expressions.Expression import org.maplibre.android.style.layers.* diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt index 1e2057113..4fc1fa00d 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt @@ -12,7 +12,7 @@ import android.view.View import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.FeatureCollection +import org.maplibre.geojson.FeatureCollection import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt index 61b1a45a3..1162ac6d8 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt @@ -10,9 +10,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import com.google.gson.JsonObject import com.google.gson.JsonPrimitive -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.camera.CameraPosition import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapView diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt index 9391f7760..584d0fb73 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt @@ -5,9 +5,9 @@ import android.view.Menu import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import com.google.gson.JsonObject -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.Feature +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.maps.MapView import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.MapLibreMap.OnMapClickListener diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt index 0ef23d045..7ea3fb22d 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt @@ -4,7 +4,7 @@ import android.graphics.Color import android.os.Bundle import android.os.PersistableBundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.* +import org.maplibre.geojson.* import org.maplibre.android.camera.CameraPosition import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt index cad5f32e8..005a2e6ed 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt @@ -5,7 +5,7 @@ import android.os.Bundle import android.os.PersistableBundle import android.widget.SeekBar import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.Point +import org.maplibre.geojson.Point import org.maplibre.android.camera.CameraPosition import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.Style @@ -14,7 +14,7 @@ import org.maplibre.android.style.layers.FillLayer import org.maplibre.android.style.layers.PropertyFactory.fillColor import org.maplibre.android.style.sources.GeoJsonSource import org.maplibre.android.testapp.databinding.ActivityPhysicalCircleBinding -import com.mapbox.turf.TurfTransformation +import org.maplibre.turf.TurfTransformation /** * An Activity that showcases how to create a Circle with radius expressed in physical units using a FillLayer. diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt index 9a4e1a6ba..40964e19b 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt @@ -5,7 +5,7 @@ import android.os.Bundle import android.os.Handler import android.os.PersistableBundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.geojson.* +import org.maplibre.geojson.* import org.maplibre.android.camera.CameraPosition import org.maplibre.android.camera.CameraUpdateFactory import org.maplibre.android.geometry.LatLng diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt index 224b97943..8b248114a 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt @@ -2,8 +2,8 @@ package org.maplibre.android.testapp.utils import android.content.Context import android.text.TextUtils -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point +import org.maplibre.geojson.FeatureCollection +import org.maplibre.geojson.Point import org.maplibre.android.geometry.LatLng import java.io.BufferedReader import java.io.IOException diff --git a/platform/android/gradle/libs.versions.toml b/platform/android/gradle/libs.versions.toml index d9a9bfb26..1912ebd88 100644 --- a/platform/android/gradle/libs.versions.toml +++ b/platform/android/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -mapLibreServices = "5.9.0" +mapLibreServices = "6.0.0" mapboxGestures = "0.7.0" appCompat = "1.5.1" constraintLayout = "2.1.4"