@rnmapbox/maps 10.0.0-beta.75 → 10.0.0-beta.77

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLTileSourceManager.java

@@ -1,80 +0,0 @@
-package com.mapbox.rctmgl.components.styles.sources;
-
-import android.view.View;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.mapbox.rctmgl.components.AbstractEventEmitter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class RCTMGLTileSourceManager<T extends RCTMGLTileSource> extends AbstractEventEmitter<T> {
-
-    RCTMGLTileSourceManager(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-    }
-
-    @Override
-    public View getChildAt(T source, int childPosition) {
-        return source.getLayerAt(childPosition);
-    }
-
-    @Override
-    public int getChildCount(T source) {
-        return source.getLayerCount();
-    }
-
-    @Override
-    public void addView(T source, View childView, int childPosition) {
-        source.addLayer(childView, childPosition);
-    }
-
-    @Override
-    public void removeViewAt(T source, int childPosition) {
-        source.removeLayer(childPosition);
-    }
-
-    @ReactProp(name="id")
-    public void setID(T source, String id) {
-        source.setID(id);
-    }
-
-    @ReactProp(name="url")
-    public void setURL(T source, String url) {
-        source.setURL(url);
-    }
-
-    @ReactProp(name="tileUrlTemplates")
-    public void setTileUrlTemplates(T source, ReadableArray tileUrlTemplates) {
-        List<String> urls = new ArrayList<>();
-        for (int i = 0; i < tileUrlTemplates.size(); i++) {
-            if (tileUrlTemplates.getType(0) == ReadableType.String) {
-                urls.add(tileUrlTemplates.getString(i));
-            }
-        }
-        source.setTileUrlTemplates(urls);
-    }
-
-    @ReactProp(name="attribution")
-    public void setAttribution(T source, String attribution) {
-        source.setAttribution(attribution);
-    }
-
-    @ReactProp(name="minZoomLevel")
-    public void setMinZoomLevel(T source, int minZoomLevel) {
-        source.setMinZoomLevel(minZoomLevel);
-    }
-
-    @ReactProp(name="maxZoomLevel")
-    public void setMaxZoomLevel(T source, int maxZoomLevel) {
-        source.setMaxZoomLevel(maxZoomLevel);
-    }
-
-    @ReactProp(name="tms")
-    public void setTMS(T source, boolean tms) {
-        source.setTMS(tms);
-    }
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLVectorSource.java

@@ -1,100 +0,0 @@
-package com.mapbox.rctmgl.components.styles.sources;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Size;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.bindgen.Expected;
-import com.mapbox.geojson.Feature;
-import com.mapbox.geojson.FeatureCollection;
-
-import com.mapbox.maps.QueriedFeature;
-import com.mapbox.maps.QueryFeaturesCallback;
-import com.mapbox.maps.SourceQueryOptions;
-import com.mapbox.maps.Style;
-import com.mapbox.maps.StyleManagerInterface;
-import com.mapbox.maps.StyleObjectInfo;
-import com.mapbox.maps.extension.style.expressions.generated.Expression;
-import com.mapbox.maps.extension.style.sources.Source;
-import com.mapbox.maps.extension.style.sources.generated.VectorSource;
-import com.mapbox.maps.extension.style.sources.SourceUtils;
-
-import com.mapbox.maps.plugin.delegates.MapFeatureQueryDelegate;
-import com.mapbox.rctmgl.events.AndroidCallbackEvent;
-import com.mapbox.rctmgl.events.FeatureClickEvent;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-public class RCTMGLVectorSource extends RCTMGLTileSource<VectorSource> {
-    private RCTMGLVectorSourceManager mManager;
-
-    public RCTMGLVectorSource(Context context, RCTMGLVectorSourceManager manager) {
-        super(context);
-        mManager = manager;
-    }
-
-    public void onPress(OnPressEvent event) {
-        mManager.handleEvent(FeatureClickEvent.makeVectorSourceEvent(this, event));
-    }
-
-    @Override
-    public VectorSource makeSource() {
-        if (isDefaultSource(getID())) {
-            return (VectorSource)SourceUtils.getSource(mMap.getStyle(), DEFAULT_ID);
-        }
-
-        String configurationUrl = getURL();
-        if (configurationUrl != null) {
-            return new VectorSource(
-                    new VectorSource.Builder(getID())
-                            .url(getURL())
-            );
-        }
-        return new VectorSource(
-                new VectorSource.Builder(getID())
-                        .tileSet(buildTileset())
-        );
-    }
-
-    public void querySourceFeatures(String callbackID,
-                                             @Size(min = 1) List<String> layerIDs,
-                                             @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;
-        }
-
-        mMap.querySourceFeatures(
-                getID(),
-                new SourceQueryOptions(layerIDs, filter),
-
-                new QueryFeaturesCallback() {
-                    @Override
-                    public void run(@NonNull Expected<String, List<QueriedFeature>> queriedFeatures) {
-                        WritableMap payload = new WritableNativeMap();
-                        if (queriedFeatures.isError()) {
-                            //V10todo
-                            payload.putString("error", queriedFeatures.getError());
-                        } else {
-                            List<Feature> features = new LinkedList<>();
-                            for (QueriedFeature feature: queriedFeatures.getValue()) {
-                                features.add(feature.getFeature());
-                            }
-                            payload.putString("data", FeatureCollection.fromFeatures(features).toJson());
-                        }
-                        AndroidCallbackEvent event = new AndroidCallbackEvent(RCTMGLVectorSource.this, callbackID, payload);
-                        mManager.handleEvent(event);
-                    }
-                }
-        );
-    }
-}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLVectorSourceManager.java

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