@maplibre/maplibre-react-native 11.0.0-alpha.2 → 11.0.0-alpha.21

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

@@ -1,158 +0,0 @@
-package org.maplibre.reactnative.modules;
-
-import android.location.Location;
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-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 org.maplibre.android.location.engine.LocationEngineCallback;
-import org.maplibre.android.location.engine.LocationEngineResult;
-import org.maplibre.reactnative.events.EventEmitter;
-import org.maplibre.reactnative.events.LocationEvent;
-import org.maplibre.reactnative.location.LocationManager;
-
-@ReactModule(name = MLRNLocationModule.REACT_CLASS)
-public class MLRNLocationModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "MLRNLocationModule";
-    public static final String LOCATION_UPDATE = "MapboxUserLocationUpdate";
-
-    private boolean isEnabled;
-    private float mMinDisplacement;
-    private boolean isPaused;
-
-    private LocationManager locationManager;
-
-    private LifecycleEventListener lifecycleEventListener = new LifecycleEventListener() {
-        @Override
-        public void onHostResume() {
-            if (isEnabled) {
-                startLocationManager();
-            }
-        }
-
-        @Override
-        public void onHostPause() {
-            pauseLocationManager();
-        }
-
-        @Override
-        public void onHostDestroy() {
-            stopLocationManager();
-        }
-    };
-
-    private LocationManager.OnUserLocationChange onUserLocationChangeCallback = new LocationManager.OnUserLocationChange() {
-        @Override
-        public void onLocationChange(Location location) {
-            LocationEvent locationEvent = new LocationEvent(location);
-
-            RCTNativeAppEventEmitter emitter = EventEmitter.getModuleEmitter(getReactApplicationContext());
-            if (emitter != null) {
-                emitter.emit(LOCATION_UPDATE, locationEvent.getPayload());
-            }
-        }
-    };
-
-    public MLRNLocationModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        locationManager = LocationManager.getInstance(reactContext);
-        reactContext.addLifecycleEventListener(lifecycleEventListener);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-
-    @ReactMethod
-    public void start(float minDisplacement) {
-        isEnabled = true;
-        mMinDisplacement = minDisplacement;
-        startLocationManager();
-    }
-
-    @ReactMethod
-    public void setMinDisplacement(float minDisplacement) {
-        if (mMinDisplacement == minDisplacement) return;
-        mMinDisplacement = minDisplacement;
-        if (isEnabled) {
-
-            // set minimal displacement in the manager
-            locationManager.setMinDisplacement(mMinDisplacement);
-
-            // refresh values in location engine request
-            locationManager.enable();
-        }
-    }
-
-    @ReactMethod
-    public void stop() {
-        stopLocationManager();
-    }
-
-    @ReactMethod
-    public void pause() {
-        pauseLocationManager();
-    }
-
-    @ReactMethod
-    public void getLastKnownLocation(final Promise promise) {
-        locationManager.getLastKnownLocation(
-          new LocationEngineCallback<LocationEngineResult>() {
-              public void onSuccess(LocationEngineResult result) {
-                  Location location = result.getLastLocation();
-                  if (result.getLastLocation() != null) {
-                      LocationEvent locationEvent = new LocationEvent(location);
-                      promise.resolve(locationEvent.getPayload());
-                  } else {
-                      promise.resolve(null);
-                  }
-              }
-              public void onFailure(@NonNull Exception exception) {
-                  promise.reject(exception);
-              }
-          }
-        );
-    }
-
-    @ReactMethod
-    public void addListener(String eventName) {
-        // Set up any upstream listeners or background tasks as necessary
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Remove upstream listeners, stop unnecessary background tasks
-    }
-
-    private void startLocationManager() {
-        locationManager.addLocationListener(onUserLocationChangeCallback);
-        locationManager.setMinDisplacement(mMinDisplacement);
-        locationManager.enable();
-        isPaused = false;
-    }
-
-    private void pauseLocationManager() {
-        if (isPaused) {
-            return;
-        }
-        locationManager.disable();
-        isPaused = true;
-    }
-
-    private void stopLocationManager() {
-        if (!isEnabled) {
-            return;
-        }
-        locationManager.removeLocationListener(onUserLocationChangeCallback);
-        locationManager.dispose();
-        isEnabled = false;
-        isPaused = false;
-    }
-}

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

@@ -1,140 +0,0 @@
-package org.maplibre.reactnative.modules;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-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 org.maplibre.android.log.Logger;
-import org.maplibre.android.log.LoggerDefinition;
-import android.util.Log;
-
-@ReactModule(name = MLRNLogging.REACT_CLASS)
-public class MLRNLogging extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "MLRNLogging";
-    private ReactApplicationContext mReactContext;
-
-    public MLRNLogging(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-        mReactContext = reactApplicationContext;
-
-        Logger.setVerbosity(Logger.WARN);
-        Logger.setLoggerDefinition(new LoggerDefinition() {
-            @Override
-            public void v(String tag, String msg) {
-                Log.v(tag, msg);
-                onLog("verbose", tag, msg, null);
-            }
-
-            @Override
-            public void v(String tag, String msg, Throwable tr) {
-                Log.v(tag, msg, tr);
-                onLog("verbose", tag, msg, tr);
-            }
-
-            @Override
-            public void d(String tag, String msg) {
-                Log.d(tag, msg);
-                onLog("debug", tag, msg, null);
-            }
-
-            @Override
-            public void d(String tag, String msg, Throwable tr) {
-                Log.d(tag, msg, tr);
-                onLog("debug",tag,msg,tr);
-            }
-
-            @Override
-            public void i(String tag, String msg) {
-                Log.i(tag, msg);
-                onLog("info", tag, msg, null);
-            }
-
-            @Override
-            public void i(String tag, String msg, Throwable tr) {
-                Log.i(tag, msg, tr);
-                onLog("info", tag, msg, tr);
-            }
-
-            @Override
-            public void w(String tag, String msg) {
-                Log.w(tag, msg);
-                onLog("warning", tag, msg, null);
-            }
-
-            @Override
-            public void w(String tag, String msg, Throwable tr) {
-                Log.w(tag, msg, tr);
-                onLog("warning", tag, msg, tr);
-            }
-
-            @Override
-            public void e(String tag, String msg) {
-                Log.e(tag, msg);
-                onLog("error", tag, msg, null);
-            }
-
-            @Override
-            public void e(String tag, String msg, Throwable tr) {
-                Log.e(tag, msg, tr);
-                onLog("error", tag, msg, tr);
-            }
-        });
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactMethod
-    public void setLogLevel(String level) {
-        @Logger.LogLevel int logLevel = Logger.NONE;
-        switch(level)
-        {
-            case "error":
-                logLevel = Logger.ERROR;
-                break;
-            case "warning":
-                logLevel = Logger.WARN;
-                break;
-            case "info":
-                logLevel = Logger.INFO;
-                break;
-            case "debug":
-                logLevel = Logger.DEBUG;
-                break;
-            case "verbose":
-                logLevel = Logger.VERBOSE;
-                break;
-            default:
-                logLevel = Logger.NONE;
-                break;
-        }
-        Logger.setVerbosity(logLevel);
-    }
-
-    @ReactMethod
-    public void addListener(String eventName) {
-        // Set up any upstream listeners or background tasks as necessary
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Remove upstream listeners, stop unnecessary background tasks
-    }
-
-    public void onLog(String level, String tag, String msg, Throwable tr) {
-        WritableMap event = Arguments.createMap();
-        event.putString("message", msg);
-        event.putString("tag", tag);
-        event.putString("level", level);
-
-        mReactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit("LogEvent", event);
-    }
-
-}

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

@@ -1,310 +0,0 @@
-package org.maplibre.reactnative.utils;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableArray;
-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.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());
-
-        Geometry geometry = feature.geometry();
-        if (geometry == null) {
-            map.putNull("geometry");
-        } else {
-            map.putMap("geometry", fromGeometry(geometry));
-        }
-
-        JsonObject properties = feature.properties();
-        if(properties == null) {
-            map.putNull("properties");
-        } else {
-            map.putMap("properties", ConvertUtils.toWritableMap(properties));
-        }
-
-        return map;
-    }
-
-    public static WritableMap fromGeometry(Geometry geometry) {
-        final String type = geometry.type();
-
-        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) {
-        WritableMap map = Arguments.createMap();
-        map.putString("type", "Point");
-        map.putArray("coordinates", getCoordinates(point));
-        return map;
-    }
-
-    public static WritableMap fromLineString(LineString lineString) {
-        WritableMap map = Arguments.createMap();
-        map.putString("type", "LineString");
-        map.putArray("coordinates", getCoordinates(lineString));
-        return map;
-    }
-
-    public static WritableMap fromPolygon(Polygon polygon) {
-        WritableMap map = Arguments.createMap();
-        map.putString("type", "Polygon");
-        map.putArray("coordinates", getCoordinates(polygon));
-        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));
-    }
-
-    public static WritableArray getCoordinates(LineString lineString) {
-        WritableArray array = Arguments.createArray();
-
-        List<Point> points = lineString.coordinates();
-        for (Point point : points) {
-            array.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
-        }
-
-        return array;
-    }
-
-    public static WritableArray getCoordinates(Polygon polygon) {
-        WritableArray array = Arguments.createArray();
-
-        List<List<Point>> points = polygon.coordinates();
-
-        for (List<Point> curPoint : points) {
-            WritableArray innerArray = Arguments.createArray();
-
-            for (Point point : curPoint) {
-                innerArray.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
-            }
-
-            array.pushArray(innerArray);
-        }
-
-        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");
-        map.putMap("geometry", toPointGeometry(latLng));
-        map.putMap("properties", properties);
-        return map;
-    }
-
-    public static WritableMap toPointGeometry(LatLng latLng) {
-        WritableMap geometry = new WritableNativeMap();
-        geometry.putString("type", "Point");
-        geometry.putArray("coordinates", fromLatLng(latLng));
-        return geometry;
-    }
-
-    public static WritableArray fromLatLng(LatLng latLng) {
-        double[] coords = new double[]{ latLng.getLongitude(), latLng.getLatitude() };
-        WritableArray writableCoords = new WritableNativeArray();
-        writableCoords.pushDouble(coords[0]);
-        writableCoords.pushDouble(coords[1]);
-        return writableCoords;
-    }
-
-    public static LatLng toLatLng(Point point) {
-        if (point == null) {
-            return null;
-        }
-        return new LatLng(point.latitude(), point.longitude());
-    }
-
-    public static LatLng toLatLng(ReadableArray coordinates) {
-        if (coordinates == null || coordinates.size() < 2) {
-            return null;
-        }
-        return new LatLng(coordinates.getDouble(1), coordinates.getDouble(0));
-    }
-
-    public static Point toPointGeometry(String featureJSONString) {
-        Feature feature = Feature.fromJson(featureJSONString);
-        if (feature == null) {
-            return null;
-        }
-        return (Point)feature.geometry();
-    }
-
-    public static WritableArray fromLatLngBounds(LatLngBounds latLngBounds) {
-        WritableArray array = Arguments.createArray();
-
-        LatLng[] latLngs = latLngBounds.toLatLngs();
-        for (LatLng latLng : latLngs) {
-            array.pushArray(fromLatLng(latLng));
-        }
-
-        return array;
-    }
-
-    private static GeometryCollection toGeometryCollection(List<Feature> features) {
-        ArrayList<Geometry> geometries = new ArrayList<>();
-        geometries.ensureCapacity(features.size());
-        for (Feature feature : features) {
-            geometries.add(feature.geometry());
-        }
-        return GeometryCollection.fromGeometries(geometries);
-    }
-
-    public static LatLngBounds toLatLngBounds(FeatureCollection featureCollection) {
-        List<Feature> features = featureCollection.features();
-
-        double[] bbox = TurfMeasurement.bbox(toGeometryCollection(features));
-
-        return LatLngBounds.from(bbox[3], bbox[2], bbox[1], bbox[0]);
-    }
-
-    public static LatLngQuad toLatLngQuad(ReadableArray array) {
-        // [top left, top right, bottom right, bottom left]
-        if (array == null || array.size() < 4) {
-            return null;
-        }
-        return new LatLngQuad(
-                toLatLng(array.getArray(0)),
-                toLatLng(array.getArray(1)),
-                toLatLng(array.getArray(2)),
-                toLatLng(array.getArray(3))
-        );
-    }
-
-    public static double[] pointToDoubleArray(Point point) {
-        if (point == null) {
-            return new double[] { 0.0, 0.0 };
-        }
-        return new double[] { point.longitude(), point.latitude() };
-    }
-}

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

@@ -1,12 +0,0 @@
-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);
-    }
-}