@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.5

package/android/src/main/java-mapboxgl/maplibre/com/mapbox/rctmgl/impl/InstanceManagerImpl.java

@@ -1,42 +0,0 @@
-package com.mapbox.rctmgl.impl;
-
-import android.content.Context;
-
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.WellKnownTileServer;
-import com.mapbox.mapboxsdk.log.Logger;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class InstanceManagerImpl {
-  public static void getInstance(Context context, String accessToken) {
-    if (wellKnownTileServer == null) {
-      Logger.w("InstanceManagerImpl", "setAccessToken requires setWellKnownTileServer for MapLibre, see setWellKnownTileServer docs for implications");
-      wellKnownTileServer = WellKnownTileServer.MapLibre.name();
-    }
-    Mapbox.getInstance(context, accessToken,  WellKnownTileServer.valueOf(wellKnownTileServer) );
-  }
-
-  public static Map<String,String> getTileServers() {
-    HashMap<String, String> result = new HashMap();
-    result.put("Mapbox", WellKnownTileServer.Mapbox.name());
-    result.put("MapLibre", WellKnownTileServer.MapLibre.name());
-    result.put("MapTiler", WellKnownTileServer.MapTiler.name());
-    return result;
-  }
-
-  static String wellKnownTileServer = null;
-
-  public static void setWellKnownTileServer(String wellKnownTileServer) {
-    InstanceManagerImpl.wellKnownTileServer = wellKnownTileServer;
-  }
-
-  public static String getAccessToken() {
-    return Mapbox.getApiKey();
-  }
-
-  public static String getLibraryName() {
-    return "maplibre";
-  }
-}

package/android/src/main/java-mapboxgl/maplibre/com/mapbox/rctmgl/impl/LocationEngineCallbackImpl.java

@@ -1,12 +0,0 @@
-package com.mapbox.rctmgl.impl;
-
-import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
-
-public abstract class LocationEngineCallbackImpl implements LocationEngineCallback<LocationEngineResult> {
-  public void onSuccess(LocationEngineResult result) {
-    onSuccess(new LocationEngineResultImpl(result));
-  }
-
-  abstract public void onSuccess(LocationEngineResultImpl result);
-}

package/android/src/main/java-mapboxgl/maplibre/com/mapbox/rctmgl/impl/LocationEngineResultImpl.java

@@ -1,18 +0,0 @@
-package com.mapbox.rctmgl.impl;
-
-import android.location.Location;
-
-import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
-
-public class LocationEngineResultImpl {
-  LocationEngineResult impl;
-
-  LocationEngineResultImpl(LocationEngineResult impl) {
-    this.impl = impl;
-  }
-
-  public Location getLastLocation() {
-    return impl.getLastLocation();
-  }
-}

package/android/src/main/java-mapboxgl/maplibre/com/mapbox/rctmgl/impl/LocationManagerImpl.java

@@ -1,64 +0,0 @@
-package com.mapbox.rctmgl.impl;
-
-import android.content.Context;
-
-import android.os.Looper;
-
-import com.mapbox.mapboxsdk.location.engine.LocationEngine;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineProvider;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
-import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest;
-import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
-
-public class LocationManagerImpl {
-  LocationEngine locationEngine;
-  LocationEngineRequest locationEngineRequest;
-
-  LocationManagerImpl(LocationEngine locationEngine, LocationEngineRequest locationEngineRequest) {
-    this.locationEngine = locationEngine;
-    this.locationEngineRequest = locationEngineRequest;
-  }
-
-  public static LocationManagerImpl buildEngineRequest(Context context, long default_interval, long fastest_interval, float minDisplacement) {
-    return new LocationManagerImpl(
-      LocationEngineProvider.getBestLocationEngine(context),
-      new LocationEngineRequest.Builder(default_interval)
-                .setFastestInterval(fastest_interval)
-                .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
-                .setDisplacement(minDisplacement)
-                .build()
-    );
-  }
-
-  public void removeExistingListeners(LocationEngineCallbackImpl callback) {
-    locationEngine.removeLocationUpdates(callback);
-  }
-
-  public void addNewListeners(LocationEngineCallbackImpl callback) {
-    locationEngine.requestLocationUpdates(
-            locationEngineRequest,
-            callback,
-            Looper.getMainLooper()
-    );
-  }
-
-  public void dispose(LocationEngineCallbackImpl callback) {
-    if (locationEngine == null) {
-      return;
-    }
-    locationEngine.removeLocationUpdates(callback);
-  }
-
-  public boolean isActive() {
-    return (locationEngine != null);
-  }
-
-  public void getLastLocation(LocationEngineCallbackImpl callback) {
-    locationEngine.getLastLocation(callback); 
-  }
-
-  public LocationEngine getEngine() {
-    return locationEngine;
-  }
-}

package/android/src/main/java-mapboxgl/maplibre/com/mapbox/rctmgl/impl/PermissionsManagerImpl.java

@@ -1,10 +0,0 @@
-package com.mapbox.rctmgl.impl;
-
-import android.content.Context;
-import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
-
-public class PermissionsManagerImpl {
-  public static boolean areLocationPermissionsGranted(Context context) {
-    return PermissionsManager.areLocationPermissionsGranted(context);
-  }
-}

package/android/src/main/java-mapboxgl/maplibre/com/mapbox/rctmgl/impl/SymbolClickListenerImpl.java

@@ -1,18 +0,0 @@
-package com.mapbox.rctmgl.impl;
-
-import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolClickListener;
-import com.mapbox.mapboxsdk.plugins.annotation.Symbol;
-
-
-public class SymbolClickListenerImpl {
-  public static interface Listener {
-    public boolean onAnnotationClick(Symbol symbol);
-  }
-
-  public static OnSymbolClickListener annotationClickListener(Listener listener) {
-    return new OnSymbolClickListener() {
-      @Override
-      public boolean onAnnotationClick(Symbol symbol) { return listener.onAnnotationClick(symbol); }
-    };
-  }
-}

package/android/src/main/java-mapboxgl/maplibre/com/mapbox/rctmgl/impl/TelemetryImpl.java

@@ -1,7 +0,0 @@
-package com.mapbox.rctmgl.impl;
-
-public class TelemetryImpl {
-  public static void setUserTelemetryRequestState(final boolean enabled) {
-    // No-op in maplibre
-  }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/RCTMGLPackage.java

@@ -1,215 +0,0 @@
-package com.mapbox.rctmgl;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.mapbox.rctmgl.components.camera.RCTMGLCameraManager;
-
-import com.mapbox.rctmgl.components.annotation.RCTMGLCalloutManager;
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotationManager;
-import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerViewManager;
-import com.mapbox.rctmgl.components.images.RCTMGLImageManager;
-import com.mapbox.rctmgl.components.images.RCTMGLImagesManager;
-import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocationManager;
-import com.mapbox.rctmgl.components.mapview.NativeMapViewModule;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapViewManager;
-import com.mapbox.rctmgl.components.mapview.RCTMGLAndroidTextureMapViewManager;
-import com.mapbox.rctmgl.components.styles.atmosphere.RCTMGLAtmosphereManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLBackgroundLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLCircleLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLFillExtrusionLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLFillLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLHeatmapLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLLineLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLRasterLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLSkyLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLSymbolLayerManager;
-
-import com.mapbox.rctmgl.components.styles.light.RCTMGLLightManager;
-import com.mapbox.rctmgl.components.styles.terrain.RCTMGLTerrainManager;
-
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLImageSourceManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLRasterSourceManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLRasterDemSourceManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLShapeSourceManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLVectorSourceManager;
-
-import com.mapbox.rctmgl.modules.RCTMGLLogging;
-
-import com.mapbox.rctmgl.modules.RCTMGLOfflineModule;
-import com.mapbox.rctmgl.modules.RCTMGLSnapshotModule;
-import com.mapbox.rctmgl.modules.RCTMGLLocationModule;
-
-import com.mapbox.rctmgl.modules.RCTMGLModule;
-
-
-public class RCTMGLPackage extends TurboReactPackage {
-
-    @Nullable
-    @Override
-    public NativeModule getModule(String s, ReactApplicationContext reactApplicationContext) {
-        switch (s) {
-            case RCTMGLModule.REACT_CLASS:
-                return new RCTMGLModule(reactApplicationContext);
-            case RCTMGLLocationModule.REACT_CLASS:
-                return new RCTMGLLocationModule(reactApplicationContext);
-            case RCTMGLOfflineModule.REACT_CLASS:
-                return new RCTMGLOfflineModule(reactApplicationContext);
-            case RCTMGLSnapshotModule.REACT_CLASS:
-                return new RCTMGLSnapshotModule(reactApplicationContext);
-            case RCTMGLLogging.REACT_CLASS:
-                return new RCTMGLLogging(reactApplicationContext);
-            case NativeMapViewModule.NAME:
-                return new NativeMapViewModule(reactApplicationContext);
-        }
-
-        return null;
-    }
-
-    @Deprecated
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
-        List<ViewManager> managers = new ArrayList<>();
-
-        // components
-        managers.add(new RCTMGLCameraManager(reactApplicationContext));
-        managers.add(new RCTMGLAndroidTextureMapViewManager(reactApplicationContext));
-        managers.add(new RCTMGLMapViewManager(reactApplicationContext));
-
-        // annotations
-        managers.add(new RCTMGLMarkerViewManager(reactApplicationContext));
-        managers.add(new RCTMGLPointAnnotationManager(reactApplicationContext));
-        managers.add(new RCTMGLCalloutManager());
-
-        managers.add(new RCTMGLNativeUserLocationManager());
-
-        // sources
-        managers.add(new RCTMGLVectorSourceManager(reactApplicationContext));
-        managers.add(new RCTMGLShapeSourceManager(reactApplicationContext));
-        managers.add(new RCTMGLRasterDemSourceManager(reactApplicationContext));
-        managers.add(new RCTMGLRasterSourceManager(reactApplicationContext));
-        managers.add(new RCTMGLImageSourceManager());
-
-        // images
-        managers.add(new RCTMGLImagesManager(reactApplicationContext));
-        managers.add(new RCTMGLImageManager(reactApplicationContext));
-
-        // layers
-        managers.add(new RCTMGLFillLayerManager());
-        managers.add(new RCTMGLFillExtrusionLayerManager());
-        managers.add(new RCTMGLHeatmapLayerManager());
- 
-        managers.add(new RCTMGLLineLayerManager());
-        managers.add(new RCTMGLCircleLayerManager());
-        managers.add(new RCTMGLSymbolLayerManager());   
-        managers.add(new RCTMGLRasterLayerManager());
-        managers.add(new RCTMGLSkyLayerManager());
-        managers.add(new RCTMGLTerrainManager());
-        managers.add(new RCTMGLAtmosphereManager());
-        managers.add(new RCTMGLBackgroundLayerManager());
-
-        managers.add(new RCTMGLLightManager());
-
-        return managers;
-    }
-
-    @Override
-    public ReactModuleInfoProvider getReactModuleInfoProvider() {
-        return () -> {
-            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
-            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-
-            moduleInfos.put(
-                    RCTMGLModule.REACT_CLASS,
-                    new ReactModuleInfo(
-                            RCTMGLModule.REACT_CLASS,
-                            RCTMGLModule.REACT_CLASS,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            true, // hasConstants
-                            false, // isCxxModule
-                            false // isTurboModule
-                    ));
-
-            moduleInfos.put(
-                    RCTMGLLocationModule.REACT_CLASS,
-                    new ReactModuleInfo(
-                            RCTMGLLocationModule.REACT_CLASS,
-                            RCTMGLLocationModule.REACT_CLASS,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            true, // hasConstants
-                            false, // isCxxModule
-                            false // isTurboModule
-                    ));
-
-            moduleInfos.put(
-                    RCTMGLOfflineModule.REACT_CLASS,
-                    new ReactModuleInfo(
-                            RCTMGLOfflineModule.REACT_CLASS,
-                            RCTMGLOfflineModule.REACT_CLASS,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            true, // hasConstants
-                            false, // isCxxModule
-                            false // isTurboModule
-                    ));
-
-            moduleInfos.put(
-                    RCTMGLSnapshotModule.REACT_CLASS,
-                    new ReactModuleInfo(
-                            RCTMGLSnapshotModule.REACT_CLASS,
-                            RCTMGLSnapshotModule.REACT_CLASS,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            true, // hasConstants
-                            false, // isCxxModule
-                            false // isTurboModule
-                    ));
-
-            moduleInfos.put(
-                    RCTMGLLogging.REACT_CLASS,
-                    new ReactModuleInfo(
-                            RCTMGLLogging.REACT_CLASS,
-                            RCTMGLLogging.REACT_CLASS,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            true, // hasConstants
-                            false, // isCxxModule
-                            false // isTurboModule
-                    ));
-
-            moduleInfos.put(
-                    NativeMapViewModule.NAME,
-                    new ReactModuleInfo(
-                            NativeMapViewModule.NAME,
-                            NativeMapViewModule.NAME,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            false, // hasConstants
-                            false, // isCxxModule
-                            isTurboModule // isTurboModule
-                    ));
-
-            return moduleInfos;
-        };
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/AbstractEvent.java

@@ -1,35 +0,0 @@
-package com.mapbox.rctmgl.components;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-import javax.annotation.Nullable;
-
-public class AbstractEvent extends Event<AbstractEvent> {
-    private String mEventName;
-    private final boolean mCanCoalesce;
-    private WritableMap mEvent;
-
-    public AbstractEvent(int viewId, String eventName, boolean canCoalesce, @Nullable WritableMap event) {
-        super(viewId);
-        mEventName = eventName;
-        mCanCoalesce = canCoalesce;
-        mEvent = event;
-    }
-
-    @Override
-    public String getEventName() {
-        return mEventName;
-    }
-
-    @Override
-    public void dispatch(RCTEventEmitter rctEventEmitter) {
-        rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEvent);
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return mCanCoalesce;
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLCallout.kt

@@ -1,6 +0,0 @@
-package com.mapbox.rctmgl.components.annotation
-
-import android.content.Context
-import com.facebook.react.views.view.ReactViewGroup
-
-class RCTMGLCallout(context: Context?) : ReactViewGroup(context)

package/android/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLCalloutManager.java

@@ -1,18 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-
-public class RCTMGLCalloutManager extends ViewGroupManager<RCTMGLCallout> {
-    public static final String REACT_CLASS = "RCTMGLCallout";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected RCTMGLCallout createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLCallout(reactContext);
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImageManager.kt

@@ -1,67 +0,0 @@
-package com.mapbox.rctmgl.components.images
-
-import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.DynamicFromArray
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.common.MapBuilder
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.components.AbstractEventEmitter
-import com.mapbox.rctmgl.events.constants.EventKeys
-
-class RCTMGLImageManager(private val mContext: ReactApplicationContext) : AbstractEventEmitter<RCTMGLImage>(
-mContext
-) {
-    override fun getName(): String {
-        return "RCTMGLImage"
-    }
-
-    override fun createViewInstance(p0: ThemedReactContext): RCTMGLImage {
-        return RCTMGLImage(mContext, this)
-    }
-
-    override fun customEvents(): MutableMap<String, String>? {
-        return mutableMapOf();
-    }
-
-    // region React properties
-    @ReactProp(name="name")
-    fun setName(image: RCTMGLImage, value: String) {
-        image.name = value
-    }
-
-    @ReactProp(name="sdf")
-    fun setSdf(image: RCTMGLImage, value: Boolean) {
-        image.sdf = value
-    }
-
-    @ReactProp(name="stretchX")
-    fun setStretchX(image: RCTMGLImage, value: Dynamic) {
-        image.stretchX = RCTMGLImagesManager.convertStretch(value) ?: listOf()
-    }
-
-    @ReactProp(name="stretchY")
-    fun setStretchY(image: RCTMGLImage, value: Dynamic) {
-        image.stretchY = RCTMGLImagesManager.convertStretch(value) ?: listOf()
-    }
-
-    @ReactProp(name="content")
-    fun setContent(image: RCTMGLImage, value: Dynamic) {
-        image.content = RCTMGLImagesManager.convertContent(value)
-    }
-
-    @ReactProp(name="scale")
-    fun setScale(image: RCTMGLImage, value: Double) {
-        image.scale = value
-    }
-    // endregion
-
-    // region React methods
-    override fun receiveCommand(root: RCTMGLImage, commandId: String?, args: ReadableArray?) {
-        if (commandId == "refresh") {
-            root.refresh()
-        }
-    }
-    // endregion
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLAndroidTextureMapViewManager.kt

@@ -1,37 +0,0 @@
-package com.mapbox.rctmgl.components.mapview
-
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.viewmanagers.MBXAndroidTextureMapViewManagerDelegate
-import com.facebook.react.viewmanagers.MBXAndroidTextureMapViewManagerInterface
-import com.facebook.react.viewmanagers.MBXMapViewManagerDelegate
-import com.mapbox.maps.MapInitOptions
-
-class RCTMGLAndroidTextureMapViewManager(context: ReactApplicationContext) : RCTMGLMapViewManager(
-    context
-), MBXAndroidTextureMapViewManagerInterface<RCTMGLMapView> {
-    private val mDelegate: ViewManagerDelegate<RCTMGLMapView>
-
-    init {
-        mDelegate = MBXAndroidTextureMapViewManagerDelegate<RCTMGLMapView, RCTMGLAndroidTextureMapViewManager>(this)
-    }
-
-    override fun getDelegate(): ViewManagerDelegate<RCTMGLMapView>? {
-        return mDelegate
-    }
-
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    override fun createViewInstance(themedReactContext: ThemedReactContext): RCTMGLMapView {
-        val context = getMapViewContext(themedReactContext)
-        val options = MapInitOptions(context = context, textureView= true)
-        return RCTMGLMapView(context, this, options)
-    }
-
-    companion object {
-        const val REACT_CLASS = "MBXAndroidTextureMapView"
-    }
-}