tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MapLibre Java (Turf and GeoJSON) (#2237)

Browse Source
This commit is contained in:
Bart Louwers
2024-04-05 15:22:39 +02:00
committed by GitHub
parent 9ae5fb3001
commit b0fe79a174
72 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLng.kt
View File

@@ -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
/**

4
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java
View File

@@ -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 {

2
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerSourceProvider.java
View File

@@ -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;

2
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerController.java
View File

@@ -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;

4
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java
View File

@@ -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;

4
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java
View File

@@ -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;

4
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMap.java
View File

@@ -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;

4
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMapView.java
View File

@@ -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;

2
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Projection.java
View File

@@ -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;

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt
View File

@@ -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

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/Expression.java
View File

@@ -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;

4
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt
View File

@@ -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

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt
View File

@@ -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

2
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt
View File

@@ -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
/**

2
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/VectorSource.kt
View File

@@ -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.*