@maplibre/maplibre-react-native 10.0.0-beta.9 → 10.0.1

package/android/src/main/java/org/maplibre/reactnative/location/LocationManager.java

@@ -7,21 +7,14 @@ import android.util.Log;
 
 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 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 org.maplibre.reactnative.location.engine.LocationEngineProvider;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 @SuppressWarnings({"MissingPermission"})
 public class LocationManager implements LocationEngineCallback<LocationEngineResult> {
@@ -58,8 +51,10 @@ public class LocationManager implements LocationEngineCallback<LocationEngineRes
         this.buildEngineRequest();
 
     }
+
     private void buildEngineRequest() {
-        locationEngine = LocationEngineDefault.INSTANCE.getDefaultLocationEngine(this.context.getApplicationContext());
+        locationEngine = new LocationEngineProvider().getLocationEngine(context);
+
         locationEngineRequest = new LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
                 .setFastestInterval(DEFAULT_FASTEST_INTERVAL_MILLIS)
                 .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
@@ -78,9 +73,11 @@ public class LocationManager implements LocationEngineCallback<LocationEngineRes
             listeners.remove(listener);
         }
     }
+
     public void setMinDisplacement(float minDisplacement) {
         mMinDisplacement = minDisplacement;
     }
+
     public void enable() {
         if (!PermissionsManager.areLocationPermissionsGranted(context)) {
             return;
@@ -134,8 +131,7 @@ public class LocationManager implements LocationEngineCallback<LocationEngineRes
 
         try {
             locationEngine.getLastLocation(callback);
-        }
-        catch(Exception exception) {
+        } catch (Exception exception) {
             Log.w(LOG_TAG, exception);
             callback.onFailure(exception);
         }

package/android/src/main/java/org/maplibre/reactnative/location/engine/DefaultLocationEngineProvider.java

@@ -0,0 +1,18 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.maplibre.android.location.engine.LocationEngine;
+import org.maplibre.android.location.engine.LocationEngineDefault;
+
+public class DefaultLocationEngineProvider implements LocationEngineProvidable {
+    private static final String LOG_TAG = "DefaultLocationEngineProvider";
+
+    @Override
+    public LocationEngine getLocationEngine(Context context) {
+        LocationEngine locationEngine = LocationEngineDefault.INSTANCE.getDefaultLocationEngine(context.getApplicationContext());
+        Log.d(LOG_TAG, "DefaultLocationEngine will be used.");
+        return locationEngine;
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/location/engine/LocationEngineProvidable.java

@@ -0,0 +1,9 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+
+import org.maplibre.android.location.engine.LocationEngine;
+
+public interface LocationEngineProvidable {
+    LocationEngine getLocationEngine(Context context);
+}

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNModule.java

@@ -11,9 +11,7 @@ import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
 import org.maplibre.android.MapLibre;
 import org.maplibre.android.WellKnownTileServer;
-import org.maplibre.android.style.layers.Property;
 import org.maplibre.reactnative.components.camera.constants.CameraMode;
-import org.maplibre.reactnative.components.styles.MLRNStyleValue;
 import org.maplibre.reactnative.components.styles.sources.MLRNSource;
 import org.maplibre.reactnative.events.constants.EventTypes;
 import org.maplibre.reactnative.http.CustomHeadersInterceptor;
@@ -34,6 +32,8 @@ import javax.annotation.Nullable;
 public class MLRNModule extends ReactContextBaseJavaModule {
     public static final String REACT_CLASS = "MLRNModule";
 
+    public static final String DEFAULT_STYLE_URL = "https://demotiles.maplibre.org/style.json";
+
     private static boolean customHeaderInterceptorAdded = false;
 
     private Handler mUiThreadHandler;
@@ -44,6 +44,11 @@ public class MLRNModule extends ReactContextBaseJavaModule {
         mReactContext = reactApplicationContext;
     }
 
+    @Override
+    public void initialize() {
+        initializeMapLibreInstance();
+    }
+
     @Override
     public String getName() {
         return REACT_CLASS;
@@ -54,7 +59,7 @@ public class MLRNModule extends ReactContextBaseJavaModule {
     public Map<String, Object> getConstants() {
         // map style urls
         Map<String, String> styleURLS = new HashMap<>();
-        styleURLS.put("Default", "https://demotiles.maplibre.org/style.json");
+        styleURLS.put("Default", DEFAULT_STYLE_URL);
 
         // events
         Map<String, String> eventTypes = new HashMap<>();
@@ -99,127 +104,6 @@ public class MLRNModule extends ReactContextBaseJavaModule {
         Map<String, String> styleSourceConsts = new HashMap<>();
         styleSourceConsts.put("DefaultSourceID", MLRNSource.DEFAULT_ID);
 
-        // interpolation modes
-        Map<String, Integer> interpolationModes = new HashMap<>();
-        interpolationModes.put("Exponential", MLRNStyleValue.InterpolationModeExponential);
-        interpolationModes.put("Categorical", MLRNStyleValue.InterpolationModeCategorical);
-        interpolationModes.put("Interval", MLRNStyleValue.InterpolationModeInterval);
-        interpolationModes.put("Identity", MLRNStyleValue.InterpolationModeIdentity);
-
-        // line layer constants
-        Map<String, String> lineJoin = new HashMap<>();
-        lineJoin.put("Bevel", Property.LINE_JOIN_BEVEL);
-        lineJoin.put("Round", Property.LINE_JOIN_ROUND);
-        lineJoin.put("Miter", Property.LINE_JOIN_MITER);
-
-        Map<String, String> lineCap = new HashMap<>();
-        lineCap.put("Butt", Property.LINE_CAP_BUTT);
-        lineCap.put("Round", Property.LINE_CAP_ROUND);
-        lineCap.put("Square", Property.LINE_CAP_SQUARE);
-
-        Map<String, String> lineTranslateAnchor = new HashMap<>();
-        lineTranslateAnchor.put("Map", Property.LINE_TRANSLATE_ANCHOR_MAP);
-        lineTranslateAnchor.put("Viewport", Property.LINE_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // circle layer constants
-        Map<String, String> circlePitchScale = new HashMap<>();
-        circlePitchScale.put("Map", Property.CIRCLE_PITCH_SCALE_MAP);
-        circlePitchScale.put("Viewport", Property.CIRCLE_PITCH_SCALE_VIEWPORT);
-
-        Map<String, String> circleTranslateAnchor = new HashMap<>();
-        circleTranslateAnchor.put("Map", Property.CIRCLE_TRANSLATE_ANCHOR_MAP);
-        circleTranslateAnchor.put("Viewport", Property.CIRCLE_TRANSLATE_ANCHOR_VIEWPORT);
-
-        Map<String, String> circlePitchAlignment = new HashMap<>();
-        circlePitchAlignment.put("Map", Property.CIRCLE_PITCH_ALIGNMENT_MAP);
-        circlePitchAlignment.put("Viewport", Property.CIRCLE_PITCH_ALIGNMENT_VIEWPORT);
-
-        // fill extrusion layer constants
-        Map<String, String> fillExtrusionTranslateAnchor = new HashMap<>();
-        fillExtrusionTranslateAnchor.put("Map", Property.FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP);
-        fillExtrusionTranslateAnchor.put("Viewport", Property.FILL_EXTRUSION_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // fill layer constants
-        Map<String, String> fillTranslateAnchor = new HashMap<>();
-        fillTranslateAnchor.put("Map", Property.FILL_TRANSLATE_ANCHOR_MAP);
-        fillTranslateAnchor.put("Viewport", Property.FILL_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // symbol layer constants
-        Map<String, String> iconRotationAlignment = new HashMap<>();
-        iconRotationAlignment.put("Auto", Property.ICON_ROTATION_ALIGNMENT_AUTO);
-        iconRotationAlignment.put("Map", Property.ICON_ROTATION_ALIGNMENT_MAP);
-        iconRotationAlignment.put("Viewport", Property.ICON_ROTATION_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> iconTextFit = new HashMap<>();
-        iconTextFit.put("None", Property.ICON_TEXT_FIT_NONE);
-        iconTextFit.put("Width", Property.ICON_TEXT_FIT_WIDTH);
-        iconTextFit.put("Height", Property.ICON_TEXT_FIT_HEIGHT);
-        iconTextFit.put("Both", Property.ICON_TEXT_FIT_BOTH);
-
-        Map<String, String> iconAnchor = new HashMap<>();
-        iconAnchor.put("Center", Property.ICON_ANCHOR_CENTER);
-        iconAnchor.put("Left", Property.ICON_ANCHOR_LEFT);
-        iconAnchor.put("Right", Property.ICON_ANCHOR_RIGHT);
-        iconAnchor.put("Top", Property.ICON_ANCHOR_TOP);
-        iconAnchor.put("Bottom", Property.ICON_ANCHOR_BOTTOM);
-        iconAnchor.put("TopLeft", Property.ICON_ANCHOR_TOP_LEFT);
-        iconAnchor.put("TopRight", Property.ICON_ANCHOR_TOP_RIGHT);
-        iconAnchor.put("BottomLeft", Property.ICON_ANCHOR_BOTTOM_LEFT);
-        iconAnchor.put("BottomRight", Property.ICON_ANCHOR_BOTTOM_RIGHT);
-
-        Map<String, String> iconPitchAlignment = new HashMap<>();
-        iconPitchAlignment.put("Auto", Property.ICON_PITCH_ALIGNMENT_AUTO);
-        iconPitchAlignment.put("Map", Property.ICON_PITCH_ALIGNMENT_MAP);
-        iconPitchAlignment.put("Viewport", Property.ICON_PITCH_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> iconTranslateAnchor = new HashMap<>();
-        iconTranslateAnchor.put("Map", Property.ICON_TRANSLATE_ANCHOR_MAP);
-        iconTranslateAnchor.put("Viewport", Property.ICON_TRANSLATE_ANCHOR_VIEWPORT);
-
-        Map<String, String> symbolPlacement = new HashMap<>();
-        symbolPlacement.put("Line", Property.SYMBOL_PLACEMENT_LINE);
-        symbolPlacement.put("Point", Property.SYMBOL_PLACEMENT_POINT);
-
-        Map<String, String> textAnchor = new HashMap<>();
-        textAnchor.put("Center", Property.TEXT_ANCHOR_CENTER);
-        textAnchor.put("Left", Property.TEXT_ANCHOR_LEFT);
-        textAnchor.put("Right", Property.TEXT_ANCHOR_RIGHT);
-        textAnchor.put("Top", Property.TEXT_ANCHOR_TOP);
-        textAnchor.put("Bottom", Property.TEXT_ANCHOR_BOTTOM);
-        textAnchor.put("TopLeft", Property.TEXT_ANCHOR_TOP_LEFT);
-        textAnchor.put("TopRight", Property.TEXT_ANCHOR_TOP_RIGHT);
-        textAnchor.put("BottomLeft", Property.TEXT_ANCHOR_BOTTOM_LEFT);
-        textAnchor.put("BottomRight", Property.TEXT_ANCHOR_BOTTOM_RIGHT);
-
-        Map<String, String> textJustify = new HashMap<>();
-        textJustify.put("Center", Property.TEXT_JUSTIFY_CENTER);
-        textJustify.put("Left", Property.TEXT_JUSTIFY_LEFT);
-        textJustify.put("Right", Property.TEXT_JUSTIFY_RIGHT);
-
-        Map<String, String> textPitchAlignment = new HashMap<>();
-        textPitchAlignment.put("Auto", Property.TEXT_PITCH_ALIGNMENT_AUTO);
-        textPitchAlignment.put("Map", Property.TEXT_PITCH_ALIGNMENT_MAP);
-        textPitchAlignment.put("Viewport", Property.TEXT_PITCH_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> textRotationAlignment = new HashMap<>();
-        textRotationAlignment.put("Auto", Property.TEXT_ROTATION_ALIGNMENT_AUTO);
-        textRotationAlignment.put("Map", Property.TEXT_ROTATION_ALIGNMENT_MAP);
-        textRotationAlignment.put("Viewport", Property.TEXT_ROTATION_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> textTransform = new HashMap<>();
-        textTransform.put("None", Property.TEXT_TRANSFORM_NONE);
-        textTransform.put("Lowercase", Property.TEXT_TRANSFORM_LOWERCASE);
-        textTransform.put("Uppercase", Property.TEXT_TRANSFORM_UPPERCASE);
-
-        Map<String, String> textTranslateAnchor = new HashMap<>();
-        textTranslateAnchor.put("Map", Property.TEXT_TRANSLATE_ANCHOR_MAP);
-        textTranslateAnchor.put("Viewport", Property.TEXT_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // light constants
-        Map<String, String> lightAnchor = new HashMap<>();
-        lightAnchor.put("Map", Property.ANCHOR_MAP);
-        lightAnchor.put("Viewport", Property.ANCHOR_VIEWPORT);
-
         // offline region download states
         Map<String, Integer> offlinePackDownloadStates = new HashMap<>();
         offlinePackDownloadStates.put("Inactive", MLRNOfflineModule.INACTIVE_REGION_DOWNLOAD_STATE);
@@ -242,35 +126,17 @@ public class MLRNModule extends ReactContextBaseJavaModule {
                 .put("UserLocationVerticalAlignment", userLocationVerticalAlignment)
                 .put("CameraModes", cameraModes)
                 .put("StyleSource", styleSourceConsts)
-                .put("InterpolationMode", interpolationModes)
-                .put("LineJoin", lineJoin)
-                .put("LineCap", lineCap)
-                .put("LineTranslateAnchor", lineTranslateAnchor)
-                .put("CirclePitchScale", circlePitchScale)
-                .put("CircleTranslateAnchor", circleTranslateAnchor)
-                .put("CirclePitchAlignment", circlePitchAlignment)
-                .put("FillExtrusionTranslateAnchor", fillExtrusionTranslateAnchor)
-                .put("FillTranslateAnchor", fillTranslateAnchor)
-                .put("IconRotationAlignment", iconRotationAlignment)
-                .put("IconTextFit", iconTextFit)
-                .put("IconTranslateAnchor", iconTranslateAnchor)
-                .put("SymbolPlacement", symbolPlacement)
-                .put("IconAnchor", iconAnchor)
-                .put("TextAnchor", textAnchor)
-                .put("TextJustify", textJustify)
-                .put("IconPitchAlignment", iconPitchAlignment)
-                .put("TextPitchAlignment", textPitchAlignment)
-                .put("TextRotationAlignment", textRotationAlignment)
-                .put("TextTransform", textTransform)
-                .put("TextTranslateAnchor", textTranslateAnchor)
-                .put("LightAnchor", lightAnchor)
                 .put("OfflinePackDownloadState", offlinePackDownloadStates)
                 .put("OfflineCallbackName", offlineModuleCallbackNames)
                 .put("LocationCallbackName", locationModuleCallbackNames)
                 .build();
     }
 
-    // TODO: How to handle this? API has changed significantly
+    /**
+     * @deprecated This will be removed in the next major version.
+     * @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+     */
+    @Deprecated
     @ReactMethod
     public void setAccessToken(final String accessToken) {
         mReactContext.runOnUiQueueThread(new Runnable() {
@@ -313,7 +179,11 @@ public class MLRNModule extends ReactContextBaseJavaModule {
         });
     }
 
-    // TODO: How to handle this? Underlying API has changed significantly on Android
+    /**
+     * @deprecated This will be removed in the next major version.
+     * @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+     */
+    @Deprecated
     @ReactMethod
     public void getAccessToken(Promise promise) {
         String token = MapLibre.getApiKey();
@@ -341,4 +211,13 @@ public class MLRNModule extends ReactContextBaseJavaModule {
         dispatcher.setMaxRequestsPerHost(20);
         return dispatcher;
     }
+
+    private void initializeMapLibreInstance() {
+        mReactContext.runOnUiQueueThread(new Runnable() {
+            @Override
+            public void run() {
+                MapLibre.getInstance(getReactApplicationContext());
+            }
+        });
+    }
 }

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNOfflineModule.java

@@ -9,7 +9,6 @@ import com.facebook.react.bridge.*;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
 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;
@@ -43,7 +42,6 @@ public class MLRNOfflineModule extends ReactContextBaseJavaModule {
     public static final String OFFLINE_ERROR = "MapboxOfflineRegionError";
     public static final String OFFLINE_PROGRESS = "MapboxOfflineRegionProgress";
 
-    public static final String DEFAULT_STYLE_URL = "https://demotiles.maplibre.org/style.json";
     public static final Double DEFAULT_MIN_ZOOM_LEVEL = 10.0;
     public static final Double DEFAULT_MAX_ZOOM_LEVEL = 20.0;
 
@@ -426,7 +424,7 @@ public class MLRNOfflineModule extends ReactContextBaseJavaModule {
 
     private OfflineRegionDefinition makeDefinition(LatLngBounds latLngBounds, ReadableMap options) {
         return new OfflineTilePyramidRegionDefinition(
-                ConvertUtils.getString("styleURL", options, DEFAULT_STYLE_URL),
+                ConvertUtils.getString("styleURL", options, MLRNModule.DEFAULT_STYLE_URL),
                 latLngBounds,
                 ConvertUtils.getDouble("minZoom", options, DEFAULT_MIN_ZOOM_LEVEL),
                 ConvertUtils.getDouble("maxZoom", options, DEFAULT_MAX_ZOOM_LEVEL),

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

@@ -6,6 +6,8 @@ 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;
@@ -19,23 +21,34 @@ 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;
     }
@@ -43,22 +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);
-            case "MultiPoint":
-                return fromMultiPoint((MultiPoint) geometry);
-            case "MultiLineString":
-                return fromMultiLineString((MultiLineString) geometry);
-            case "MultiPolygon":
-                return fromMultiPolygon((MultiPolygon) 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) {
@@ -103,6 +114,23 @@ public class GeoJSONUtils {
         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));
     }
@@ -122,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();

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");