@maplibre/maplibre-react-native 10.4.0 → 11.0.0-alpha.10

package/android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNVectorSourceManager.java

@@ -1,80 +0,0 @@
-package org.maplibre.reactnative.components.styles.sources;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import org.maplibre.reactnative.events.constants.EventKeys;
-import org.maplibre.reactnative.utils.ConvertUtils;
-import org.maplibre.reactnative.utils.ExpressionParser;
-
-import javax.annotation.Nonnull;
-
-import java.util.Map;
-
-public class MLRNVectorSourceManager extends MLRNTileSourceManager<MLRNVectorSource> {
-    public static final String REACT_CLASS = "MLRNVectorSource";
-
-    public MLRNVectorSourceManager(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-    }
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Nonnull
-    @Override
-    protected MLRNVectorSource createViewInstance(@Nonnull ThemedReactContext reactContext) {
-        return new MLRNVectorSource(reactContext, this);
-    }
-
-    @ReactProp(name = "hasPressListener")
-    public void setHasPressListener(MLRNVectorSource source, boolean hasPressListener) {
-        source.setHasPressListener(hasPressListener);
-    }
-
-    @ReactProp(name="hitbox")
-    public void setHitbox(MLRNVectorSource source, ReadableMap map) {
-        source.setHitbox(map);
-    }
-
-    @Override
-    public Map<String, String> customEvents() {
-        return MapBuilder.<String, String>builder()
-                .put(EventKeys.VECTOR_SOURCE_LAYER_CLICK, "onMapboxVectorSourcePress")
-                .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
-                .build();
-    }
-
-    //region React Methods
-    public static final int METHOD_FEATURES = 102;
-
-    @Nullable
-    @Override
-    public Map<String, Integer> getCommandsMap() {
-        return MapBuilder.<String, Integer>builder()
-                .put("features", METHOD_FEATURES)
-                .build();
-    }
-
-    @Override
-    public void receiveCommand(MLRNVectorSource vectorSource, int commandID, @Nullable ReadableArray args) {
-
-        switch (commandID) {
-            case METHOD_FEATURES:
-                vectorSource.querySourceFeatures(
-                        args.getString(0),
-                        ConvertUtils.toStringList(args.getArray(1)),
-                        ExpressionParser.from(args.getArray(2))
-                        );
-                break;
-        }
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/events/MapChangeEvent.java

@@ -1,43 +0,0 @@
-package org.maplibre.reactnative.events;
-
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-import org.maplibre.reactnative.events.constants.EventKeys;
-
-public class MapChangeEvent extends AbstractEvent {
-    private WritableMap mPayload;
-
-    public MapChangeEvent(View view, String eventType) {
-        this(view, eventType, Arguments.createMap());
-    }
-
-    public MapChangeEvent(View view, String eventType, WritableMap payload) {
-        super(view, eventType);
-        mPayload = payload;
-    }
-
-    @Override
-    public String getKey() {
-       return EventKeys.MAP_ONCHANGE;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        // FMTODO
-        WritableMap payloadClone = Arguments.createMap();
-        payloadClone.merge(mPayload);
-        return payloadClone;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        // Make sure EventDispatcher never merges EventKeys.MAP_ONCHANGE events.
-        // This event name is used to emit events with different
-        // org.maplibre.reactnative.events.constants.EventTypes which are dispatched separately on
-        // the JS side
-        return false;
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/events/MapUserTrackingModeEvent.java

@@ -1,32 +0,0 @@
-package org.maplibre.reactnative.events;
-
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import org.maplibre.reactnative.events.constants.EventKeys;
-import org.maplibre.reactnative.events.constants.EventTypes;
-import org.maplibre.reactnative.location.UserTrackingMode;
-
-public class MapUserTrackingModeEvent extends AbstractEvent {
-    private int mUserTrackingMode;
-
-    public MapUserTrackingModeEvent(View view, int userTrackingMode) {
-        super(view, EventTypes.MAP_USER_TRACKING_MODE_CHANGE);
-        mUserTrackingMode = userTrackingMode;
-    }
-
-    @Override
-    public String getKey() {
-        return EventKeys.MAP_USER_TRACKING_MODE_CHANGE;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap payload = Arguments.createMap();
-        payload.putBoolean("followUserLocation", mUserTrackingMode != UserTrackingMode.NONE);
-        payload.putString("followUserMode", UserTrackingMode.toString(mUserTrackingMode));
-
-        return payload;
-    }
-}

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

@@ -1,7 +0,0 @@
-package org.maplibre.reactnative.location;
-
-public class UserLocationVerticalAlignment {
-    public static final int CENTER = 0;
-    public static final int TOP = 1;
-    public static final int BOTTOM = 2;
-}

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

@@ -1,59 +0,0 @@
-package org.maplibre.reactnative.location;
-
-/*
-import org.maplibre.android.plugins.locationlayer.modes.RenderMode;
-*/
-
-import org.maplibre.android.location.modes.CameraMode;
-import org.maplibre.android.location.modes.RenderMode;
-
-public class UserTrackingMode {
-    public static final int NONE = 0;
-    public static final int FOLLOW = 1;
-    public static final int FollowWithCourse = 2;
-    public static final int FollowWithHeading = 3;
-
-    public static @CameraMode.Mode int getCameraMode(int mode) {
-        switch(mode) {
-            case NONE:
-                return CameraMode.NONE;
-            case FOLLOW:
-                return CameraMode.TRACKING;
-            case FollowWithCourse:
-                return CameraMode.TRACKING_GPS;
-            case FollowWithHeading:
-                return CameraMode.TRACKING_COMPASS;
-        }
-        return CameraMode.NONE;
-    }
-
-    public static boolean isUserGesture(int reason) {
-        return reason == 1 || reason == 2; // user gesture or animation
-    }
-
-    public static String toString(int value) {
-        switch (value) {
-            case UserTrackingMode.FOLLOW:
-                return "normal";
-            case UserTrackingMode.FollowWithCourse:
-                return "course";
-            case UserTrackingMode.FollowWithHeading:
-                return "compass";
-        }
-        return null;
-    }
-
-    public static int fromString(String value) {
-        if (value == null) value = "";
-        switch (value) {
-            case "course":
-                return UserTrackingMode.FollowWithCourse;
-            case "normal":
-                return UserTrackingMode.FOLLOW;
-            case "compass":
-                return UserTrackingMode.FollowWithHeading;
-            default:
-                return UserTrackingMode.FOLLOW;
-        }
-    }
-}

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

@@ -1,15 +0,0 @@
-package org.maplibre.reactnative.location;
-
-public class UserTrackingState {
-    // The map view not yet tracked the user location
-    public static final int POSSIBLE = 0;
-
-    // The map view has begun to move to the first user location
-    public static final int BEGAN = 1;
-
-    // The map views begins a significant transition
-    public static final int SIGNIFICANT_TRANSITION = 2;
-
-    // The map view has finished moving to the user location
-    public static final int CHANGED = 3;
-}

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

@@ -1,135 +0,0 @@
-package org.maplibre.reactnative.modules;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Base64;
-import android.util.Log;
-
-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.bridge.ReadableMap;
-import com.facebook.react.module.annotations.ReactModule;
-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 org.maplibre.reactnative.utils.BitmapUtils;
-import org.maplibre.reactnative.utils.GeoJSONUtils;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static android.content.Context.CONTEXT_IGNORE_SECURITY;
-
-@ReactModule(name = MLRNSnapshotModule.REACT_CLASS)
-public class MLRNSnapshotModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "MLRNSnapshotModule";
-
-    private ReactApplicationContext mContext;
-
-    // prevents snapshotter from being GC'ed
-    private Map<String, MapSnapshotter> mSnapshotterMap;
-
-    public MLRNSnapshotModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        mContext = reactContext;
-        mSnapshotterMap = new HashMap<>();
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactMethod
-    public void takeSnap(final ReadableMap jsOptions, final Promise promise) {
-        FileSource.getInstance(mContext).activate();
-
-        mContext.runOnUiQueueThread(new Runnable() {
-            @Override
-            public void run() {
-                final String snapshotterID = UUID.randomUUID().toString();
-                final MapSnapshotter snapshotter = new MapSnapshotter(mContext, getOptions(jsOptions));
-                mSnapshotterMap.put(snapshotterID, snapshotter);
-
-                snapshotter.start(new MapSnapshotter.SnapshotReadyCallback() {
-                    @Override
-                    public void onSnapshotReady(MapSnapshot snapshot) {
-                        Bitmap bitmap = snapshot.getBitmap();
-
-                        String result = null;
-                        if (jsOptions.getBoolean("writeToDisk")) {
-                            result = BitmapUtils.createTempFile(mContext, bitmap);
-                        } else {
-                            result = BitmapUtils.createBase64(bitmap);
-                        }
-
-                        if (result == null) {
-                            promise.reject(REACT_CLASS, "Could not generate snapshot, please check Android logs for more info.");
-                            return;
-                        }
-
-                        promise.resolve(result);
-                        mSnapshotterMap.remove(snapshotterID);
-                    }
-                }, new MapSnapshotter.ErrorHandler() {
-                    @Override
-                    public void onError(String error) {
-                        Log.w(REACT_CLASS, error);
-                        mSnapshotterMap.remove(snapshotterID);
-                    }
-                });
-            }
-        });
-    }
-
-    private MapSnapshotter.Options getOptions(ReadableMap jsOptions) {
-        MapSnapshotter.Options options = new MapSnapshotter.Options(
-                (int) jsOptions.getDouble("width"),
-                (int) jsOptions.getDouble("height"));
-
-        options.withLogo(jsOptions.getBoolean("withLogo"));
-        options.withStyle(jsOptions.getString("styleURL"));
-        options.withPixelRatio(Float.valueOf(mContext.getResources().getDisplayMetrics().scaledDensity).intValue());
-
-        if (jsOptions.hasKey("bounds")) {
-            FeatureCollection bounds = FeatureCollection.fromJson(jsOptions.getString("bounds"));
-            options.withRegion(GeoJSONUtils.toLatLngBounds(bounds));
-        } else {
-            Feature centerPoint = Feature.fromJson(jsOptions.getString("centerCoordinate"));
-            CameraPosition cameraPosition = new CameraPosition.Builder()
-                    .target(GeoJSONUtils.toLatLng((Point) centerPoint.geometry()))
-                    .tilt(jsOptions.getDouble("pitch"))
-                    .bearing(jsOptions.getDouble("heading"))
-                    .zoom(jsOptions.getDouble("zoomLevel"))
-                    .build();
-            options.withCameraPosition(cameraPosition);
-        }
-
-        return options;
-    }
-
-    private void closeSnapshotOutputStream(OutputStream outputStream) {
-        if (outputStream == null) {
-            return;
-        }
-        try {
-            outputStream.close();
-        } catch (IOException e) {
-            Log.w(REACT_CLASS, e.getLocalizedMessage());
-        }
-    }
-}

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/ios/MLRN/CameraMode.h

@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface CameraMode : NSObject
-
-extern int const RCT_MAPBOX_CAMERA_MODE_FLIGHT;
-extern int const RCT_MAPBOX_CAMERA_MODE_EASE;
-extern int const RCT_MAPBOX_CAMERA_MODE_LINEAR;
-extern int const RCT_MAPBOX_CAMERA_MODE_NONE;
-
-@end