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

package/android/src/main/java/org/maplibre/reactnative/components/location/LocationComponentManager.java

@@ -1,165 +0,0 @@
-package org.maplibre.reactnative.components.location;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-
-import org.maplibre.android.location.LocationComponent;
-import org.maplibre.android.location.LocationComponentActivationOptions;
-import org.maplibre.android.location.LocationComponentOptions;
-import org.maplibre.android.location.OnCameraTrackingChangedListener;
-import org.maplibre.android.location.modes.CameraMode;
-import org.maplibre.android.location.modes.RenderMode;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.Style;
-import org.maplibre.reactnative.R;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.location.LocationManager;
-
-import androidx.annotation.NonNull;
-
-/**
- * The LocationComponent on android implements both location tracking and display of user's current location.
- * LocationComponentManager attempts to separate that, so that Camera can ask for location tracking independent of display of user current location.
- * And NativeUserLocation can ask for display of user's current location - independent of Camera's user tracking.
- */
-public class LocationComponentManager {
-    private MLRNMapView mMapView = null;
-    private MapLibreMap mMap = null;
-
-    private LocationManager mLocationManager = null;
-    private LocationComponent mLocationComponent = null;
-    private Context mContext = null;
-
-    private @RenderMode.Mode int mRenderMode = RenderMode.COMPASS;
-
-    public LocationComponentManager(MLRNMapView mlrnMapView, Context context) {
-        mMapView = mlrnMapView;
-        mMap = mMapView.getMapboxMap();
-        mContext = context;
-
-        mLocationManager = LocationManager.getInstance(context);
-    }
-
-    private boolean mShowUserLocation = false;
-
-    private boolean mFollowUserLocation = false;
-
-    private boolean mShowingUserLocation = false;
-
-    private OnCameraTrackingChangedListener mOnCameraTrackingChangedListener = null;
-
-    public void showUserLocation(boolean showUserLocation) {
-        mShowUserLocation = showUserLocation;
-        stateChanged();
-    }
-
-    public void setFollowUserLocation(boolean followUserLocation) {
-        mFollowUserLocation = followUserLocation;
-        stateChanged();
-    }
-
-    public void setCameraMode(@CameraMode.Mode int cameraMode) {
-        mLocationComponent.setCameraMode(cameraMode);
-    }
-
-    public void setRenderMode(@RenderMode.Mode int renderMode) {
-        mRenderMode = renderMode;
-        if (mShowingUserLocation) {
-            mLocationComponent.setRenderMode(renderMode);
-        }
-    }
-
-    public void setPreferredFramesPerSecond(int preferredFramesPerSecond) {
-        if (mLocationComponent == null || preferredFramesPerSecond <= 0) {
-            return;
-        }
-
-        mLocationComponent.setMaxAnimationFps(preferredFramesPerSecond);
-    }
-
-    public void addOnCameraTrackingChangedListener(OnCameraTrackingChangedListener onCameraTrackingChangedListener) {
-        if (mOnCameraTrackingChangedListener != null) {
-            mLocationComponent.removeOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
-        }
-
-        mOnCameraTrackingChangedListener = onCameraTrackingChangedListener;
-
-        mLocationComponent.addOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
-    }
-
-    @SuppressLint("MissingPermission")
-    private void stateChanged() {
-        mLocationComponent.setLocationComponentEnabled((mFollowUserLocation || mShowUserLocation));
-
-        if (mShowingUserLocation != mShowUserLocation) {
-            updateShowUserLocation(mShowUserLocation);
-        }
-
-        if (mFollowUserLocation) {
-            if (!mShowUserLocation) {
-                mLocationComponent.setRenderMode(RenderMode.GPS);
-            } else {
-                mLocationComponent.setRenderMode(mRenderMode);
-            }
-            mLocationComponent.onStart();
-        } else {
-            mLocationComponent.setCameraMode(CameraMode.NONE);
-        }
-    }
-
-    public boolean hasLocationComponent() {
-        return (mLocationComponent != null);
-    }
-
-    public void update(@NonNull Style style) {
-        update(mShowUserLocation, style);
-    }
-
-    public void update(boolean displayUserLocation, @NonNull Style style) {
-        Integer tintColor = mMapView.getTintColor();
-
-        if (mLocationComponent == null || tintColor != null) {
-            mLocationComponent = mMap.getLocationComponent();
-
-            LocationComponentActivationOptions locationComponentActivationOptions = LocationComponentActivationOptions
-                    .builder(mContext, style)
-                    .locationComponentOptions(options(displayUserLocation))
-                    .build();
-            mLocationComponent.activateLocationComponent(locationComponentActivationOptions);
-            mLocationComponent.setLocationEngine(mLocationManager.getEngine());
-            mShowingUserLocation = displayUserLocation;
-        }
-
-        updateShowUserLocation(displayUserLocation);
-    }
-
-    private void updateShowUserLocation(boolean displayUserLocation) {
-        if (mShowingUserLocation != displayUserLocation) {
-            mLocationComponent.applyStyle(options(displayUserLocation));
-            mShowingUserLocation = displayUserLocation;
-        }
-    }
-
-    LocationComponentOptions options(boolean displayUserLocation) {
-        LocationComponentOptions.Builder builder = LocationComponentOptions.builder(mContext);
-        Integer tintColor = mMapView.getTintColor();
-        if (!displayUserLocation) {
-            builder = builder
-                    .padding(mMap.getPadding())
-                    .backgroundDrawable(R.drawable.empty)
-                    .backgroundDrawableStale(R.drawable.empty)
-                    .bearingDrawable(R.drawable.empty)
-                    .foregroundDrawable(R.drawable.empty)
-                    .foregroundDrawableStale(R.drawable.empty)
-                    .gpsDrawable(R.drawable.empty)
-                    .accuracyAlpha(0.0f);
-        } else if (tintColor != null) {
-            builder = builder
-                    .enableStaleState(false)
-                    .bearingTintColor(tintColor)
-                    .foregroundTintColor(tintColor)
-                    .accuracyColor(tintColor);
-        }
-        return builder.build();
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/location/MLRNNativeUserLocation.java

@@ -1,76 +0,0 @@
-package org.maplibre.reactnative.components.location;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import androidx.annotation.NonNull;
-
-import org.maplibre.android.location.permissions.PermissionsManager;
-import org.maplibre.android.location.modes.RenderMode;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.OnMapReadyCallback;
-import org.maplibre.android.maps.Style;
-import org.maplibre.reactnative.components.AbstractMapFeature;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-
-public class MLRNNativeUserLocation extends AbstractMapFeature implements OnMapReadyCallback, Style.OnStyleLoaded {
-    private boolean mEnabled = true;
-    private MapLibreMap mMap;
-    private MLRNMapView mMapView;
-    private @RenderMode.Mode int mRenderMode = RenderMode.COMPASS;
-    private int mPreferredFramesPerSecond;
-
-    public MLRNNativeUserLocation(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        mEnabled = true;
-        mMapView = mapView;
-        mapView.getMapAsync(this);
-        setRenderMode(mRenderMode);
-        setPreferredFramesPerSecond(mPreferredFramesPerSecond);
-    }
-
-    @Override
-    public void removeFromMap(MLRNMapView mapView) {
-        mEnabled = false;
-        if (mMap != null) mMap.getStyle(this);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void onMapReady(@NonNull MapLibreMap mapboxMap) {
-        mMap = mapboxMap;
-        mapboxMap.getStyle(this);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void onStyleLoaded(@NonNull Style style) {
-        Context context = getContext();
-        if (!PermissionsManager.areLocationPermissionsGranted(context)) {
-            return;
-        }
-
-        LocationComponentManager locationComponent = mMapView.getLocationComponentManager();
-        locationComponent.update(style);
-        locationComponent.showUserLocation(mEnabled);
-    }
-
-    public void setRenderMode(@RenderMode.Mode int renderMode) {
-        mRenderMode = renderMode;
-        if (mMapView != null) {
-            LocationComponentManager locationComponent = mMapView.getLocationComponentManager();
-            locationComponent.setRenderMode(renderMode);
-        }
-    }
-
-    public void setPreferredFramesPerSecond(int framesPerSecond) {
-        mPreferredFramesPerSecond = framesPerSecond;
-        if (mMapView != null) {
-            LocationComponentManager locationComponent = mMapView.getLocationComponentManager();
-            locationComponent.setPreferredFramesPerSecond(framesPerSecond);
-        }
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/location/MLRNNativeUserLocationManager.java

@@ -1,40 +0,0 @@
-package org.maplibre.reactnative.components.location;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import org.maplibre.android.location.modes.RenderMode;
-
-import javax.annotation.Nonnull;
-
-public class MLRNNativeUserLocationManager extends ViewGroupManager<MLRNNativeUserLocation> {
-    public static final String REACT_CLASS = "MLRNNativeUserLocation";
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactProp(name="androidRenderMode")
-    public void setAndroidRenderMode(MLRNNativeUserLocation userLocation, String mode) {
-       if ("compass".equalsIgnoreCase(mode)) {
-           userLocation.setRenderMode(RenderMode.COMPASS);
-        } else if ("gps".equalsIgnoreCase(mode)) {
-           userLocation.setRenderMode(RenderMode.GPS);
-        } else {
-           userLocation.setRenderMode(RenderMode.NORMAL);
-       }
-    }
-
-    @ReactProp(name="androidPreferredFramesPerSecond")
-    public void setPreferredFramesPerSecond(MLRNNativeUserLocation userLocation, int preferredFramesPerSecond) {
-       userLocation.setPreferredFramesPerSecond(preferredFramesPerSecond);
-    }
-
-    @Nonnull
-    @Override
-    protected MLRNNativeUserLocation createViewInstance(@Nonnull ThemedReactContext reactContext) {
-        return new MLRNNativeUserLocation(reactContext);
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/mapview/LayerSourceInfo.java

@@ -1,59 +0,0 @@
-package org.maplibre.reactnative.components.mapview;
-
-import org.maplibre.android.style.layers.CircleLayer;
-import org.maplibre.android.style.layers.FillExtrusionLayer;
-import org.maplibre.android.style.layers.FillLayer;
-import org.maplibre.android.style.layers.HeatmapLayer;
-import org.maplibre.android.style.layers.HillshadeLayer;
-import org.maplibre.android.style.layers.Layer;
-import org.maplibre.android.style.layers.LineLayer;
-import org.maplibre.android.style.layers.RasterLayer;
-import org.maplibre.android.style.layers.SymbolLayer;
-
-import javax.annotation.Nullable;
-
-class LayerSourceInfo {
-    final String sourceId;
-
-    @Nullable
-    final String sourceLayerId;
-
-    LayerSourceInfo(Layer layer) {
-        if (layer instanceof CircleLayer) {
-            CircleLayer symbolLayer = (CircleLayer) layer;
-            sourceId = symbolLayer.getSourceId();
-            sourceLayerId = symbolLayer.getSourceLayer();
-        } else if (layer instanceof FillExtrusionLayer) {
-            FillExtrusionLayer fillExtrusionLayer = (FillExtrusionLayer)layer;
-            sourceId = fillExtrusionLayer.getSourceId();
-            sourceLayerId = fillExtrusionLayer.getSourceLayer();
-        } else if (layer instanceof FillLayer) {
-            FillLayer fillLayer = (FillLayer)layer;
-            sourceId = fillLayer.getSourceId();
-            sourceLayerId = fillLayer.getSourceLayer();
-        } else if (layer instanceof HeatmapLayer) {
-            HeatmapLayer heatmapLayer = (HeatmapLayer)layer;
-            sourceId = heatmapLayer.getSourceId();
-            sourceLayerId = heatmapLayer.getSourceLayer();
-        } else if (layer instanceof HillshadeLayer) {
-            HillshadeLayer hillshadeLayer = (HillshadeLayer)layer;
-            sourceId = hillshadeLayer.getSourceId();
-            sourceLayerId = null;
-        } else if (layer instanceof LineLayer) {
-            LineLayer lineLayer = (LineLayer)layer;
-            sourceId = lineLayer.getSourceId();
-            sourceLayerId = lineLayer.getSourceLayer();
-        } else if (layer instanceof RasterLayer) {
-            RasterLayer rasterLayer = (RasterLayer) layer;
-            sourceId = rasterLayer.getSourceId();
-            sourceLayerId = null;
-        } else if (layer instanceof SymbolLayer) {
-            SymbolLayer symbolLayer = (SymbolLayer)layer;
-            sourceId = symbolLayer.getSourceId();
-            sourceLayerId = symbolLayer.getSourceLayer();
-        } else {
-            sourceId = "";
-            sourceLayerId = null;
-        }
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNAndroidTextureMapView.java

@@ -1,13 +0,0 @@
-package org.maplibre.reactnative.components.mapview;
-
-import android.content.Context;
-import org.maplibre.android.maps.MapLibreMapOptions;
-
-@SuppressWarnings({"MissingPermission"})
-public class MLRNAndroidTextureMapView extends MLRNMapView {
-	public static final String LOG_TAG = "MLRNAndroidTextureMapView";
-	
-    public MLRNAndroidTextureMapView(Context context, MLRNAndroidTextureMapViewManager manager, MapLibreMapOptions options) {
-        super(context, manager, options);
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNAndroidTextureMapViewManager.java

@@ -1,27 +0,0 @@
-package org.maplibre.reactnative.components.mapview;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import org.maplibre.android.maps.MapLibreMapOptions;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-public class MLRNAndroidTextureMapViewManager extends MLRNMapViewManager {
-    public static final String LOG_TAG = "MLRNAndroidTextureMapViewManager";
-    public static final String REACT_CLASS = "MLRNAndroidTextureMapView";
-
-    public MLRNAndroidTextureMapViewManager(ReactApplicationContext context) {
-        super(context);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNAndroidTextureMapView createViewInstance(ThemedReactContext themedReactContext) {
-        MapLibreMapOptions options = new MapLibreMapOptions();
-        options.textureMode(true);
-        return new MLRNAndroidTextureMapView(themedReactContext, this, options);
-    }
-}