@maplibre/maplibre-react-native 10.0.0-beta.2 → 10.0.0-beta.21

package/android/src/main/java/org/maplibre/reactnative/utils/GeoJSONUtils.java

@@ -6,34 +6,49 @@ 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.google.gson.JsonObject;
+
 import org.maplibre.geojson.Feature;
 import org.maplibre.geojson.FeatureCollection;
 import org.maplibre.geojson.Geometry;
 import org.maplibre.geojson.GeometryCollection;
+import org.maplibre.geojson.MultiLineString;
 import org.maplibre.geojson.LineString;
 import org.maplibre.geojson.MultiPoint;
 import org.maplibre.geojson.Point;
+import org.maplibre.geojson.MultiPolygon;
 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.android.log.Logger;
 import org.maplibre.turf.TurfMeasurement;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class GeoJSONUtils {
+    public static final String LOG_TAG = "GeoJSONUtils";
+
     public static WritableMap fromFeature(Feature feature) {
         WritableMap map = Arguments.createMap();
         map.putString("type", "Feature");
         map.putString("id", feature.id());
 
-        WritableMap geometry = fromGeometry(feature.geometry());
-        map.putMap("geometry", geometry);
+        Geometry geometry = feature.geometry();
+        if (geometry == null) {
+            map.putNull("geometry");
+        } else {
+            map.putMap("geometry", fromGeometry(geometry));
+        }
 
-        WritableMap properties = ConvertUtils.toWritableMap(feature.properties());
-        map.putMap("properties", properties);
+        JsonObject properties = feature.properties();
+        if(properties == null) {
+            map.putNull("properties");
+        } else {
+            map.putMap("properties", ConvertUtils.toWritableMap(properties));
+        }
 
         return map;
     }
@@ -41,16 +56,20 @@ public class GeoJSONUtils {
     public static WritableMap fromGeometry(Geometry geometry) {
         final String type = geometry.type();
 
-        switch (type) {
-            case "Point":
-                return fromPoint((Point) geometry);
-            case "LineString":
-                return fromLineString((LineString) geometry);
-            case "Polygon":
-                return fromPolygon((Polygon) geometry);
-            default:
-                return null;
-        }
+        return switch (type) {
+            case "Point" -> fromPoint((Point) geometry);
+            case "LineString" -> fromLineString((LineString) geometry);
+            case "Polygon" -> fromPolygon((Polygon) geometry);
+            case "MultiPoint" -> fromMultiPoint((MultiPoint) geometry);
+            case "MultiLineString" -> fromMultiLineString((MultiLineString) geometry);
+            case "MultiPolygon" -> fromMultiPolygon((MultiPolygon) geometry);
+            case "GeometryCollection" -> fromGeometryCollection((GeometryCollection) geometry);
+            default -> {
+                Logger.w(LOG_TAG, "GeoJSONUtils.fromGeometry unsupported type: \"" + type + "\"");
+
+                yield null;
+            }
+        };
     }
 
     public static WritableMap fromPoint(Point point) {
@@ -74,6 +93,44 @@ public class GeoJSONUtils {
         return map;
     }
 
+    public static WritableMap fromMultiPoint(MultiPoint multiPoint) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "MultiPoint");
+        map.putArray("coordinates", getCoordinates(multiPoint));
+        return map;
+    }
+
+    public static WritableMap fromMultiLineString(MultiLineString multiLineString) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "MultiLineString");
+        map.putArray("coordinates", getCoordinates(multiLineString));
+        return map;
+    }
+
+    public static WritableMap fromMultiPolygon(MultiPolygon multiPolygon) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "MultiPolygon");
+        map.putArray("coordinates", getCoordinates(multiPolygon));
+        return map;
+    }
+
+    public static WritableMap fromGeometryCollection(GeometryCollection geometryCollection) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "GeometryCollection");
+
+        map.putArray("geometries",
+                Arguments.fromList(
+                        geometryCollection
+                                .geometries()
+                                .stream()
+                                .map(GeoJSONUtils::fromGeometry)
+                                .collect(Collectors.toList())
+                )
+        );
+
+        return map;
+    }
+
     public static WritableArray getCoordinates(Point point) {
         return Arguments.fromArray(pointToDoubleArray(point));
     }
@@ -93,9 +150,6 @@ public class GeoJSONUtils {
         WritableArray array = Arguments.createArray();
 
         List<List<Point>> points = polygon.coordinates();
-        if (points == null) {
-            return array;
-        }
 
         for (List<Point> curPoint : points) {
             WritableArray innerArray = Arguments.createArray();
@@ -110,6 +164,57 @@ public class GeoJSONUtils {
         return array;
     }
 
+    public static WritableArray getCoordinates(MultiPoint multiPoint) {
+        WritableArray array = Arguments.createArray();
+
+        List<Point> points = multiPoint.coordinates();
+        for (Point point : points) {
+            array.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
+        }
+
+        return array;
+    }
+
+    public static WritableArray getCoordinates(MultiLineString multiLineString) {
+        WritableArray array = Arguments.createArray();
+
+        List<List<Point>> lines = multiLineString.coordinates();
+        for (List<Point> line : lines) {
+            WritableArray lineArray = Arguments.createArray();
+
+            for (Point point : line) {
+                lineArray.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
+            }
+
+            array.pushArray(lineArray);
+        }
+
+        return array;
+    }
+
+    public static WritableArray getCoordinates(MultiPolygon multiPolygon) {
+        WritableArray array = Arguments.createArray();
+
+        List<List<List<Point>>> polygons = multiPolygon.coordinates();
+        for (List<List<Point>> polygon : polygons) {
+            WritableArray polygonArray = Arguments.createArray();
+
+            for (List<Point> ring : polygon) {
+                WritableArray ringArray = Arguments.createArray();
+
+                for (Point point : ring) {
+                    ringArray.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
+                }
+
+                polygonArray.pushArray(ringArray);
+            }
+
+            array.pushArray(polygonArray);
+        }
+
+        return array;
+    }
+
     public static WritableMap toPointFeature(LatLng latLng, WritableMap properties) {
         WritableMap map = new WritableNativeMap();
         map.putString("type", "Feature");

package/android/src/main/location-engine-default/org/maplibre/reactnative/location/engine/LocationEngineProvider.java

@@ -0,0 +1,12 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+
+import org.maplibre.android.location.engine.LocationEngine;
+
+public class LocationEngineProvider implements LocationEngineProvidable {
+    @Override
+    public LocationEngine getLocationEngine(Context context) {
+        return new DefaultLocationEngineProvider().getLocationEngine(context);
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineImpl.java

@@ -0,0 +1,151 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.location.Location;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationCallback;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationResult;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.Priority;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+
+import org.maplibre.android.location.engine.LocationEngineCallback;
+import org.maplibre.android.location.engine.LocationEngineImpl;
+import org.maplibre.android.location.engine.LocationEngineRequest;
+import org.maplibre.android.location.engine.LocationEngineResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Wraps implementation of Fused Location Provider
+ */
+public class GoogleLocationEngineImpl implements LocationEngineImpl<LocationCallback> {
+    private final FusedLocationProviderClient fusedLocationProviderClient;
+
+    @VisibleForTesting
+    GoogleLocationEngineImpl(FusedLocationProviderClient fusedLocationProviderClient) {
+        this.fusedLocationProviderClient = fusedLocationProviderClient;
+    }
+
+    public GoogleLocationEngineImpl(@NonNull Context context) {
+        this.fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context);
+    }
+
+    @NonNull
+    @Override
+    public LocationCallback createListener(LocationEngineCallback<LocationEngineResult> callback) {
+        return new GoogleLocationEngineCallbackTransport(callback);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void getLastLocation(@NonNull LocationEngineCallback<LocationEngineResult> callback)
+            throws SecurityException {
+        GoogleLastLocationEngineCallbackTransport transport =
+                new GoogleLastLocationEngineCallbackTransport(callback);
+        fusedLocationProviderClient.getLastLocation().addOnSuccessListener(transport).addOnFailureListener(transport);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
+                                       @NonNull LocationCallback listener,
+                                       @Nullable Looper looper) throws SecurityException {
+        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), listener, looper);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
+                                       @NonNull PendingIntent pendingIntent) throws SecurityException {
+        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), pendingIntent);
+    }
+
+    @Override
+    public void removeLocationUpdates(@NonNull LocationCallback listener) {
+        if (listener != null) {
+            fusedLocationProviderClient.removeLocationUpdates(listener);
+        }
+    }
+
+    @Override
+    public void removeLocationUpdates(PendingIntent pendingIntent) {
+        if (pendingIntent != null) {
+            fusedLocationProviderClient.removeLocationUpdates(pendingIntent);
+        }
+    }
+
+    private static LocationRequest toGMSLocationRequest(LocationEngineRequest request) {
+        LocationRequest.Builder builder = new LocationRequest.Builder(request.getInterval());
+        builder.setMinUpdateIntervalMillis(request.getFastestInterval());
+        builder.setMinUpdateDistanceMeters(request.getDisplacement());
+        builder.setMaxUpdateDelayMillis(request.getMaxWaitTime());
+        builder.setPriority(toGMSLocationPriority(request.getPriority()));
+        return builder.build();
+    }
+
+    private static int toGMSLocationPriority(int enginePriority) {
+        switch (enginePriority) {
+            case LocationEngineRequest.PRIORITY_HIGH_ACCURACY:
+                return Priority.PRIORITY_HIGH_ACCURACY;
+            case LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY:
+                return Priority.PRIORITY_BALANCED_POWER_ACCURACY;
+            case LocationEngineRequest.PRIORITY_LOW_POWER:
+                return Priority.PRIORITY_LOW_POWER;
+            case LocationEngineRequest.PRIORITY_NO_POWER:
+            default:
+                return Priority.PRIORITY_PASSIVE;
+        }
+    }
+
+    private static final class GoogleLocationEngineCallbackTransport extends LocationCallback {
+        private final LocationEngineCallback<LocationEngineResult> callback;
+
+        GoogleLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        public void onLocationResult(LocationResult locationResult) {
+            super.onLocationResult(locationResult);
+            List<Location> locations = locationResult.getLocations();
+            if (!locations.isEmpty()) {
+                callback.onSuccess(LocationEngineResult.create(locations));
+            } else {
+                callback.onFailure(new Exception("Unavailable location"));
+            }
+        }
+    }
+
+    @VisibleForTesting
+    static final class GoogleLastLocationEngineCallbackTransport
+            implements OnSuccessListener<Location>, OnFailureListener {
+        private final LocationEngineCallback<LocationEngineResult> callback;
+
+        GoogleLastLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        public void onSuccess(Location location) {
+            callback.onSuccess(location != null ? LocationEngineResult.create(location) :
+                    LocationEngineResult.create(Collections.<Location>emptyList()));
+        }
+
+        @Override
+        public void onFailure(@NonNull Exception e) {
+            callback.onFailure(e);
+        }
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineProvider.java

@@ -0,0 +1,24 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+
+import org.maplibre.android.location.engine.LocationEngine;
+import org.maplibre.android.location.engine.LocationEngineProxy;
+
+public class GoogleLocationEngineProvider implements LocationEngineProvidable {
+    private static final String LOG_TAG = "GoogleLocationEngineProvider";
+
+    public LocationEngine getLocationEngine(Context context) {
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
+            LocationEngine locationEngine = new LocationEngineProxy<>(new GoogleLocationEngineImpl(context.getApplicationContext()));
+            Log.d(LOG_TAG, "GoogleLocationEngine will be used.");
+            return locationEngine;
+        } else {
+            return new DefaultLocationEngineProvider().getLocationEngine(context);
+        }
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/LocationEngineProvider.java

@@ -0,0 +1,12 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+
+import org.maplibre.android.location.engine.LocationEngine;
+
+public class LocationEngineProvider implements LocationEngineProvidable {
+    @Override
+    public LocationEngine getLocationEngine(Context context) {
+        return new GoogleLocationEngineProvider().getLocationEngine(context);
+    }
+}

package/app.plugin.js

@@ -1 +1 @@
-module.exports = require("./plugin/build/withMapLibre");
+module.exports = require("./lib/commonjs/plugin/withMapLibre");

package/ios/MLRN/MLRNBackgroundLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNLayer.h"
-@import MapLibre;
 
 @interface MLRNBackgroundLayer : MLRNLayer
 

package/ios/MLRN/MLRNCamera.m

@@ -179,11 +179,6 @@
         return;
     }
     
-    if (_map.userTrackingMode != [self _userTrackingMode]) {
-        _map.showsUserLocation = [self _userTrackingMode] != MLNUserTrackingModeNone;
-        _map.userTrackingMode = [self _userTrackingMode];
-    }
-    
     MLNMapCamera *camera = _map.camera;
     if (_followPitch != nil && [_followPitch floatValue] >= 0.0) {
         camera.pitch = [_followPitch floatValue];
@@ -202,8 +197,12 @@
     if (_followZoomLevel != nil && [_followZoomLevel doubleValue] >= 0.0) {
         camera.altitude = [_map altitudeFromZoom:[_followZoomLevel doubleValue]];
     }
-    
-    [_map setCamera:camera animated:YES];
+
+    [_map setCamera:camera animated:NO];
+
+    if (_map.userTrackingMode != [self _userTrackingMode]) {
+      [_map setUserTrackingMode:[self _userTrackingMode] animated:NO completionHandler:nil];
+    }
 }
 
 - (NSUInteger)_userTrackingMode

package/ios/MLRN/MLRNFillExtrusionLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNVectorLayer.h"
-@import MapLibre;
 
 @interface MLRNFillExtrusionLayer : MLRNVectorLayer
 

package/ios/MLRN/MLRNFillLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNVectorLayer.h"
-@import MapLibre;
 
 @interface MLRNFillLayer : MLRNVectorLayer
 

package/ios/MLRN/MLRNFillLayer.m

@@ -1,5 +1,6 @@
 #import "MLRNFillLayer.h"
 #import "MLRNStyle.h"
+
 #import <React/RCTLog.h>
 
 @implementation MLRNFillLayer

package/ios/MLRN/MLRNLineLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNVectorLayer.h"
-@import MapLibre;
 
 @interface MLRNLineLayer : MLRNVectorLayer
 

package/ios/MLRN/MLRNMapView.h

@@ -47,7 +47,7 @@ typedef void (^StyleLoadedBlock) (MLNStyle* __nonnull style);
 @property (nonatomic, assign) NSInteger *reactCompassViewPosition;
 @property (nonatomic, assign) CGPoint reactCompassViewMargins;
 
-@property (nonatomic, copy) NSString *reactStyleURL;
+@property (nonatomic, copy) NSString *reactMapStyle;
 @property (nonatomic, assign) NSInteger reactPreferredFramesPerSecond;
 
 @property (nonatomic, assign) MLNCoordinateBounds maxBounds;

package/ios/MLRN/MLRNMapView.m

@@ -374,11 +374,11 @@ static double const M2PI = M_PI * 2;
     self.contentInset = UIEdgeInsetsMake(top, left, bottom, right);
 }
 
-- (void)setReactStyleURL:(NSString *)reactStyleURL
+- (void)setReactMapStyle:(NSString *)reactMapStyle
 {
-    _reactStyleURL = reactStyleURL;
+    _reactMapStyle = reactMapStyle;
     [self _removeAllSourcesFromMap];
-    self.styleURL = [self _getStyleURLFromKey:_reactStyleURL];
+    self.styleURL = [self _getStyleURLFromKey:_reactMapStyle];
 }
 
 - (void)setReactPreferredFramesPerSecond:(NSInteger)reactPreferredFramesPerSecond
@@ -500,13 +500,13 @@ static double const M2PI = M_PI * 2;
     return nil;
 }
 
-- (NSURL*)_getStyleURLFromKey:(NSString *)styleURL
+- (NSURL*)_getStyleURLFromKey:(NSString *)mapStyle
 {
-    NSURL *url = [NSURL URLWithString:styleURL];
+    NSURL *url = [NSURL URLWithString:mapStyle];
     if (url) {
         return url;
-    } else if (RCTJSONParse(styleURL, nil)) {
-        return [MLRNUtils styleURLFromStyleJSON:styleURL];
+    } else if (RCTJSONParse(mapStyle, nil)) {
+        return [MLRNUtils styleURLFromStyleJSON:mapStyle];
     }
     return url;
 }

package/ios/MLRN/MLRNMapViewManager.m

@@ -80,7 +80,7 @@ RCT_REMAP_VIEW_PROPERTY(compassViewPosition, reactCompassViewPosition, NSInteger
 RCT_REMAP_VIEW_PROPERTY(compassViewMargins, reactCompassViewMargins, CGPoint)
 
 RCT_REMAP_VIEW_PROPERTY(contentInset, reactContentInset, NSArray)
-RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString)
+RCT_REMAP_VIEW_PROPERTY(mapStyle, reactMapStyle, NSString)
 RCT_REMAP_VIEW_PROPERTY(preferredFramesPerSecond, reactPreferredFramesPerSecond, NSInteger)
 
 RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)