@maplibre/maplibre-react-native 10.0.0-alpha.9 → 10.0.0-beta.2

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNFillLayerManager.java

@@ -0,0 +1,76 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import org.maplibre.reactnative.components.AbstractEventEmitter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MLRNFillLayerManager extends ViewGroupManager<MLRNFillLayer> {
+    public static final String REACT_CLASS = "MLRNFillLayer";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    protected MLRNFillLayer createViewInstance(ThemedReactContext reactContext) {
+        return new MLRNFillLayer(reactContext);
+    }
+
+    @ReactProp(name="id")
+    public void setId(MLRNFillLayer layer, String id) {
+        layer.setID(id);
+    }
+
+    @ReactProp(name="sourceID")
+    public void setSourceID(MLRNFillLayer layer, String sourceID) {
+        layer.setSourceID(sourceID);
+    }
+
+    @ReactProp(name="sourceLayerID")
+    public void setSourceLayerId(MLRNFillLayer layer, String sourceLayerID) {
+        layer.setSourceLayerID(sourceLayerID);
+    }
+
+    @ReactProp(name="aboveLayerID")
+    public void setAboveLayerID(MLRNFillLayer layer, String aboveLayerID) {
+        layer.setAboveLayerID(aboveLayerID);
+    }
+
+    @ReactProp(name="belowLayerID")
+    public void setBelowLayerID(MLRNFillLayer layer, String belowLayerID) {
+        layer.setBelowLayerID(belowLayerID);
+    }
+
+    @ReactProp(name="layerIndex")
+    public void setLayerIndex(MLRNFillLayer layer, int layerIndex){
+        layer.setLayerIndex(layerIndex);
+    }
+
+    @ReactProp(name="minZoomLevel")
+    public void setMinZoomLevel(MLRNFillLayer layer, double minZoomLevel) {
+        layer.setMinZoomLevel(minZoomLevel);
+    }
+
+    @ReactProp(name="maxZoomLevel")
+    public void setMaxZoomLevel(MLRNFillLayer layer, double maxZoomLevel) {
+        layer.setMaxZoomLevel(maxZoomLevel);
+    }
+
+    @ReactProp(name="reactStyle")
+    public void setReactStyle(MLRNFillLayer layer, ReadableMap style) {
+        layer.setReactStyle(style);
+    }
+
+    @ReactProp(name="filter")
+    public void setFilter(MLRNFillLayer layer, ReadableArray filterList) {
+        layer.setFilter(filterList);
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNHeatmapLayer.java

@@ -0,0 +1,51 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import android.content.Context;
+
+import org.maplibre.android.style.expressions.Expression;
+import org.maplibre.android.style.layers.HeatmapLayer;
+import org.maplibre.reactnative.components.mapview.MLRNMapView;
+import org.maplibre.reactnative.components.styles.MLRNStyle;
+import org.maplibre.reactnative.components.styles.MLRNStyleFactory;
+
+public class MLRNHeatmapLayer extends MLRNLayer<HeatmapLayer> {
+    private String mSourceLayerID;
+
+    public MLRNHeatmapLayer(Context context){
+        super(context);
+    }
+
+    @Override
+    protected void updateFilter(Expression expression) {
+        mLayer.setFilter(expression);
+    }
+
+    @Override
+    public void addToMap(MLRNMapView mapView) {
+        super.addToMap(mapView);
+    }
+
+    @Override
+    public HeatmapLayer makeLayer() {
+        HeatmapLayer layer = new HeatmapLayer(mID, mSourceID);
+
+        if (mSourceLayerID != null) {
+            layer.setSourceLayer(mSourceLayerID);
+        }
+
+        return layer;
+    }
+
+    @Override
+    public void addStyles() {
+        MLRNStyleFactory.setHeatmapLayerStyle(mLayer, new MLRNStyle(getContext(), mReactStyle, mMap));
+    }
+
+    public void setSourceLayerID(String sourceLayerID) {
+        mSourceLayerID = sourceLayerID;
+
+        if (mLayer != null) {
+            mLayer.setSourceLayer(sourceLayerID);
+        }
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNHeatmapLayerManager.java

@@ -0,0 +1,73 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+import java.util.ArrayList;
+
+public class MLRNHeatmapLayerManager extends ViewGroupManager<MLRNHeatmapLayer>{
+    public static final String REACT_CLASS = "MLRNHeatmapLayer";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    protected MLRNHeatmapLayer createViewInstance(ThemedReactContext reactContext) {
+        return new MLRNHeatmapLayer(reactContext);
+    }
+
+    @ReactProp(name="id")
+    public void setId(MLRNHeatmapLayer layer, String id) {
+        layer.setID(id);
+    }
+
+    @ReactProp(name="sourceID")
+    public void setSourceID(MLRNHeatmapLayer layer, String sourceID) {
+        layer.setSourceID(sourceID);
+    }
+
+    @ReactProp(name="aboveLayerID")
+    public void setAboveLayerID(MLRNHeatmapLayer layer, String aboveLayerID) {
+        layer.setAboveLayerID(aboveLayerID);
+    }
+
+    @ReactProp(name="belowLayerID")
+    public void setBelowLayerID(MLRNHeatmapLayer layer, String belowLayerID) {
+        layer.setBelowLayerID(belowLayerID);
+    }
+
+    @ReactProp(name="layerIndex")
+    public void setLayerIndex(MLRNHeatmapLayer layer, int layerIndex){
+        layer.setLayerIndex(layerIndex);
+    }
+
+    @ReactProp(name="minZoomLevel")
+    public void setMinZoomLevel(MLRNHeatmapLayer layer, double minZoomLevel) {
+        layer.setMinZoomLevel(minZoomLevel);
+    }
+
+    @ReactProp(name="maxZoomLevel")
+    public void setMaxZoomLevel(MLRNHeatmapLayer layer, double maxZoomLevel) {
+        layer.setMaxZoomLevel(maxZoomLevel);
+    }
+
+    @ReactProp(name="reactStyle")
+    public void setReactStyle(MLRNHeatmapLayer layer, ReadableMap style) {
+        layer.setReactStyle(style);
+    }
+
+    @ReactProp(name="sourceLayerID")
+    public void setSourceLayerId(MLRNHeatmapLayer layer, String sourceLayerID) {
+        layer.setSourceLayerID(sourceLayerID);
+    }
+
+    @ReactProp(name="filter")
+    public void setFilter(MLRNHeatmapLayer layer, ReadableArray filterList) {
+        layer.setFilter(filterList);
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNLayer.java

@@ -0,0 +1,283 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import android.content.Context;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.common.logging.FLog;
+import org.maplibre.android.location.LocationComponentConstants;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.Style;
+import org.maplibre.android.style.expressions.Expression;
+import org.maplibre.android.style.layers.Layer;
+import org.maplibre.android.style.layers.Property;
+import org.maplibre.android.style.layers.PropertyFactory;
+import org.maplibre.reactnative.components.AbstractMapFeature;
+import org.maplibre.reactnative.components.mapview.MLRNMapView;
+import org.maplibre.reactnative.utils.ExpressionParser;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public abstract class MLRNLayer<T extends Layer> extends AbstractMapFeature {
+    public static final String LOG_TAG = "MLRNLayer";
+
+    protected String mID;
+    protected String mSourceID;
+    protected String mAboveLayerID;
+    protected String mBelowLayerID;
+
+    protected Integer mLayerIndex;
+    protected boolean mVisible;
+    protected Double mMinZoomLevel;
+    protected Double mMaxZoomLevel;
+    protected ReadableMap mReactStyle;
+    protected Expression mFilter;
+
+    protected MapLibreMap mMap;
+    protected T mLayer;
+
+    protected Context mContext;
+    protected MLRNMapView mMapView;
+
+    protected boolean mHadFilter;
+
+    public MLRNLayer(Context context) {
+        super(context);
+        mContext = context;
+        mHadFilter = false;
+    }
+
+    public String getID() {
+        return mID;
+    }
+
+    public void setID(String id) {
+        mID = id;
+    }
+
+    public void setSourceID(String sourceID) {
+        mSourceID = sourceID;
+    }
+
+    public void setAboveLayerID(String aboveLayerID) {
+        if (mAboveLayerID != null && mAboveLayerID.equals(aboveLayerID)) {
+            return;
+        }
+
+        mAboveLayerID = aboveLayerID;
+        if (mLayer != null) {
+            removeFromMap(mMapView);
+            addAbove(mAboveLayerID);
+        }
+    }
+
+    public void setBelowLayerID(String belowLayerID) {
+        if (mBelowLayerID != null && mBelowLayerID.equals(belowLayerID)) {
+            return;
+        }
+
+        mBelowLayerID = belowLayerID;
+        if (mLayer != null) {
+            removeFromMap(mMapView);
+            addBelow(mBelowLayerID);
+        }
+    }
+
+    public void setLayerIndex(int layerIndex) {
+        if (mLayerIndex != null && mLayerIndex == layerIndex) {
+            return;
+        }
+
+        mLayerIndex = layerIndex;
+        if (mLayer != null) {
+            removeFromMap(mMapView);
+            addAtIndex(mLayerIndex);
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        mVisible = visible;
+
+        if (mLayer != null) {
+            String visibility = mVisible ? Property.VISIBLE : Property.NONE;
+            mLayer.setProperties(PropertyFactory.visibility(visibility));
+        }
+    }
+
+    public void setMinZoomLevel(double minZoomLevel) {
+        mMinZoomLevel = minZoomLevel;
+
+        if (mLayer != null) {
+            mLayer.setMinZoom((float) minZoomLevel);
+        }
+    }
+
+    public void setMaxZoomLevel(double maxZoomLevel) {
+        mMaxZoomLevel = maxZoomLevel;
+
+        if (mLayer != null) {
+            mLayer.setMaxZoom((float) maxZoomLevel);
+        }
+    }
+
+    public void setReactStyle(ReadableMap reactStyle) {
+        mReactStyle = reactStyle;
+
+        if (mLayer != null) {
+            addStyles();
+        }
+    }
+
+    public void setFilter(ReadableArray readableFilterArray) {
+        Expression filterExpression = ExpressionParser.from(readableFilterArray);
+
+        mFilter = filterExpression;
+
+        if (mLayer != null) {
+            if (mFilter != null) {
+                mHadFilter = true;
+                updateFilter(mFilter);
+            } else if (mHadFilter) {
+                updateFilter(Expression.literal(true));
+            }
+        }
+    }
+
+    public void add() {
+        if (!hasInitialized()) {
+            return;
+        }
+        if (getStyle() == null) return;
+
+        String userBackgroundID = LocationComponentConstants.BACKGROUND_LAYER;
+        Layer userLocationBackgroundLayer = getStyle().getLayer(userBackgroundID);
+
+        // place below user location layer
+        if (userLocationBackgroundLayer != null) {
+            getStyle().addLayerBelow(mLayer, userBackgroundID);
+            mMapView.layerAdded(mLayer);
+            return;
+        }
+
+        getStyle().addLayer(mLayer);
+        mMapView.layerAdded(mLayer);
+    }
+
+    public void addAbove(final String aboveLayerID) {
+        mMapView.waitForLayer(aboveLayerID, new MLRNMapView.FoundLayerCallback() {
+            public void found(Layer layer) {
+                if (!hasInitialized()) {
+                    return;
+                }
+                if (getStyle() == null) return;
+                getStyle().addLayerAbove(mLayer, aboveLayerID);
+                mMapView.layerAdded(mLayer);
+            }
+        });
+    }
+
+    public void addBelow(final String belowLayerID) {
+        mMapView.waitForLayer(belowLayerID, new MLRNMapView.FoundLayerCallback() {
+            public void found(Layer layer) {
+                if (!hasInitialized()) {
+                    return;
+                }
+                if (getStyle() == null) return;
+                getStyle().addLayerBelow(mLayer, belowLayerID);
+                mMapView.layerAdded(mLayer);
+            }
+        });
+    }
+
+    public void addAtIndex(int index) {
+        if (!hasInitialized()) {
+            return;
+        }
+        if (getStyle() == null) return;
+        int layerSize = getStyle().getLayers().size();
+        if (index >= layerSize) {
+            FLog.e(LOG_TAG, "Layer index is greater than number of layers on map. Layer inserted at end of layer stack.");
+            index = layerSize - 1;
+        }
+        getStyle().addLayerAt(mLayer, index);
+        mMapView.layerAdded(mLayer);
+    }
+
+    protected void insertLayer() {
+        if (getStyle() == null) return;
+        if (getStyle().getLayer(mID) != null) {
+            return; // prevent adding a layer twice
+        }
+
+        if (mAboveLayerID != null) {
+            addAbove(mAboveLayerID);
+        } else if (mBelowLayerID != null) {
+            addBelow(mBelowLayerID);
+        } else if (mLayerIndex != null) {
+            addAtIndex(mLayerIndex);
+        } else {
+            add();
+        }
+
+        setZoomBounds();
+    }
+
+    protected void setZoomBounds() {
+        if (mMaxZoomLevel != null) {
+            mLayer.setMaxZoom(mMaxZoomLevel.floatValue());
+        }
+
+        if (mMinZoomLevel != null) {
+            mLayer.setMinZoom(mMinZoomLevel.floatValue());
+        }
+    }
+
+    protected void updateFilter(Expression expression) {
+        // override if you want to update the filter
+    }
+
+    @Override
+    public void addToMap(MLRNMapView mapView) {
+        mMap = mapView.getMapboxMap();
+        mMapView = mapView;
+
+        if (getStyle() == null) return;
+
+        T existingLayer = getStyle().<T>getLayerAs(mID);
+        if (existingLayer != null) {
+            mLayer = existingLayer;
+        } else {
+            mLayer = makeLayer();
+            insertLayer();
+        }
+
+        addStyles();
+        if (mFilter != null) {
+            mHadFilter = true;
+            updateFilter(mFilter);
+        }
+    }
+
+    @Override
+    public void removeFromMap(MLRNMapView mapView) {
+        if (getStyle() != null) {
+            getStyle().removeLayer(mLayer);
+        }
+    }
+
+    private Style getStyle() {
+        if (mMap == null) {
+            return null;
+        }
+        return mMap.getStyle();
+    }
+
+    public abstract T makeLayer();
+    public abstract void addStyles();
+
+    private boolean hasInitialized() {
+        return mMap != null && mLayer != null;
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNLineLayer.java

@@ -0,0 +1,51 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import android.content.Context;
+
+import org.maplibre.android.style.expressions.Expression;
+import org.maplibre.android.style.layers.LineLayer;
+import org.maplibre.reactnative.components.mapview.MLRNMapView;
+import org.maplibre.reactnative.components.styles.MLRNStyle;
+import org.maplibre.reactnative.components.styles.MLRNStyleFactory;
+
+public class MLRNLineLayer extends MLRNLayer<LineLayer> {
+    private String mSourceLayerID;
+
+    public MLRNLineLayer(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void updateFilter(Expression expression) {
+        mLayer.setFilter(expression);
+    }
+
+    @Override
+    public void addToMap(MLRNMapView mapView) {
+        super.addToMap(mapView);
+    }
+
+    @Override
+    public LineLayer makeLayer() {
+        LineLayer layer = new LineLayer(mID, mSourceID);
+
+        if (mSourceLayerID != null) {
+            layer.setSourceLayer(mSourceLayerID);
+        }
+
+        return layer;
+    }
+
+    @Override
+    public void addStyles() {
+        MLRNStyleFactory.setLineLayerStyle(mLayer, new MLRNStyle(getContext(), mReactStyle, mMap));
+    }
+
+    public void setSourceLayerID(String sourceLayerID) {
+        mSourceLayerID = sourceLayerID;
+
+        if (mLayer != null) {
+            mLayer.setSourceLayer(mSourceLayerID);
+        }
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNLineLayerManager.java

@@ -0,0 +1,75 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import org.maplibre.reactnative.components.AbstractEventEmitter;
+import org.maplibre.reactnative.components.AbstractMapFeature;
+
+import java.util.Map;
+
+public class MLRNLineLayerManager extends ViewGroupManager<MLRNLineLayer> {
+    public static final String REACT_CLASS = "MLRNLineLayer";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    protected MLRNLineLayer createViewInstance(ThemedReactContext reactContext) {
+        return new MLRNLineLayer(reactContext);
+    }
+
+    @ReactProp(name="id")
+    public void setId(MLRNLineLayer layer, String id) {
+        layer.setID(id);
+    }
+
+    @ReactProp(name="sourceID")
+    public void setSourceID(MLRNLineLayer layer, String sourceID) {
+        layer.setSourceID(sourceID);
+    }
+
+    @ReactProp(name="aboveLayerID")
+    public void setAboveLayerID(MLRNLineLayer layer, String aboveLayerID) {
+        layer.setAboveLayerID(aboveLayerID);
+    }
+
+    @ReactProp(name="belowLayerID")
+    public void setBelowLayerID(MLRNLineLayer layer, String belowLayerID) {
+        layer.setBelowLayerID(belowLayerID);
+    }
+
+    @ReactProp(name="layerIndex")
+    public void setLayerIndex(MLRNLineLayer layer, int layerIndex){
+        layer.setLayerIndex(layerIndex);
+    }
+
+    @ReactProp(name="minZoomLevel")
+    public void setMinZoomLevel(MLRNLineLayer layer, double minZoomLevel) {
+        layer.setMinZoomLevel(minZoomLevel);
+    }
+
+    @ReactProp(name="maxZoomLevel")
+    public void setMaxZoomLevel(MLRNLineLayer layer, double maxZoomLevel) {
+        layer.setMaxZoomLevel(maxZoomLevel);
+    }
+
+    @ReactProp(name="reactStyle")
+    public void setReactStyle(MLRNLineLayer layer, ReadableMap style) {
+        layer.setReactStyle(style);
+    }
+
+    @ReactProp(name="sourceLayerID")
+    public void setSourceLayerId(MLRNLineLayer layer, String sourceLayerID) {
+        layer.setSourceLayerID(sourceLayerID);
+    }
+
+    @ReactProp(name="filter")
+    public void setFilter(MLRNLineLayer layer, ReadableArray filterList) {
+        layer.setFilter(filterList);
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNRasterLayer.java

@@ -0,0 +1,23 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import android.content.Context;
+
+import org.maplibre.android.style.layers.RasterLayer;
+import org.maplibre.reactnative.components.styles.MLRNStyle;
+import org.maplibre.reactnative.components.styles.MLRNStyleFactory;
+
+public class MLRNRasterLayer extends MLRNLayer<RasterLayer> {
+    public MLRNRasterLayer(Context context) {
+        super(context);
+    }
+
+    @Override
+    public RasterLayer makeLayer() {
+        return new RasterLayer(mID, mSourceID);
+    }
+
+    @Override
+    public void addStyles() {
+        MLRNStyleFactory.setRasterLayerStyle(mLayer, new MLRNStyle(getContext(), mReactStyle, mMap));
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNRasterLayerManager.java

@@ -0,0 +1,60 @@
+package org.maplibre.reactnative.components.styles.layers;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+public class MLRNRasterLayerManager extends ViewGroupManager<MLRNRasterLayer> {
+    public static final String REACT_CLASS = "MLRNRasterLayer";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    protected MLRNRasterLayer createViewInstance(ThemedReactContext reactContext) {
+        return new MLRNRasterLayer(reactContext);
+    }
+
+    @ReactProp(name="id")
+    public void setId(MLRNRasterLayer layer, String id) {
+        layer.setID(id);
+    }
+
+    @ReactProp(name="sourceID")
+    public void setSourceID(MLRNRasterLayer layer, String sourceID) {
+        layer.setSourceID(sourceID);
+    }
+
+    @ReactProp(name="aboveLayerID")
+    public void setAboveLayerID(MLRNRasterLayer layer, String aboveLayerID) {
+        layer.setAboveLayerID(aboveLayerID);
+    }
+
+    @ReactProp(name="belowLayerID")
+    public void setBelowLayerID(MLRNRasterLayer layer, String belowLayerID) {
+        layer.setBelowLayerID(belowLayerID);
+    }
+
+    @ReactProp(name="layerIndex")
+    public void setLayerIndex(MLRNRasterLayer layer, int layerIndex){
+        layer.setLayerIndex(layerIndex);
+    }
+
+    @ReactProp(name="minZoomLevel")
+    public void setMinZoomLevel(MLRNRasterLayer layer, double minZoomLevel) {
+        layer.setMinZoomLevel(minZoomLevel);
+    }
+
+    @ReactProp(name="maxZoomLevel")
+    public void setMaxZoomLevel(MLRNRasterLayer layer, double maxZoomLevel) {
+        layer.setMaxZoomLevel(maxZoomLevel);
+    }
+
+    @ReactProp(name="reactStyle")
+    public void setReactStyle(MLRNRasterLayer layer, ReadableMap style) {
+        layer.setReactStyle(style);
+    }
+}