@maplibre/maplibre-react-native 11.0.0-alpha.26 → 11.0.0-alpha.27

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

@@ -1,248 +0,0 @@
-package org.maplibre.reactnative.components.sources;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import org.maplibre.geojson.Feature;
-import org.maplibre.geojson.FeatureCollection;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.Style;
-import org.maplibre.android.style.expressions.Expression;
-import org.maplibre.android.style.sources.GeoJsonOptions;
-import org.maplibre.android.style.sources.GeoJsonSource;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.events.AndroidCallbackEvent;
-import org.maplibre.reactnative.events.FeatureClickEvent;
-import org.maplibre.reactnative.utils.ClusterPropertyEntry;
-import org.maplibre.reactnative.utils.ImageEntry;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-
-public class MLRNShapeSource extends MLRNSource<GeoJsonSource> {
-    private URL mURL;
-    private MLRNShapeSourceManager mManager;
-
-    private String mShape;
-
-    private Boolean mCluster;
-    private Integer mClusterRadius;
-    private Integer mClusterMinPoints;
-    private Integer mClusterMaxZoom;
-    private List<Map.Entry<String, ClusterPropertyEntry>> mClusterProperties;
-
-    private Integer mMaxZoom;
-    private Integer mBuffer;
-    private Double mTolerance;
-    private Boolean mLineMetrics;
-
-    private static Bitmap mImagePlaceholder;
-    private List<Map.Entry<String, ImageEntry>> mImages;
-    private List<Map.Entry<String, BitmapDrawable>> mNativeImages;
-
-    public MLRNShapeSource(Context context, MLRNShapeSourceManager manager) {
-        super(context);
-        mManager = manager;
-    }
-
-    @Override
-    public void addToMap(final MLRNMapView mapView) {
-        // Wait for style before adding the source to the map
-        mapView.getMapLibreMap().getStyle(new Style.OnStyleLoaded() {
-            @Override
-            public void onStyleLoaded(@NonNull Style style) {
-                MapLibreMap map = mapView.getMapLibreMap();
-                MLRNShapeSource.super.addToMap(mapView);
-            }
-        });
-    }
-
-    @Override
-    public GeoJsonSource makeSource() {
-        GeoJsonOptions options = getOptions();
-
-        if (mShape != null) {
-            return new GeoJsonSource(mID, mShape, options);
-        }
-
-        return new GeoJsonSource(mID, mURL, options);
-    }
-
-    public void setURL(URL url) {
-        mURL = url;
-
-        if (mSource != null && mMapView != null && !mMapView.isDestroyed() ) {
-            mSource.setUrl(mURL);
-        }
-    }
-
-    public void setShape(String geoJSONStr) {
-        mShape = geoJSONStr;
-
-        if (mSource != null && mMapView != null && !mMapView.isDestroyed() ) {
-            mSource.setGeoJson(mShape);
-        }
-    }
-
-    public void setCluster(boolean cluster) {
-        mCluster = cluster;
-    }
-
-    public void setClusterRadius(int clusterRadius) {
-        mClusterRadius = clusterRadius;
-    }
-
-    public void setClusterMinPoints(int clusterMinPoints) {
-        mClusterMinPoints = clusterMinPoints;
-    }
-
-    public void setClusterMaxZoom(int clusterMaxZoom) {
-        mClusterMaxZoom = clusterMaxZoom;
-    }
-
-    public void setClusterProperties(List<Map.Entry<String, ClusterPropertyEntry>> clusterProperties) {
-        mClusterProperties = clusterProperties;
-    }
-
-    public void setMaxZoom(int maxZoom) {
-        mMaxZoom = maxZoom;
-    }
-
-    public void setBuffer(int buffer) {
-        mBuffer = buffer;
-    }
-
-    public void setTolerance(double tolerance) {
-        mTolerance = tolerance;
-    }
-
-    public void setLineMetrics(boolean lineMetrics) {
-        mLineMetrics = lineMetrics;
-    }
-
-    public void onPress(OnPressEvent event) {
-        mManager.handleEvent(FeatureClickEvent.makeShapeSourceEvent(this, event));
-    }
-
-    private GeoJsonOptions getOptions() {
-        GeoJsonOptions options = new GeoJsonOptions();
-
-        if (mCluster != null) {
-            options.withCluster(mCluster);
-        }
-
-        if (mClusterRadius != null) {
-            options.withClusterRadius(mClusterRadius);
-        }
-
-        if (mClusterMinPoints != null) {
-            options.withClusterMinPoints(mClusterMinPoints);
-        }
-
-        if (mClusterMaxZoom != null) {
-            options.withClusterMaxZoom(mClusterMaxZoom);
-        }
-
-        if (mClusterProperties != null) {
-            for (Map.Entry<String, ClusterPropertyEntry> entry : mClusterProperties) {
-                ClusterPropertyEntry property = entry.getValue();
-
-                options.withClusterProperty(entry.getKey(), property.operator, property.mapping);
-            }
-        }
-
-        if (mMaxZoom != null) {
-            options.withMaxZoom(mMaxZoom);
-        }
-
-        if (mBuffer != null) {
-            options.withBuffer(mBuffer);
-        }
-
-        if (mTolerance != null) {
-            options.withTolerance(mTolerance.floatValue());
-        }
-
-        if (mLineMetrics != null) {
-            options.withLineMetrics(mLineMetrics);
-        }
-
-        return options;
-    }
-
-    public void querySourceFeatures(String callbackID,
-                                    @Nullable Expression filter) {
-        if (mSource == null) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "source is not yet loaded");
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-        List<Feature> features = mSource.querySourceFeatures(filter);
-        WritableMap payload = new WritableNativeMap();
-        payload.putString("data", FeatureCollection.fromFeatures(features).toJson());
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
-    }
-
-    public void getClusterExpansionZoom(String callbackID, String featureJSON) {
-        if (mSource == null) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "source is not yet loaded");
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-        Feature feature = Feature.fromJson(featureJSON);
-   
-        int zoom = mSource.getClusterExpansionZoom(feature);
-
-        WritableMap payload = new WritableNativeMap();
-        payload.putInt("data", zoom);
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
-    }
-
-    public void getClusterLeaves(String callbackID, String featureJSON, int number, int offset) {
-        if (mSource == null) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "source is not yet loaded");
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-        Feature clusterFeature = Feature.fromJson(featureJSON);
-        FeatureCollection leaves = mSource.getClusterLeaves(clusterFeature, number, offset);
-        WritableMap payload = new WritableNativeMap();
-        payload.putString("data", leaves.toJson());
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
-    }
-
-    public void getClusterChildren(String callbackID, String featureJSON) {
-        if (mSource == null) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "source is not yet loaded");
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-        Feature clusterFeature = Feature.fromJson(featureJSON);
-        FeatureCollection leaves = mSource.getClusterChildren(clusterFeature);
-        WritableMap payload = new WritableNativeMap();
-        payload.putString("data", leaves.toJson());
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
-    }
-}

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

@@ -1,216 +0,0 @@
-package org.maplibre.reactnative.components.sources;
-
-import android.util.Log;
-import android.view.View;
-
-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.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import org.maplibre.android.style.expressions.Expression;
-import org.maplibre.reactnative.components.AbstractEventEmitter;
-import org.maplibre.reactnative.events.constants.EventKeys;
-import org.maplibre.reactnative.utils.ClusterPropertyEntry;
-import org.maplibre.reactnative.utils.ExpressionParser;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class MLRNShapeSourceManager extends AbstractEventEmitter<MLRNShapeSource> {
-    public static final String LOG_TAG = "MLRNShapeSourceManager";
-    public static final String REACT_CLASS = "MLRNShapeSource";
-
-    private ReactApplicationContext mContext;
-
-    public MLRNShapeSourceManager(ReactApplicationContext context) {
-        super(context);
-        mContext = context;
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNShapeSource createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNShapeSource(reactContext, this);
-    }
-
-    @Override
-    public View getChildAt(MLRNShapeSource source, int childPosition) {
-        return source.getLayerAt(childPosition);
-    }
-
-    @Override
-    public int getChildCount(MLRNShapeSource source) {
-        return source.getLayerCount();
-    }
-
-    @Override
-    public void addView(MLRNShapeSource source, View childView, int childPosition) {
-        source.addLayer(childView, getChildCount(source));
-    }
-
-    @Override
-    public void removeViewAt(MLRNShapeSource source, int childPosition) {
-        source.removeLayer(childPosition);
-    }
-
-    @ReactProp(name = "id")
-    public void setId(MLRNShapeSource source, String id) {
-        source.setID(id);
-    }
-
-    @ReactProp(name = "url")
-    public void setURL(MLRNShapeSource source, String urlStr) {
-        try {
-            source.setURL(new URL(urlStr));
-        } catch (MalformedURLException e) {
-            Log.w(LOG_TAG, e.getLocalizedMessage());
-        }
-    }
-
-    @ReactProp(name = "shape")
-    public void setGeometry(MLRNShapeSource source, String geoJSONStr) {
-        source.setShape(geoJSONStr);
-    }
-
-    @ReactProp(name = "cluster")
-    public void setCluster(MLRNShapeSource source, int cluster) {
-        source.setCluster(cluster == 1);
-    }
-
-    @ReactProp(name = "clusterRadius")
-    public void setClusterRadius(MLRNShapeSource source, int radius) {
-        source.setClusterRadius(radius);
-    }
-
-    @ReactProp(name = "clusterMinPoints")
-    public void setClusterMinPoints(MLRNShapeSource source, int minPoints) {
-        source.setClusterMinPoints(minPoints);
-    }
-
-    @ReactProp(name = "clusterMaxZoomLevel")
-    public void setClusterMaxZoomLevel(MLRNShapeSource source, int clusterMaxZoom) {
-        source.setClusterMaxZoom(clusterMaxZoom);
-    }
-
-    @ReactProp(name = "clusterProperties")
-    public void setClusterProperties(MLRNShapeSource source, ReadableMap map) {
-        List<Map.Entry<String, ClusterPropertyEntry>> properties = new ArrayList<>();
-
-        ReadableMapKeySetIterator iterator = map.keySetIterator();
-        while (iterator.hasNextKey()) {
-            String name = iterator.nextKey();
-            ReadableArray expressions = map.getArray(name);
-
-            Expression operator;
-            if (expressions.getType(0) == ReadableType.Array) {
-                operator = ExpressionParser.from(expressions.getArray(0));
-            } else {
-                operator = Expression.literal(expressions.getString(0));
-            }
-
-            Expression mapping = ExpressionParser.from(expressions.getArray(1));
-
-            properties.add(new AbstractMap.SimpleEntry<>(name, new ClusterPropertyEntry(operator, mapping)));
-        }
-
-        source.setClusterProperties(properties);
-    }
-
-    @ReactProp(name = "maxZoomLevel")
-    public void setMaxZoomLevel(MLRNShapeSource source, int maxZoom) {
-        source.setMaxZoom(maxZoom);
-    }
-
-    @ReactProp(name = "buffer")
-    public void setBuffer(MLRNShapeSource source, int buffer) {
-        source.setBuffer(buffer);
-    }
-
-    @ReactProp(name = "tolerance")
-    public void setTolerance(MLRNShapeSource source, double tolerance) {
-        source.setTolerance(tolerance);
-    }
-
-    @ReactProp(name = "lineMetrics")
-    public void setLineMetrics(MLRNShapeSource source, boolean lineMetrics) {
-        source.setLineMetrics(lineMetrics);
-    }
-
-    @ReactProp(name = "hasPressListener")
-    public void setHasPressListener(MLRNShapeSource source, boolean hasPressListener) {
-        source.setHasPressListener(hasPressListener);
-    }
-
-    @ReactProp(name="hitbox")
-    public void setHitbox(MLRNShapeSource source, ReadableMap map) {
-        source.setHitbox(map);
-    }
-
-    @Override
-    public Map<String, String> customEvents() {
-        return MapBuilder.<String, String>builder()
-                .put(EventKeys.SHAPE_SOURCE_LAYER_CLICK, "onMapboxShapeSourcePress")
-                .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
-                .build();
-    }
-
-    //region React Methods
-    public static final int METHOD_FEATURES = 103;
-    public static final int METHOD_GET_CLUSTER_EXPANSION_ZOOM = 104;
-    public static final int METHOD_GET_CLUSTER_LEAVES = 105;
-    public static final int METHOD_GET_CLUSTER_CHILDREN = 106;
-
-    @Nullable
-    @Override
-    public Map<String, Integer> getCommandsMap() {
-        return MapBuilder.<String, Integer>builder()
-                .put("features", METHOD_FEATURES)
-                .put("getClusterExpansionZoom", METHOD_GET_CLUSTER_EXPANSION_ZOOM)
-                .put("getClusterLeaves", METHOD_GET_CLUSTER_LEAVES)
-                .put("getClusterChildren", METHOD_GET_CLUSTER_CHILDREN)
-                .build();
-    }
-
-    @Override
-    public void receiveCommand(MLRNShapeSource source, int commandID, @Nullable ReadableArray args) {
-        switch (commandID) {
-            case METHOD_FEATURES:
-                source.querySourceFeatures(
-                        args.getString(0),
-                        ExpressionParser.from(args.getArray(1))
-                );
-                break;
-            case METHOD_GET_CLUSTER_EXPANSION_ZOOM:
-                source.getClusterExpansionZoom(args.getString(0), args.getString(1));
-                break;
-            case METHOD_GET_CLUSTER_LEAVES:
-                source.getClusterLeaves(
-                        args.getString(0),
-                        args.getString(1),
-                        args.getInt(2),
-                        args.getInt((3))
-                );
-                break;
-            case METHOD_GET_CLUSTER_CHILDREN:
-                source.getClusterChildren(
-                        args.getString(0),
-                        args.getString(1)                        
-                );
-                break;
-        }
-    }
-}

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

@@ -1,240 +0,0 @@
-package org.maplibre.reactnative.components.sources;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-
-import android.graphics.PointF;
-import android.view.View;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.common.MapBuilder;
-import org.maplibre.geojson.Feature;
-import org.maplibre.android.geometry.LatLng;
-import org.maplibre.android.log.Logger;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.Style;
-import org.maplibre.android.style.sources.Source;
-import org.maplibre.reactnative.components.AbstractMapFeature;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.components.layers.MLRNLayer;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public abstract class MLRNSource<T extends Source> extends AbstractMapFeature {
-    public static final String DEFAULT_ID = "composite";
-    public static final String LOG_TAG = "MLRNSource";
-
-    public static final double DEFAULT_HITBOX_WIDTH = 44.0;
-    public static final double DEFAULT_HITBOX_HEIGHT = 44.0;
-
-    protected MLRNMapView mMapView;
-    protected MapLibreMap mMap;
-
-    protected String mID;
-    protected T mSource;
-    protected boolean mHasPressListener;
-    protected Map<String, Double> mTouchHitbox;
-
-    protected List<MLRNLayer> mLayers;
-    private List<MLRNLayer> mQueuedLayers;
-
-    public MLRNSource(Context context) {
-        super(context);
-        mLayers = new ArrayList<>();
-        mQueuedLayers = new ArrayList<>();
-    }
-
-    public String getID() {
-        return mID;
-    }
-
-    public String[] getLayerIDs() {
-        List<String> layerIDs = new ArrayList<>();
-
-        for (int i = 0; i < mLayers.size(); i++) {
-            MLRNLayer layer = mLayers.get(i);
-            layerIDs.add(layer.getID());
-        }
-
-        return layerIDs.toArray(new String[layerIDs.size()]);
-    }
-
-    public boolean hasPressListener() {
-        return mHasPressListener;
-    }
-
-    public void setHasPressListener (boolean hasPressListener) {
-        mHasPressListener = hasPressListener;
-    }
-
-    public void setHitbox(ReadableMap map) {
-        Map<String, Double> hitbox = new HashMap<>();
-        hitbox.put("width", map.getDouble("width"));
-        hitbox.put("height", map.getDouble("height"));
-        mTouchHitbox = hitbox;
-    }
-
-    public void setID(String id) {
-        mID = id;
-    }
-
-    public void setSource(T source) {
-        mSource = source;
-    }
-
-    public Map<String, Double> getTouchHitbox() {
-        if (!hasPressListener()) {
-            return null;
-        }
-
-        if (mTouchHitbox == null) {
-            return MapBuilder.<String, Double>builder()
-                    .put("width", DEFAULT_HITBOX_WIDTH)
-                    .put("height", DEFAULT_HITBOX_HEIGHT)
-                    .build();
-        }
-
-        return mTouchHitbox;
-    }
-
-    public int getLayerCount () {
-        int totalCount = 0;
-
-        if (mQueuedLayers != null) {
-            totalCount = mQueuedLayers.size();
-        }
-
-        totalCount += mLayers.size();
-        return totalCount;
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        mMapView = mapView;
-        mMap = mapView.getMapLibreMap();
-        mMap.getStyle(new Style.OnStyleLoaded() {
-            public void onStyleLoaded(@NonNull Style style) {
-                T existingSource = style.getSourceAs(mID);
-                if (existingSource != null) {
-                    mSource = existingSource;
-                } else {
-                    mSource = makeSource();
-                    style.addSource(mSource);
-                }
-
-                if (mQueuedLayers != null && mQueuedLayers.size() > 0) { // first load
-                    for (int i = 0; i < mQueuedLayers.size(); i++) {
-                        addLayerToMap(mQueuedLayers.get(i), i);
-                    }
-                    mQueuedLayers = null;
-                } else if (mLayers.size() > 0) { // handles the case of switching style url, but keeping layers on map
-                    for (int i = 0; i < mLayers.size(); i++) {
-                        addLayerToMap(mLayers.get(i), i);
-                    }
-                }
-            }
-        });
-
-
-    }
-
-    @Override
-    public void removeFromMap(MLRNMapView mapView) {
-        if (mLayers.size() > 0) {
-            for (int i = 0; i < mLayers.size(); i++) {
-                MLRNLayer layer = mLayers.get(i);
-                layer.removeFromMap(mMapView);
-            }
-        }
-        if (mQueuedLayers != null) {
-            mQueuedLayers.clear();
-        }
-        if (mMap != null && mSource != null  && mMap.getStyle() != null) {
-            try {
-                mMap.getStyle().removeSource(mSource);
-            } catch (Throwable ex) {
-                Logger.w(LOG_TAG, String.format("MLRNSource.removeFromMap: %s - %s", mSource, ex.getMessage()), ex);
-            }
-        }
-    }
-
-    public void addLayer(View childView, int childPosition) {
-        if (!(childView instanceof MLRNLayer)) {
-            return;
-        }
-
-        MLRNLayer layer = (MLRNLayer) childView;
-        if (mMap == null) {
-            mQueuedLayers.add(childPosition, layer);
-        } else {
-            addLayerToMap(layer, childPosition);
-        }
-    }
-
-    public void removeLayer(int childPosition) {
-        MLRNLayer layer;
-        if (mQueuedLayers != null && mQueuedLayers.size() > 0) {
-            layer = mQueuedLayers.get(childPosition);
-        } else {
-            layer = mLayers.get(childPosition);
-        }
-        removeLayerFromMap(layer, childPosition);
-    }
-
-    public MLRNLayer getLayerAt(int childPosition) {
-        if (mQueuedLayers != null && mQueuedLayers.size() > 0) {
-            return mQueuedLayers.get(childPosition);
-        }
-        return mLayers.get(childPosition);
-    }
-
-    protected void addLayerToMap(MLRNLayer layer, int childPosition) {
-        if (mMapView == null || layer == null) {
-            return;
-        }
-
-        layer.addToMap(mMapView);
-        if (!mLayers.contains(layer)) {
-            mLayers.add(childPosition, layer);
-        }
-    }
-
-    protected void removeLayerFromMap(MLRNLayer layer, int childPosition) {
-        if (mMapView != null && layer != null) {
-            layer.removeFromMap(mMapView);
-        }
-        if (mQueuedLayers != null && mQueuedLayers.size() > 0) {
-            mQueuedLayers.remove(childPosition);
-        } else {
-            mLayers.remove(childPosition);
-        }
-    }
-
-    public Style getStyle() {
-        if (mMap == null) return null;
-        return mMap.getStyle();
-    }
-
-    public abstract T makeSource();
-
-    static public class OnPressEvent {
-        public List<Feature> features;
-        public LatLng latLng;
-        public PointF screenPoint;
-
-        public OnPressEvent(@NonNull List<Feature> features, @NonNull LatLng latLng, @NonNull PointF screenPoint) {
-            this.features = features;
-            this.latLng = latLng;
-            this.screenPoint = screenPoint;
-        }
-    }
-
-    public abstract void onPress(OnPressEvent event);
-
-    public static boolean isDefaultSource(String sourceID) {
-        return DEFAULT_ID.equals(sourceID);
-    }
-}