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

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

@@ -1,103 +0,0 @@
-package org.maplibre.reactnative.components.styles;
-
-import android.util.Log;
-
-import com.facebook.react.bridge.Dynamic;
-import com.facebook.react.bridge.NoSuchKeyException;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.ReadableNativeArray;
-import com.facebook.react.bridge.ReadableType;
-import org.maplibre.android.style.expressions.Expression.Stop;
-import org.maplibre.android.style.layers.PropertyValue;
-
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public abstract class MLRNStyleFunctionParser<T, V> {
-    private MLRNStyleValue mStyleValue;
-
-    public MLRNStyleFunctionParser(MLRNStyleValue styleValue) {
-        mStyleValue = styleValue;
-    }
-
-    public List<StopConfig> getRawStops() {
-        ReadableArray readableArrayRawStops = mStyleValue.getArray("stops");
-
-        List<StopConfig> rawStops = new ArrayList<>();
-
-        for (int i = 0; i < readableArrayRawStops.size(); i++) {
-            ReadableArray rawStop = readableArrayRawStops.getArray(i);
-
-            ReadableMap jsStopKey = rawStop.getMap(0);
-            ReadableMap jsStopValue = rawStop.getMap(1);
-            MLRNStyleValue innerStyleValue = new MLRNStyleValue(jsStopValue);
-
-            Object propertyValue = null;
-            try {
-                Dynamic dynamicPropertyValue = innerStyleValue.getDynamic("propertyValue");
-                ReadableType type = dynamicPropertyValue.getType();
-
-                if (type.equals(ReadableType.Number)) {
-                    propertyValue = dynamicPropertyValue.asDouble();
-                } else if (type.equals(ReadableType.Boolean)){
-                    propertyValue = dynamicPropertyValue.asBoolean();
-                } else {
-                    propertyValue = dynamicPropertyValue.asString();
-                }
-            } catch (NoSuchKeyException e) {
-                // not a zoom-property value
-            }
-
-            StopConfig config;
-            if (propertyValue != null) {
-                config = new StopConfig(getStopKey(jsStopKey), getRawStopValue(innerStyleValue), propertyValue);
-            } else {
-                config = new StopConfig(getStopKey(jsStopKey), getRawStopValue(innerStyleValue));
-            }
-
-            rawStops.add(config);
-        }
-
-        return rawStops;
-    }
-
-    protected abstract T getRawStopValue (MLRNStyleValue styleValue);
-    protected abstract PropertyValue<V> getStopValue(T value);
-
-    private Object getStopKey(ReadableMap jsStopKey) {
-        String payloadKey = "value";
-        String type = jsStopKey.getString("type");
-
-        switch (type) {
-            case "number":
-                return jsStopKey.getDouble(payloadKey);
-            case "boolean":
-                return jsStopKey.getBoolean(payloadKey);
-            default:
-                return jsStopKey.getString(payloadKey);
-        }
-    }
-
-    private class StopConfig {
-        Object propertyValue;
-        T value;
-        Object key;
-
-        StopConfig(Object key, T value) {
-            this(key, value, null);
-        }
-
-        StopConfig(Object key, T value, Object propertyValue) {
-            this.key = key;
-            this.value = value;
-            this.propertyValue = propertyValue;
-        }
-    }
-}

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

@@ -1,208 +0,0 @@
-package org.maplibre.reactnative.components.styles;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Dynamic;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.google.gson.JsonArray;
-import org.maplibre.android.style.expressions.Expression;
-import org.maplibre.android.style.layers.TransitionOptions;
-import org.maplibre.reactnative.utils.ConvertUtils;
-import org.maplibre.reactnative.utils.ExpressionParser;
-import org.maplibre.reactnative.utils.ImageEntry;
-
-public class MLRNStyleValue {
-
-    private String mType;
-    private boolean isExpression;
-    private Expression mExpression;
-    private ReadableMap mPayload;
-
-    private String imageURI = "";
-    private boolean isAddImage;
-    private Double imageScale = ImageEntry.defaultScale;
-
-    public static final int InterpolationModeExponential = 100;
-    public static final int InterpolationModeInterval = 101;
-    public static final int InterpolationModeCategorical = 102;
-    public static final int InterpolationModeIdentity = 103;
-
-    public MLRNStyleValue(@NonNull ReadableMap config) {
-        mType = config.getString("styletype");
-        mPayload = config.getMap("stylevalue");
-
-        if ("image".equals(mType)) {
-            imageScale = ImageEntry.defaultScale;
-            if ("hashmap".equals(mPayload.getString("type"))) {
-                ReadableMap map = getMap();
-                imageURI = map.getMap("uri").getString("value");
-                if (map.getMap("scale") != null) {
-                    imageScale = map.getMap("scale").getDouble("value");
-                }
-            } else if ("string".equals(mPayload.getString("type"))) {
-                String value = mPayload.getString("value");
-                if (value.contains("://")) {
-                    imageURI = value;
-                } else {
-                    imageURI = null;
-                    isExpression = true;
-                    mExpression = Expression.literal(value);
-                }
-            } else {
-                imageURI = null;
-            }
-            isAddImage = imageURI != null;
-            if (isAddImage) { return; }
-        }
-
-        Dynamic dynamic = mPayload.getDynamic("value");
-        if (dynamic.getType().equals(ReadableType.Array)) {
-            ReadableArray array = dynamic.asArray();
-            if (array.size() > 0 && mPayload.getString("type").equals("array")) {
-                ReadableMap map = array.getMap(0);
-                if (map != null && map.getString("type").equals("string")) {
-                    isExpression = true;
-                    mExpression = ExpressionParser.fromTyped(mPayload);
-                }
-            }
-        }
-    }
-
-    private boolean isTokenizedValue(String value) {
-        return (value.startsWith("{") && value.endsWith("}"));
-    }
-
-    public String getType() {
-        return mType;
-    }
-
-    public boolean isFunction() {
-        return mType.equals("function");
-    }
-
-    public int getInt(String key) {
-        return mPayload.getInt(key);
-    }
-
-    public String getString(String key) {
-        return mPayload.getString(key);
-    }
-
-    public Double getDouble(String key) {
-        return mPayload.getDouble(key);
-    }
-
-    public Float getFloat(String key) {
-        return getDouble(key).floatValue();
-    }
-
-    public Dynamic getDynamic(String key) {
-        return mPayload.getDynamic(key);
-    }
-
-    public ReadableArray getArray(String key) {
-        return mPayload.getArray(key);
-    }
-
-    public Boolean getBoolean(String key) {
-        return mPayload.getBoolean(key);
-    }
-
-    public Float[] getFloatArray(String key) {
-        ReadableArray arr = getArray(key);
-
-        Float[] floatArr = new Float[arr.size()];
-        for (int i = 0; i < arr.size(); i++) {
-            ReadableMap item = arr.getMap(i);
-            floatArr[i] = (float) item.getDouble("value");
-        }
-
-        return floatArr;
-    }
-
-    public String[] getStringArray(String key) {
-        ReadableArray arr = getArray(key);
-
-        String[] stringArr = new String[arr.size()];
-        for (int i = 0; i < arr.size(); i++) {
-            ReadableMap item = arr.getMap(i);
-            stringArr[i] = item.getString("value");
-        }
-
-        return stringArr;
-    }
-
-    public ReadableMap getMap() {
-        if ("hashmap".equals(mPayload.getString("type"))) {
-            ReadableArray keyValues = mPayload.getArray("value");
-            WritableNativeMap result = new WritableNativeMap();
-            for (int i = 0; i < keyValues.size(); i++) {
-                ReadableArray keyValue = keyValues.getArray(i);
-                String stringKey = keyValue.getMap(0).getString("value");
-                WritableNativeMap value = new WritableNativeMap();
-                value.merge(keyValue.getMap(1));
-                result.putMap(stringKey, value);
-            }
-            return result;
-        }
-
-        return null;
-    }
-
-    public ReadableMap getMap(String _key) {
-        return getMap();
-    }
-
-    public Expression getExpression() {
-        return mExpression;
-    }
-
-    public boolean isExpression() {
-        return isExpression;
-    }
-
-    public boolean shouldAddImage() {
-        return isAddImage;
-    }
-
-    public Boolean isImageStringValue() {
-        return "string".equals(mPayload.getString("type"));
-    }
-
-    public String getImageStringValue() {
-        return mPayload.getString("value");
-    }
-
-    public String getImageURI() {
-        return imageURI;
-    }
-
-    public double getImageScale() {
-        return imageScale;
-    }
-
-    public TransitionOptions getTransition() {
-        if (!mType.equals("transition")) {
-            return null;
-        }
-        ReadableMap config = getMap(MLRNStyleFactory.VALUE_KEY);
-
-        boolean enablePlacementTransitions = true;
-        if (config.hasKey("enablePlacementTransitions")) {
-            enablePlacementTransitions = config.getMap("enablePlacementTransitions").getBoolean("value");
-        }
-        int duration = 300;
-        int delay = 0;
-        if (config.hasKey("duration") && ReadableType.Map.equals(config.getType("duration"))) {
-            duration = config.getMap("duration").getInt("value");
-        }
-        if (config.hasKey("delay") && ReadableType.Map.equals(config.getType("delay"))) {
-            delay = config.getMap("delay").getInt("value");
-        }
-
-        return new TransitionOptions(duration, delay, enablePlacementTransitions);
-    }
-}

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

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

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

@@ -1,60 +0,0 @@
-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 MLRNBackgroundLayerManager extends ViewGroupManager<MLRNBackgroundLayer> {
-    public static final String REACT_CLASS = "MLRNBackgroundLayer";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNBackgroundLayer createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNBackgroundLayer(reactContext);
-    }
-
-    @ReactProp(name="id")
-    public void setId(MLRNBackgroundLayer layer, String id) {
-        layer.setID(id);
-    }
-
-    @ReactProp(name="sourceID")
-    public void setSourceID(MLRNBackgroundLayer layer, String sourceID) {
-        layer.setSourceID(sourceID);
-    }
-
-    @ReactProp(name="aboveLayerID")
-    public void setAboveLayerID(MLRNBackgroundLayer layer, String aboveLayerID) {
-        layer.setAboveLayerID(aboveLayerID);
-    }
-
-    @ReactProp(name="belowLayerID")
-    public void setBelowLayerID(MLRNBackgroundLayer layer, String belowLayerID) {
-        layer.setBelowLayerID(belowLayerID);
-    }
-
-    @ReactProp(name="layerIndex")
-    public void setLayerIndex(MLRNBackgroundLayer layer, int layerIndex){
-        layer.setLayerIndex(layerIndex);
-    }
-
-    @ReactProp(name="minZoomLevel")
-    public void setMinZoomLevel(MLRNBackgroundLayer layer, double minZoomLevel) {
-        layer.setMinZoomLevel(minZoomLevel);
-    }
-
-    @ReactProp(name="maxZoomLevel")
-    public void setMaxZoomLevel(MLRNBackgroundLayer layer, double maxZoomLevel) {
-        layer.setMaxZoomLevel(maxZoomLevel);
-    }
-
-    @ReactProp(name="reactStyle")
-    public void setReactStyle(MLRNBackgroundLayer layer, ReadableMap style) {
-        layer.setReactStyle(style);
-    }
-}

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

@@ -1,51 +0,0 @@
-package org.maplibre.reactnative.components.styles.layers;
-
-import android.content.Context;
-
-import org.maplibre.android.style.expressions.Expression;
-import org.maplibre.android.style.layers.CircleLayer;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.components.styles.MLRNStyle;
-import org.maplibre.reactnative.components.styles.MLRNStyleFactory;
-
-public class MLRNCircleLayer extends MLRNLayer<CircleLayer> {
-    private String mSourceLayerID;
-
-    public MLRNCircleLayer(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected void updateFilter(Expression expression) {
-        mLayer.setFilter(expression);
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        super.addToMap(mapView);
-    }
-
-    @Override
-    public CircleLayer makeLayer() {
-        CircleLayer layer = new CircleLayer(mID, mSourceID);
-
-        if (mSourceLayerID != null) {
-            layer.setSourceLayer(mSourceLayerID);
-        }
-
-        return layer;
-    }
-
-    @Override
-    public void addStyles() {
-        MLRNStyleFactory.setCircleLayerStyle(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/MLRNCircleLayerManager.java

@@ -1,73 +0,0 @@
-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 MLRNCircleLayerManager extends ViewGroupManager<MLRNCircleLayer> {
-    public static final String REACT_CLASS = "MLRNCircleLayer";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNCircleLayer createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNCircleLayer(reactContext);
-    }
-
-    @ReactProp(name="id")
-    public void setId(MLRNCircleLayer layer, String id) {
-        layer.setID(id);
-    }
-
-    @ReactProp(name="sourceID")
-    public void setSourceID(MLRNCircleLayer layer, String sourceID) {
-        layer.setSourceID(sourceID);
-    }
-
-    @ReactProp(name="aboveLayerID")
-    public void setAboveLayerID(MLRNCircleLayer layer, String aboveLayerID) {
-        layer.setAboveLayerID(aboveLayerID);
-    }
-
-    @ReactProp(name="belowLayerID")
-    public void setBelowLayerID(MLRNCircleLayer layer, String belowLayerID) {
-        layer.setBelowLayerID(belowLayerID);
-    }
-
-    @ReactProp(name="layerIndex")
-    public void setLayerIndex(MLRNCircleLayer layer, int layerIndex){
-        layer.setLayerIndex(layerIndex);
-    }
-
-    @ReactProp(name="minZoomLevel")
-    public void setMinZoomLevel(MLRNCircleLayer layer, double minZoomLevel) {
-        layer.setMinZoomLevel(minZoomLevel);
-    }
-
-    @ReactProp(name="maxZoomLevel")
-    public void setMaxZoomLevel(MLRNCircleLayer layer, double maxZoomLevel) {
-        layer.setMaxZoomLevel(maxZoomLevel);
-    }
-
-    @ReactProp(name="reactStyle")
-    public void setReactStyle(MLRNCircleLayer layer, ReadableMap style) {
-        layer.setReactStyle(style);
-    }
-
-    @ReactProp(name="sourceLayerID")
-    public void setSourceLayerId(MLRNCircleLayer layer, String sourceLayerID) {
-        layer.setSourceLayerID(sourceLayerID);
-    }
-
-    @ReactProp(name="filter")
-    public void setFilter(MLRNCircleLayer layer, ReadableArray filterList) {
-        layer.setFilter(filterList);
-    }
-}

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

@@ -1,51 +0,0 @@
-package org.maplibre.reactnative.components.styles.layers;
-
-import android.content.Context;
-
-import org.maplibre.android.style.expressions.Expression;
-import org.maplibre.android.style.layers.FillExtrusionLayer;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.components.styles.MLRNStyle;
-import org.maplibre.reactnative.components.styles.MLRNStyleFactory;
-
-public class MLRNFillExtrusionLayer extends MLRNLayer<FillExtrusionLayer> {
-    private String mSourceLayerID;
-
-    public MLRNFillExtrusionLayer(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected void updateFilter(Expression expression) {
-        mLayer.setFilter(expression);
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        super.addToMap(mapView);
-    }
-
-    @Override
-    public FillExtrusionLayer makeLayer() {
-        FillExtrusionLayer layer = new FillExtrusionLayer(mID, mSourceID);
-
-        if (mSourceLayerID != null) {
-            layer.setSourceLayer(mSourceLayerID);
-        }
-
-        return layer;
-    }
-
-    @Override
-    public void addStyles() {
-        MLRNStyleFactory.setFillExtrusionLayerStyle(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/MLRNFillExtrusionLayerManager.java

@@ -1,76 +0,0 @@
-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 MLRNFillExtrusionLayerManager extends ViewGroupManager<MLRNFillExtrusionLayer> {
-    public static final String REACT_CLASS = "MLRNFillExtrusionLayer";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNFillExtrusionLayer createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNFillExtrusionLayer(reactContext);
-    }
-
-    @ReactProp(name="id")
-    public void setId(MLRNFillExtrusionLayer layer, String id) {
-        layer.setID(id);
-    }
-
-    @ReactProp(name="sourceID")
-    public void setSourceID(MLRNFillExtrusionLayer layer, String sourceID) {
-        layer.setSourceID(sourceID);
-    }
-
-    @ReactProp(name="aboveLayerID")
-    public void setAboveLayerID(MLRNFillExtrusionLayer layer, String aboveLayerID) {
-        layer.setAboveLayerID(aboveLayerID);
-    }
-
-    @ReactProp(name="belowLayerID")
-    public void setBelowLayerID(MLRNFillExtrusionLayer layer, String belowLayerID) {
-        layer.setBelowLayerID(belowLayerID);
-    }
-
-    @ReactProp(name="layerIndex")
-    public void setLayerIndex(MLRNFillExtrusionLayer layer, int layerIndex){
-        layer.setLayerIndex(layerIndex);
-    }
-
-    @ReactProp(name="minZoomLevel")
-    public void setMinZoomLevel(MLRNFillExtrusionLayer layer, double minZoomLevel) {
-        layer.setMinZoomLevel(minZoomLevel);
-    }
-
-    @ReactProp(name="maxZoomLevel")
-    public void setMaxZoomLevel(MLRNFillExtrusionLayer layer, double maxZoomLevel) {
-        layer.setMaxZoomLevel(maxZoomLevel);
-    }
-
-    @ReactProp(name="reactStyle")
-    public void setReactStyle(MLRNFillExtrusionLayer layer, ReadableMap style) {
-        layer.setReactStyle(style);
-    }
-
-    @ReactProp(name="sourceLayerID")
-    public void setSourceLayerId(MLRNFillExtrusionLayer layer, String sourceLayerID) {
-        layer.setSourceLayerID(sourceLayerID);
-    }
-
-    @ReactProp(name="filter")
-    public void setFilter(MLRNFillExtrusionLayer layer, ReadableArray filterList) {
-        layer.setFilter(filterList);
-    }
-}

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

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