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

package/android/src/main/java/org/maplibre/reactnative/components/styles/layers/MLRNSymbolLayer.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.SymbolLayer;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.components.styles.MLRNStyle;
-import org.maplibre.reactnative.components.styles.MLRNStyleFactory;
-
-public class MLRNSymbolLayer extends MLRNLayer<SymbolLayer> {
-    private String mSourceLayerID;
-
-    public MLRNSymbolLayer(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected void updateFilter(Expression expression) {
-        mLayer.setFilter(expression);
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        super.addToMap(mapView);
-    }
-
-    @Override
-    public SymbolLayer makeLayer() {
-        SymbolLayer layer = new SymbolLayer(mID, mSourceID);
-
-        if (mSourceLayerID != null) {
-            layer.setSourceLayer(mSourceLayerID);
-        }
-
-        return layer;
-    }
-
-    @Override
-    public void addStyles() {
-        MLRNStyleFactory.setSymbolLayerStyle(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/MLRNSymbolLayerManager.java

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

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

@@ -1,61 +0,0 @@
-package org.maplibre.reactnative.components.styles.light;
-
-import android.content.Context;
-
-import com.facebook.react.bridge.ReadableMap;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.Style;
-import org.maplibre.android.style.layers.TransitionOptions;
-import org.maplibre.android.style.light.Light;
-import org.maplibre.android.style.light.Position;
-import org.maplibre.reactnative.components.AbstractMapFeature;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.components.styles.MLRNStyle;
-import org.maplibre.reactnative.components.styles.MLRNStyleFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class MLRNLight extends AbstractMapFeature {
-    private MapLibreMap mMap;
-    private ReadableMap mReactStyle;
-
-    public MLRNLight(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        mMap = mapView.getMapboxMap();
-        setLight();
-    }
-
-    @Override
-    public void removeFromMap(MLRNMapView mapView) {
-        // ignore there's nothing to remove just update the light style
-    }
-
-    public void setReactStyle(ReadableMap reactStyle) {
-        mReactStyle = reactStyle;
-
-        setLight();
-    }
-
-    private void setLight(Light light) {
-        MLRNStyleFactory.setLightLayerStyle(light, new MLRNStyle(getContext(), mReactStyle, mMap));
-    }
-
-    private void setLight() {
-        Style style = getStyle();
-        if (style != null) {
-            setLight(style.getLight());
-        }
-    }
-
-    private Style getStyle() {
-        if (mMap == null) {
-            return null;
-        }
-        return mMap.getStyle();
-    }
-}

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

@@ -1,25 +0,0 @@
-package org.maplibre.reactnative.components.styles.light;
-
-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 MLRNLightManager extends ViewGroupManager<MLRNLight> {
-    public static final String REACT_CLASS = "MLRNLight";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNLight createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNLight(reactContext);
-    }
-
-    @ReactProp(name="reactStyle")
-    public void setReactStyle(MLRNLight light, ReadableMap reactStyle) {
-        light.setReactStyle(reactStyle);
-    }
-}

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

@@ -1,77 +0,0 @@
-package org.maplibre.reactnative.components.styles.sources;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
-import org.maplibre.geojson.Feature;
-import org.maplibre.android.geometry.LatLngQuad;
-import org.maplibre.android.style.sources.ImageSource;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import android.net.Uri;
-
-public class MLRNImageSource extends MLRNSource<ImageSource> {
-    public static final String LOG_TAG = "MLRNImageSource";
-
-    private URL mURL;
-    private int mResourceId;
-    private LatLngQuad mCoordQuad;
-
-    public MLRNImageSource(Context context) {
-        super(context);
-    }
-
-    @Override
-    public ImageSource makeSource() {
-        if (this.mURL == null) {
-            return new ImageSource(mID, mCoordQuad, this.mResourceId);
-        }
-        return new ImageSource(mID, mCoordQuad, mURL);
-    }
-
-    @Override
-    public void onPress(OnPressEvent feature) {
-        // ignore, we cannot query raster layers
-    }
-
-    public void setURL(String url) {
-        try {
-            Uri uri = Uri.parse(url);
-
-            if (uri.getScheme() == null) {
-                this.mResourceId = ResourceDrawableIdHelper.getInstance().getResourceDrawableId(this.getContext(), url);
-
-                if (mSource != null) {
-                    mSource.setImage(this.mResourceId);
-                }
-
-            } else {
-
-                mURL = new URL(url);
-
-                if (mSource != null) {
-                    mSource.setUri(mURL.toURI());
-                }
-            }
-
-        } catch (Exception e) {
-            Log.w(LOG_TAG, e.getLocalizedMessage());
-        }
-    }
-
-
-    public void setCoordinates(LatLngQuad coordQuad) {
-        mCoordQuad = coordQuad;
-        try {
-            if (mSource != null) {
-                mSource.setCoordinates(this.mCoordQuad);
-            }
-        } catch (Exception e) {
-            Log.w(LOG_TAG, e.getLocalizedMessage());
-        }
-    }
-}

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

@@ -1,68 +0,0 @@
-package org.maplibre.reactnative.components.styles.sources;
-
-import android.content.Context;
-import android.view.View;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.imagehelper.ImageSource;
-import org.maplibre.android.geometry.LatLngQuad;
-import org.maplibre.reactnative.utils.ConvertUtils;
-import org.maplibre.reactnative.utils.GeoJSONUtils;
-
-public class MLRNImageSourceManager extends ViewGroupManager<MLRNImageSource> {
-    public static final String REACT_CLASS = "MLRNImageSource";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNImageSource createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNImageSource(reactContext);
-    }
-
-    @Override
-    public View getChildAt(MLRNImageSource source, int childPosition) {
-        return source.getLayerAt(childPosition);
-    }
-
-    @Override
-    public int getChildCount(MLRNImageSource source) {
-        return source.getLayerCount();
-    }
-
-    @Override
-    public void addView(MLRNImageSource source, View childView, int childPosition) {
-        source.addLayer(childView, childPosition);
-    }
-
-    @Override
-    public void removeViewAt(MLRNImageSource source, int childPosition) {
-        source.removeLayer(childPosition);
-    }
-
-    @ReactProp(name = "id")
-    public void setId(MLRNImageSource source, String id) {
-        source.setID(id);
-    }
-
-    @ReactProp(name = "url")
-    public void setUrl(MLRNImageSource source, String url) {
-        source.setURL(url);
-    }
-
-    @ReactProp(name = "coordinates")
-    public void setCoordinates(MLRNImageSource source, ReadableArray arr) {
-        LatLngQuad quad = GeoJSONUtils.toLatLngQuad(arr);
-
-        if (quad == null) {
-            return;
-        }
-
-        source.setCoordinates(quad);
-    }
-}

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

@@ -1,41 +0,0 @@
-package org.maplibre.reactnative.components.styles.sources;
-
-import android.content.Context;
-
-import org.maplibre.geojson.Feature;
-import org.maplibre.android.style.sources.RasterSource;
-
-import static org.maplibre.android.style.sources.RasterSource.DEFAULT_TILE_SIZE;
-
-public class MLRNRasterSource extends MLRNTileSource<RasterSource> {
-    private Integer mTileSize;
-
-    public MLRNRasterSource(Context context) {
-        super(context);
-    }
-
-    @Override
-    public RasterSource makeSource() {
-        String configurationUrl = getURL();
-        int tileSize = mTileSize == null ? DEFAULT_TILE_SIZE : mTileSize;
-        if (configurationUrl != null) {
-            return new RasterSource(mID, configurationUrl, tileSize);
-        }
-        return new RasterSource(mID, buildTileset(), tileSize);
-    }
-
-
-    public void setTileSize(int tileSize) {
-        mTileSize = tileSize;
-    }
-
-    @Override
-    public boolean hasPressListener() {
-        return false;
-    }
-
-    @Override
-    public void onPress(OnPressEvent feature) {
-        // ignore, cannot query raster layers
-    }
-}

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

@@ -1,39 +0,0 @@
-package org.maplibre.reactnative.components.styles.sources;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-public class MLRNRasterSourceManager extends MLRNTileSourceManager<MLRNRasterSource> {
-    public static final String REACT_CLASS = "MLRNRasterSource";
-
-    public MLRNRasterSourceManager(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-    }
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Nonnull
-    @Override
-    protected MLRNRasterSource createViewInstance(@Nonnull ThemedReactContext reactContext) {
-        return new MLRNRasterSource(reactContext);
-    }
-
-    @ReactProp(name="tileSize")
-    public void setTileSize(MLRNRasterSource source, int tileSize) {
-        source.setTileSize(tileSize);
-    }
-
-    @Override
-    public Map<String, String> customEvents() {
-        return null;
-    }
-}

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

@@ -1,246 +0,0 @@
-package org.maplibre.reactnative.components.styles.sources;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Size;
-import androidx.core.content.res.ResourcesCompat;
-
-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.android.utils.BitmapUtils;
-import org.maplibre.reactnative.R;
-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.DownloadMapImageTask;
-import org.maplibre.reactnative.utils.ImageEntry;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-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 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.getMapboxMap().getStyle(new Style.OnStyleLoaded() {
-            @Override
-            public void onStyleLoaded(@NonNull Style style) {
-                MapLibreMap map = mapView.getMapboxMap();
-                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 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 (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);
-    }
-}