@maplibre/maplibre-react-native 10.0.0-alpha.7 → 10.0.0-alpha.8

package/android/rctmln/src/main/java/com/maplibre/rctmln/events/FeatureClickEvent.java

@@ -6,8 +6,8 @@ import android.view.View;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.mapbox.geojson.Feature;
-import com.mapbox.mapboxsdk.geometry.LatLng;
+import org.maplibre.geojson.Feature;
+import org.maplibre.android.geometry.LatLng;
 import com.maplibre.rctmln.components.styles.sources.RCTSource;
 import com.maplibre.rctmln.events.constants.EventKeys;
 import com.maplibre.rctmln.events.constants.EventTypes;

package/android/rctmln/src/main/java/com/maplibre/rctmln/events/MapClickEvent.java

@@ -6,7 +6,7 @@ import android.view.View;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.mapboxsdk.geometry.LatLng;
+import org.maplibre.android.geometry.LatLng;
 
 import com.maplibre.rctmln.events.constants.EventKeys;
 import com.maplibre.rctmln.events.constants.EventTypes;

package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationClickEvent.java

@@ -6,8 +6,8 @@ import android.view.View;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.mapboxsdk.plugins.markerview.MarkerView;
-import com.mapbox.mapboxsdk.geometry.LatLng;
+import org.maplibre.android.plugins.markerview.MarkerView;
+import org.maplibre.android.geometry.LatLng;
 import com.maplibre.rctmln.components.annotation.RCTMLNPointAnnotation;
 import com.maplibre.rctmln.events.constants.EventKeys;
 import com.maplibre.rctmln.events.constants.EventTypes;

package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationDragEvent.java

@@ -6,8 +6,8 @@ import android.view.View;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.mapboxsdk.plugins.markerview.MarkerView;
-import com.mapbox.mapboxsdk.geometry.LatLng;
+import org.maplibre.android.plugins.markerview.MarkerView;
+import org.maplibre.android.geometry.LatLng;
 import com.maplibre.rctmln.components.annotation.RCTMLNPointAnnotation;
 import com.maplibre.rctmln.events.constants.EventKeys;
 import com.maplibre.rctmln.events.constants.EventTypes;

package/android/rctmln/src/main/java/com/maplibre/rctmln/location/LocationManager.java

@@ -5,18 +5,18 @@ import android.location.Location;
 import android.os.Looper;
 import android.util.Log;
 
-import com.mapbox.mapboxsdk.location.engine.LocationEngine;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
+import org.maplibre.android.location.engine.LocationEngine;
+import org.maplibre.android.location.engine.LocationEngineCallback;
 
 /*
 import com.mapbox.android.core.location.LocationEngineListener;
 import com.mapbox.android.core.location.LocationEnginePriority;
 */
 
-import com.mapbox.mapboxsdk.location.engine.LocationEngineDefault;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
-import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
+import org.maplibre.android.location.engine.LocationEngineDefault;
+import org.maplibre.android.location.engine.LocationEngineRequest;
+import org.maplibre.android.location.engine.LocationEngineResult;
+import org.maplibre.android.location.permissions.PermissionsManager;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

package/android/rctmln/src/main/java/com/maplibre/rctmln/location/UserLocation.java

@@ -2,7 +2,7 @@ package com.maplibre.rctmln.location;
 
 import android.location.Location;
 
-import com.mapbox.mapboxsdk.geometry.LatLng;
+import org.maplibre.android.geometry.LatLng;
 
 /**
  * Created by nickitaliano on 12/13/17.

package/android/rctmln/src/main/java/com/maplibre/rctmln/location/UserTrackingMode.java

@@ -1,11 +1,11 @@
 package com.maplibre.rctmln.location;
 
 /*
-import com.mapbox.mapboxsdk.plugins.locationlayer.modes.RenderMode;
+import org.maplibre.android.plugins.locationlayer.modes.RenderMode;
 */
 
-import com.mapbox.mapboxsdk.location.modes.CameraMode;
-import com.mapbox.mapboxsdk.location.modes.RenderMode;
+import org.maplibre.android.location.modes.CameraMode;
+import org.maplibre.android.location.modes.RenderMode;
 
 /**
  * Created by nickitaliano on 12/13/17.

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLocationModule.java

@@ -10,8 +10,8 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
+import org.maplibre.android.location.engine.LocationEngineCallback;
+import org.maplibre.android.location.engine.LocationEngineResult;
 import com.maplibre.rctmln.events.EventEmitter;
 import com.maplibre.rctmln.events.LocationEvent;
 import com.maplibre.rctmln.location.LocationManager;

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLogging.java

@@ -7,8 +7,8 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.mapbox.mapboxsdk.log.Logger;
-import com.mapbox.mapboxsdk.log.LoggerDefinition;
+import org.maplibre.android.log.Logger;
+import org.maplibre.android.log.LoggerDefinition;
 import android.util.Log;
 
 @ReactModule(name = RCTMLNLogging.REACT_CLASS)

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNModule.java

@@ -9,9 +9,9 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.WellKnownTileServer;
-import com.mapbox.mapboxsdk.style.layers.Property;
+import org.maplibre.android.MapLibre;
+import org.maplibre.android.WellKnownTileServer;
+import org.maplibre.android.style.layers.Property;
 import com.maplibre.rctmln.components.camera.constants.CameraMode;
 import com.maplibre.rctmln.components.styles.RCTMLNStyleValue;
 import com.maplibre.rctmln.components.styles.sources.RCTSource;
@@ -23,7 +23,7 @@ import com.maplibre.rctmln.location.UserTrackingMode;
 import okhttp3.Dispatcher;
 import okhttp3.OkHttpClient;
 
-import com.mapbox.mapboxsdk.module.http.HttpRequestUtil;
+import org.maplibre.android.module.http.HttpRequestUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -281,9 +281,9 @@ public class RCTMLNModule extends ReactContextBaseJavaModule {
             @Override
             public void run() {
                 if (accessToken == null) {
-                    Mapbox.getInstance(getReactApplicationContext());
+                    MapLibre.getInstance(getReactApplicationContext());
                 } else {
-                    Mapbox.getInstance(getReactApplicationContext(), accessToken, WellKnownTileServer.Mapbox);
+                    MapLibre.getInstance(getReactApplicationContext(), accessToken, WellKnownTileServer.Mapbox);
                 }
             }
         });
@@ -320,7 +320,7 @@ public class RCTMLNModule extends ReactContextBaseJavaModule {
     // TODO: How to handle this? Underlying API has changed significantly on Android
     @ReactMethod
     public void getAccessToken(Promise promise) {
-        String token = Mapbox.getApiKey();
+        String token = MapLibre.getApiKey();
         if(token == null) {
             promise.reject("missing_access_token", "No access token has been set");
         } else {
@@ -333,7 +333,7 @@ public class RCTMLNModule extends ReactContextBaseJavaModule {
         mReactContext.runOnUiQueueThread(new Runnable() {
             @Override
             public void run() {
-                Mapbox.setConnected(connected);
+                MapLibre.setConnected(connected);
             }
         });
     }

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNOfflineModule.java

@@ -8,22 +8,22 @@ import android.util.Log;
 import com.facebook.react.bridge.*;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
-import com.mapbox.geojson.FeatureCollection;
-// import com.mapbox.mapboxsdk.constants.Style;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.offline.OfflineManager;
-import com.mapbox.mapboxsdk.offline.OfflineRegion;
-import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition;
-import com.mapbox.mapboxsdk.offline.OfflineRegionError;
-import com.mapbox.mapboxsdk.offline.OfflineRegionStatus;
-import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition;
-import com.mapbox.mapboxsdk.storage.FileSource;
+import org.maplibre.geojson.FeatureCollection;
+// import org.maplibre.android.constants.Style;
+import org.maplibre.android.geometry.LatLngBounds;
+import org.maplibre.android.offline.OfflineManager;
+import org.maplibre.android.offline.OfflineRegion;
+import org.maplibre.android.offline.OfflineRegionDefinition;
+import org.maplibre.android.offline.OfflineRegionError;
+import org.maplibre.android.offline.OfflineRegionStatus;
+import org.maplibre.android.offline.OfflineTilePyramidRegionDefinition;
+import org.maplibre.android.storage.FileSource;
 import com.maplibre.rctmln.events.IEvent;
 import com.maplibre.rctmln.events.OfflineEvent;
 import com.maplibre.rctmln.events.constants.EventTypes;
 import com.maplibre.rctmln.utils.ConvertUtils;
 import com.maplibre.rctmln.utils.GeoJSONUtils;
-import com.mapbox.mapboxsdk.maps.Style;
+import org.maplibre.android.maps.Style;
 
 import org.json.JSONException;
 import org.json.JSONObject;

package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNSnapshotModule.java

@@ -16,13 +16,13 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
-import com.mapbox.geojson.Feature;
-import com.mapbox.geojson.FeatureCollection;
-import com.mapbox.geojson.Point;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.snapshotter.MapSnapshot;
-import com.mapbox.mapboxsdk.snapshotter.MapSnapshotter;
-import com.mapbox.mapboxsdk.storage.FileSource;
+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.snapshotter.MapSnapshot;
+import org.maplibre.android.snapshotter.MapSnapshotter;
+import org.maplibre.android.storage.FileSource;
 import com.maplibre.rctmln.utils.BitmapUtils;
 import com.maplibre.rctmln.utils.GeoJSONUtils;
 

package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/ClusterPropertyEntry.java

@@ -1,6 +1,6 @@
 package com.maplibre.rctmln.utils;
 
-import com.mapbox.mapboxsdk.style.expressions.Expression;
+import org.maplibre.android.style.expressions.Expression;
 
 public class ClusterPropertyEntry {
     public Expression operator;

package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/DownloadMapImageTask.java

@@ -20,8 +20,8 @@ import com.facebook.imagepipeline.image.CloseableStaticBitmap;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.facebook.react.views.imagehelper.ImageSource;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.Style;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.Style;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -41,12 +41,12 @@ public class DownloadMapImageTask extends AsyncTask<Map.Entry<String, ImageEntry
     public static final String LOG_TAG = "DownloadMapImageTask";
 
     private WeakReference<Context> mContext;
-    private WeakReference<MapboxMap> mMap;
+    private WeakReference<MapLibreMap> mMap;
     @Nullable
     private OnAllImagesLoaded mCallback;
     private final Object mCallerContext;
 
-    public DownloadMapImageTask(Context context, MapboxMap map, @Nullable OnAllImagesLoaded callback) {
+    public DownloadMapImageTask(Context context, MapLibreMap map, @Nullable OnAllImagesLoaded callback) {
         mContext = new WeakReference<>(context.getApplicationContext());
         mMap = new WeakReference<>(map);
         mCallback = callback;
@@ -130,7 +130,7 @@ public class DownloadMapImageTask extends AsyncTask<Map.Entry<String, ImageEntry
 
     @Override
     protected void onPostExecute(List<Map.Entry<String, Bitmap>> images) {
-        MapboxMap map = mMap.get();
+        MapLibreMap map = mMap.get();
         if (map != null && images != null && images.size() > 0) {
             Style style = map.getStyle();
             if (style != null) {

package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/ExpressionParser.java

@@ -4,8 +4,8 @@ import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.google.gson.JsonArray;
-import com.mapbox.mapboxsdk.style.expressions.Expression;
-import com.mapbox.mapboxsdk.style.expressions.Expression.Converter;
+import org.maplibre.android.style.expressions.Expression;
+import org.maplibre.android.style.expressions.Expression.Converter;
 
 import org.json.JSONArray;
 

package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/GeoJSONUtils.java

@@ -6,19 +6,19 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.geojson.Feature;
-import com.mapbox.geojson.FeatureCollection;
-import com.mapbox.geojson.Geometry;
-import com.mapbox.geojson.GeometryCollection;
-import com.mapbox.geojson.LineString;
-import com.mapbox.geojson.MultiPoint;
-import com.mapbox.geojson.Point;
-import com.mapbox.geojson.Polygon;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.geometry.LatLngQuad;
-import com.mapbox.mapboxsdk.style.light.Position;
-import com.mapbox.turf.TurfMeasurement;
+import org.maplibre.geojson.Feature;
+import org.maplibre.geojson.FeatureCollection;
+import org.maplibre.geojson.Geometry;
+import org.maplibre.geojson.GeometryCollection;
+import org.maplibre.geojson.LineString;
+import org.maplibre.geojson.MultiPoint;
+import org.maplibre.geojson.Point;
+import org.maplibre.geojson.Polygon;
+import org.maplibre.android.geometry.LatLng;
+import org.maplibre.android.geometry.LatLngBounds;
+import org.maplibre.android.geometry.LatLngQuad;
+import org.maplibre.android.style.light.Position;
+import org.maplibre.turf.TurfMeasurement;
 
 import java.util.ArrayList;
 import java.util.List;

package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/GeoViewport.java

@@ -2,9 +2,9 @@ package com.maplibre.rctmln.utils;
 
 import android.graphics.PointF;
 
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.geometry.VisibleRegion;
+import org.maplibre.android.geometry.LatLng;
+import org.maplibre.android.geometry.LatLngBounds;
+import org.maplibre.android.geometry.VisibleRegion;
 
 /**
  * Created by nickitaliano on 1/5/18.

package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/SimpleEventCallback.java

@@ -1,6 +1,6 @@
 package com.maplibre.rctmln.utils;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
+import org.maplibre.android.maps.MapLibreMap;
 
 import com.maplibre.rctmln.components.AbstractEventEmitter;
 import com.maplibre.rctmln.events.IEvent;
@@ -9,7 +9,7 @@ import com.maplibre.rctmln.events.IEvent;
  * Created by nickitaliano on 8/31/17.
  */
 
-public class SimpleEventCallback implements MapboxMap.CancelableCallback {
+public class SimpleEventCallback implements MapLibreMap.CancelableCallback {
     private AbstractEventEmitter mEventEmitter;
     private IEvent mEvent;
 

package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/SphericalMercator.java

@@ -3,7 +3,7 @@ package com.maplibre.rctmln.utils;
 import android.graphics.Point;
 import android.graphics.PointF;
 
-import com.mapbox.mapboxsdk.geometry.LatLng;
+import org.maplibre.android.geometry.LatLng;
 
 import java.util.ArrayList;
 import java.util.HashMap;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "A MapLibre GL Native plugin for creating maps in React Native",
-  "version": "10.0.0-alpha.7",
+  "version": "10.0.0-alpha.8",
   "publishConfig": {
     "access": "public"
   },

package/scripts/templates/RCTMLNStyleFactory.java.ejs

@@ -6,20 +6,20 @@
 
 package com.maplibre.rctmln.components.styles;
 
-import com.mapbox.mapboxsdk.style.layers.BackgroundLayer;
-import com.mapbox.mapboxsdk.style.layers.CircleLayer;
-import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
-import com.mapbox.mapboxsdk.style.layers.FillLayer;
-import com.mapbox.mapboxsdk.style.layers.LineLayer;
-import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
-import com.mapbox.mapboxsdk.style.layers.PropertyValue;
-import com.mapbox.mapboxsdk.style.layers.RasterLayer;
-import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
-import com.mapbox.mapboxsdk.style.layers.HeatmapLayer;
-import com.mapbox.mapboxsdk.style.layers.HillshadeLayer;
-import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
-import com.mapbox.mapboxsdk.style.light.Light;
-import com.mapbox.mapboxsdk.style.light.Position;
+import org.maplibre.android.style.layers.BackgroundLayer;
+import org.maplibre.android.style.layers.CircleLayer;
+import org.maplibre.android.style.layers.FillExtrusionLayer;
+import org.maplibre.android.style.layers.FillLayer;
+import org.maplibre.android.style.layers.LineLayer;
+import org.maplibre.android.style.layers.PropertyFactory;
+import org.maplibre.android.style.layers.PropertyValue;
+import org.maplibre.android.style.layers.RasterLayer;
+import org.maplibre.android.style.layers.SymbolLayer;
+import org.maplibre.android.style.layers.HeatmapLayer;
+import org.maplibre.android.style.layers.HillshadeLayer;
+import org.maplibre.android.style.layers.TransitionOptions;
+import org.maplibre.android.style.light.Light;
+import org.maplibre.android.style.light.Position;
 import com.maplibre.rctmln.utils.DownloadMapImageTask;
 
 import java.util.List;