@maplibre/maplibre-react-native 11.0.0-alpha.16 → 11.0.0-alpha.17

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.getMapLibreMap();
-        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/ios/components/user-location/MLRNNativeUserLocationManager.h

@@ -1,5 +0,0 @@
-#import "ViewManager.h"
-
-@interface MLRNNativeUserLocationManager : ViewManager
-
-@end

package/ios/components/user-location/MLRNNativeUserLocationManager.m

@@ -1,21 +0,0 @@
-#import "MLRNNativeUserLocationManager.h"
-#import "MLRNNativeUserLocation.h"
-
-@implementation MLRNNativeUserLocationManager
-
-RCT_EXPORT_MODULE(MLRNNativeUserLocation)
-RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL)
-
-#pragma - View Properties
-
-#pragma Methods
-
-- (BOOL)requiresMainQueueSetup {
-  return YES;
-}
-
-- (UIView *)view {
-  return [[MLRNNativeUserLocation alloc] init];
-}
-
-@end

package/lib/commonjs/modules/location/requestAndroidLocationPermissions.js

@@ -1,14 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
-var _LocationManager = require("./LocationManager.js");
-/**
- * @deprected Use `LocationManager.requestAndroidPermissions` instead
- */
-async function requestAndroidLocationPermissions() {
-  return _LocationManager.LocationManager.requestAndroidPermissions();
-}
-//# sourceMappingURL=requestAndroidLocationPermissions.js.map

package/lib/commonjs/modules/location/requestAndroidLocationPermissions.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_LocationManager","require","requestAndroidLocationPermissions","LocationManager","requestAndroidPermissions"],"sourceRoot":"../../../../src","sources":["modules/location/requestAndroidLocationPermissions.ts"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACO,eAAeC,iCAAiCA,CAAA,EAAqB;EAC1E,OAAOC,gCAAe,CAACC,yBAAyB,CAAC,CAAC;AACpD","ignoreList":[]}

package/lib/module/modules/location/requestAndroidLocationPermissions.js

@@ -1,11 +0,0 @@
-"use strict";
-
-import { LocationManager } from "./LocationManager.js";
-
-/**
- * @deprected Use `LocationManager.requestAndroidPermissions` instead
- */
-export async function requestAndroidLocationPermissions() {
-  return LocationManager.requestAndroidPermissions();
-}
-//# sourceMappingURL=requestAndroidLocationPermissions.js.map

package/lib/module/modules/location/requestAndroidLocationPermissions.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["LocationManager","requestAndroidLocationPermissions","requestAndroidPermissions"],"sourceRoot":"../../../../src","sources":["modules/location/requestAndroidLocationPermissions.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,sBAAmB;;AAEnD;AACA;AACA;AACA,OAAO,eAAeC,iCAAiCA,CAAA,EAAqB;EAC1E,OAAOD,eAAe,CAACE,yBAAyB,CAAC,CAAC;AACpD","ignoreList":[]}

package/lib/typescript/commonjs/src/modules/location/requestAndroidLocationPermissions.d.ts

@@ -1,5 +0,0 @@
-/**
- * @deprected Use `LocationManager.requestAndroidPermissions` instead
- */
-export declare function requestAndroidLocationPermissions(): Promise<boolean>;
-//# sourceMappingURL=requestAndroidLocationPermissions.d.ts.map

package/lib/typescript/commonjs/src/modules/location/requestAndroidLocationPermissions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"requestAndroidLocationPermissions.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/location/requestAndroidLocationPermissions.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,OAAO,CAAC,CAE1E"}

package/lib/typescript/module/src/modules/location/requestAndroidLocationPermissions.d.ts

@@ -1,5 +0,0 @@
-/**
- * @deprected Use `LocationManager.requestAndroidPermissions` instead
- */
-export declare function requestAndroidLocationPermissions(): Promise<boolean>;
-//# sourceMappingURL=requestAndroidLocationPermissions.d.ts.map

package/lib/typescript/module/src/modules/location/requestAndroidLocationPermissions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"requestAndroidLocationPermissions.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/location/requestAndroidLocationPermissions.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,OAAO,CAAC,CAE1E"}

package/src/modules/location/requestAndroidLocationPermissions.ts

@@ -1,8 +0,0 @@
-import { LocationManager } from "./LocationManager";
-
-/**
- * @deprected Use `LocationManager.requestAndroidPermissions` instead
- */
-export async function requestAndroidLocationPermissions(): Promise<boolean> {
-  return LocationManager.requestAndroidPermissions();
-}