@maplibre/maplibre-react-native 11.0.0-alpha.13 → 11.0.0-alpha.15

package/android/src/main/java/org/maplibre/reactnative/location/LocationManager.java

@@ -1,160 +0,0 @@
-package org.maplibre.reactnative.location;
-
-import android.content.Context;
-import android.location.Location;
-import android.os.Looper;
-import android.util.Log;
-
-import org.maplibre.android.location.engine.LocationEngine;
-import org.maplibre.android.location.engine.LocationEngineCallback;
-import org.maplibre.android.location.engine.LocationEngineRequest;
-import org.maplibre.android.location.engine.LocationEngineResult;
-import org.maplibre.android.location.permissions.PermissionsManager;
-import org.maplibre.reactnative.location.engine.LocationEngineProvider;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings({"MissingPermission"})
-public class LocationManager implements LocationEngineCallback<LocationEngineResult> {
-    static final long DEFAULT_FASTEST_INTERVAL_MILLIS = 1000;
-    static final long DEFAULT_INTERVAL_MILLIS = 1000;
-
-    public static final String LOG_TAG = "LocationManager";
-
-    private LocationEngine locationEngine;
-    private Context context;
-    private List<OnUserLocationChange> listeners = new ArrayList<>();
-
-    private float mMinDisplacement = 0;
-    private boolean isActive = false;
-    private Location lastLocation = null;
-
-    private LocationEngineRequest locationEngineRequest = null;
-
-    private static WeakReference<LocationManager> INSTANCE = null;
-
-    public static LocationManager getInstance(Context context) {
-        if (INSTANCE == null) {
-            INSTANCE = new WeakReference<>(new LocationManager(context));
-        }
-        return INSTANCE.get();
-    }
-
-    public interface OnUserLocationChange {
-        void onLocationChange(Location location);
-    }
-
-    private LocationManager(Context context) {
-        this.context = context;
-        this.buildEngineRequest();
-
-    }
-
-    private void buildEngineRequest() {
-        locationEngine = new LocationEngineProvider().getLocationEngine(context);
-
-        locationEngineRequest = new LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
-                .setFastestInterval(DEFAULT_FASTEST_INTERVAL_MILLIS)
-                .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
-                .setDisplacement(mMinDisplacement)
-                .build();
-    }
-
-    public void addLocationListener(OnUserLocationChange listener) {
-        if (!listeners.contains(listener)) {
-            listeners.add(listener);
-        }
-    }
-
-    public void removeLocationListener(OnUserLocationChange listener) {
-        if (listeners.contains(listener)) {
-            listeners.remove(listener);
-        }
-    }
-
-    public void setMinDisplacement(float minDisplacement) {
-        mMinDisplacement = minDisplacement;
-    }
-
-    public void enable() {
-        if (!PermissionsManager.areLocationPermissionsGranted(context)) {
-            return;
-        }
-
-        // remove existing listeners
-        locationEngine.removeLocationUpdates(this);
-
-        // refresh location engine request with new values
-        this.buildEngineRequest();
-
-        // add new listeners
-        locationEngine.requestLocationUpdates(
-                locationEngineRequest,
-                this,
-                Looper.getMainLooper()
-        );
-        isActive = true;
-    }
-
-
-    public void disable() {
-        locationEngine.removeLocationUpdates(this);
-        isActive = false;
-    }
-
-    public void dispose() {
-        if (locationEngine == null) {
-            return;
-        }
-        disable();
-        locationEngine.removeLocationUpdates(this);
-    }
-
-    public boolean isActive() {
-        return locationEngine != null && this.isActive;
-    }
-
-    public Location getLastKnownLocation() {
-        if (locationEngine == null) {
-            return null;
-        }
-        return lastLocation;
-    }
-
-
-    public void getLastKnownLocation(LocationEngineCallback<LocationEngineResult> callback) {
-        if (locationEngine == null) {
-            callback.onFailure(new Exception("LocationEngine not initialized"));
-        }
-
-        try {
-            locationEngine.getLastLocation(callback);
-        } catch (Exception exception) {
-            Log.w(LOG_TAG, exception);
-            callback.onFailure(exception);
-        }
-    }
-
-    public LocationEngine getEngine() {
-        return locationEngine;
-    }
-
-    public void onLocationChanged(Location location) {
-        lastLocation = location;
-        for (OnUserLocationChange listener : listeners) {
-            listener.onLocationChange(location);
-        }
-    }
-
-    @Override
-    public void onFailure(Exception exception) {
-        // TODO handle this.
-    }
-
-    @Override
-    public void onSuccess(LocationEngineResult result) {
-        onLocationChanged(result.getLastLocation());
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/location/TrackUserLocationState.java

@@ -1,15 +0,0 @@
-package org.maplibre.reactnative.location;
-
-public class TrackUserLocationState {
-    // The map view not yet tracked the user location
-    public static final int POSSIBLE = 0;
-
-    // The map view has begun to move to the first user location
-    public static final int BEGAN = 1;
-
-    // The map views begins a significant transition
-    public static final int SIGNIFICANT_TRANSITION = 2;
-
-    // The map view has finished moving to the user location
-    public static final int CHANGED = 3;
-}

package/android/src/main/java/org/maplibre/reactnative/location/UserLocation.java

@@ -1,59 +0,0 @@
-package org.maplibre.reactnative.location;
-
-import android.location.Location;
-
-import org.maplibre.android.geometry.LatLng;
-
-public class UserLocation {
-    private Location currentLocation;
-    private Location previousLocation;
-
-    private int userTrackingMode = TrackUserLocationMode.NONE;
-
-    public UserLocation() {
-        this(null);
-    }
-
-    public UserLocation(Location currentLocation) {
-        this.currentLocation = currentLocation;
-    }
-
-    public Location getCurrentLocation() {
-        return currentLocation;
-    }
-
-    public double getBearing() {
-        if (currentLocation == null) {
-            return 0.0;
-        }
-        return currentLocation.getBearing();
-    }
-
-    public LatLng getCoordinate() {
-        if (currentLocation == null) {
-            return null;
-        }
-
-        return new LatLng(currentLocation.getLatitude(), currentLocation.getLongitude());
-    }
-
-    public void setCurrentLocation(Location currentLocation) {
-        this.previousLocation = this.currentLocation;
-        this.currentLocation = currentLocation;
-    }
-
-    public void setTrackingMode(int userTrackingMode) {
-        this.userTrackingMode = userTrackingMode;
-    }
-
-    public int getTrackingMode() {
-        return userTrackingMode;
-    }
-
-    public float getDistance(Location location) {
-        if (currentLocation == null) {
-            return 0.0f;
-        }
-        return currentLocation.distanceTo(location);
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/location/engine/DefaultLocationEngineProvider.java

@@ -1,18 +0,0 @@
-package org.maplibre.reactnative.location.engine;
-
-import android.content.Context;
-import android.util.Log;
-
-import org.maplibre.android.location.engine.LocationEngine;
-import org.maplibre.android.location.engine.LocationEngineDefault;
-
-public class DefaultLocationEngineProvider implements LocationEngineProvidable {
-    private static final String LOG_TAG = "DefaultLocationEngineProvider";
-
-    @Override
-    public LocationEngine getLocationEngine(Context context) {
-        LocationEngine locationEngine = LocationEngineDefault.INSTANCE.getDefaultLocationEngine(context.getApplicationContext());
-        Log.d(LOG_TAG, "DefaultLocationEngine will be used.");
-        return locationEngine;
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/location/engine/LocationEngineProvidable.java

@@ -1,9 +0,0 @@
-package org.maplibre.reactnative.location.engine;
-
-import android.content.Context;
-
-import org.maplibre.android.location.engine.LocationEngine;
-
-public interface LocationEngineProvidable {
-    LocationEngine getLocationEngine(Context context);
-}

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNLocationModule.java

@@ -1,158 +0,0 @@
-package org.maplibre.reactnative.modules;
-
-import android.location.Location;
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
-import org.maplibre.android.location.engine.LocationEngineCallback;
-import org.maplibre.android.location.engine.LocationEngineResult;
-import org.maplibre.reactnative.events.EventEmitter;
-import org.maplibre.reactnative.events.LocationEvent;
-import org.maplibre.reactnative.location.LocationManager;
-
-@ReactModule(name = MLRNLocationModule.REACT_CLASS)
-public class MLRNLocationModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "MLRNLocationModule";
-    public static final String LOCATION_UPDATE = "MapboxUserLocationUpdate";
-
-    private boolean isEnabled;
-    private float mMinDisplacement;
-    private boolean isPaused;
-
-    private LocationManager locationManager;
-
-    private LifecycleEventListener lifecycleEventListener = new LifecycleEventListener() {
-        @Override
-        public void onHostResume() {
-            if (isEnabled) {
-                startLocationManager();
-            }
-        }
-
-        @Override
-        public void onHostPause() {
-            pauseLocationManager();
-        }
-
-        @Override
-        public void onHostDestroy() {
-            stopLocationManager();
-        }
-    };
-
-    private LocationManager.OnUserLocationChange onUserLocationChangeCallback = new LocationManager.OnUserLocationChange() {
-        @Override
-        public void onLocationChange(Location location) {
-            LocationEvent locationEvent = new LocationEvent(location);
-
-            RCTNativeAppEventEmitter emitter = EventEmitter.getModuleEmitter(getReactApplicationContext());
-            if (emitter != null) {
-                emitter.emit(LOCATION_UPDATE, locationEvent.getPayload());
-            }
-        }
-    };
-
-    public MLRNLocationModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        locationManager = LocationManager.getInstance(reactContext);
-        reactContext.addLifecycleEventListener(lifecycleEventListener);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-
-    @ReactMethod
-    public void start(float minDisplacement) {
-        isEnabled = true;
-        mMinDisplacement = minDisplacement;
-        startLocationManager();
-    }
-
-    @ReactMethod
-    public void setMinDisplacement(float minDisplacement) {
-        if (mMinDisplacement == minDisplacement) return;
-        mMinDisplacement = minDisplacement;
-        if (isEnabled) {
-
-            // set minimal displacement in the manager
-            locationManager.setMinDisplacement(mMinDisplacement);
-
-            // refresh values in location engine request
-            locationManager.enable();
-        }
-    }
-
-    @ReactMethod
-    public void stop() {
-        stopLocationManager();
-    }
-
-    @ReactMethod
-    public void pause() {
-        pauseLocationManager();
-    }
-
-    @ReactMethod
-    public void getLastKnownLocation(final Promise promise) {
-        locationManager.getLastKnownLocation(
-          new LocationEngineCallback<LocationEngineResult>() {
-              public void onSuccess(LocationEngineResult result) {
-                  Location location = result.getLastLocation();
-                  if (result.getLastLocation() != null) {
-                      LocationEvent locationEvent = new LocationEvent(location);
-                      promise.resolve(locationEvent.getPayload());
-                  } else {
-                      promise.resolve(null);
-                  }
-              }
-              public void onFailure(@NonNull Exception exception) {
-                  promise.reject(exception);
-              }
-          }
-        );
-    }
-
-    @ReactMethod
-    public void addListener(String eventName) {
-        // Set up any upstream listeners or background tasks as necessary
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Remove upstream listeners, stop unnecessary background tasks
-    }
-
-    private void startLocationManager() {
-        locationManager.addLocationListener(onUserLocationChangeCallback);
-        locationManager.setMinDisplacement(mMinDisplacement);
-        locationManager.enable();
-        isPaused = false;
-    }
-
-    private void pauseLocationManager() {
-        if (isPaused) {
-            return;
-        }
-        locationManager.disable();
-        isPaused = true;
-    }
-
-    private void stopLocationManager() {
-        if (!isEnabled) {
-            return;
-        }
-        locationManager.removeLocationListener(onUserLocationChangeCallback);
-        locationManager.dispose();
-        isEnabled = false;
-        isPaused = false;
-    }
-}

package/android/src/main/location-engine-default/org/maplibre/reactnative/location/engine/LocationEngineProvider.java

@@ -1,12 +0,0 @@
-package org.maplibre.reactnative.location.engine;
-
-import android.content.Context;
-
-import org.maplibre.android.location.engine.LocationEngine;
-
-public class LocationEngineProvider implements LocationEngineProvidable {
-    @Override
-    public LocationEngine getLocationEngine(Context context) {
-        return new DefaultLocationEngineProvider().getLocationEngine(context);
-    }
-}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineImpl.java

@@ -1,151 +0,0 @@
-package org.maplibre.reactnative.location.engine;
-
-import android.annotation.SuppressLint;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.location.Location;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-
-import com.google.android.gms.location.FusedLocationProviderClient;
-import com.google.android.gms.location.LocationCallback;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationResult;
-import com.google.android.gms.location.LocationServices;
-import com.google.android.gms.location.Priority;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-
-import org.maplibre.android.location.engine.LocationEngineCallback;
-import org.maplibre.android.location.engine.LocationEngineImpl;
-import org.maplibre.android.location.engine.LocationEngineRequest;
-import org.maplibre.android.location.engine.LocationEngineResult;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Wraps implementation of Fused Location Provider
- */
-public class GoogleLocationEngineImpl implements LocationEngineImpl<LocationCallback> {
-    private final FusedLocationProviderClient fusedLocationProviderClient;
-
-    @VisibleForTesting
-    GoogleLocationEngineImpl(FusedLocationProviderClient fusedLocationProviderClient) {
-        this.fusedLocationProviderClient = fusedLocationProviderClient;
-    }
-
-    public GoogleLocationEngineImpl(@NonNull Context context) {
-        this.fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context);
-    }
-
-    @NonNull
-    @Override
-    public LocationCallback createListener(LocationEngineCallback<LocationEngineResult> callback) {
-        return new GoogleLocationEngineCallbackTransport(callback);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void getLastLocation(@NonNull LocationEngineCallback<LocationEngineResult> callback)
-            throws SecurityException {
-        GoogleLastLocationEngineCallbackTransport transport =
-                new GoogleLastLocationEngineCallbackTransport(callback);
-        fusedLocationProviderClient.getLastLocation().addOnSuccessListener(transport).addOnFailureListener(transport);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
-                                       @NonNull LocationCallback listener,
-                                       @Nullable Looper looper) throws SecurityException {
-        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), listener, looper);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
-                                       @NonNull PendingIntent pendingIntent) throws SecurityException {
-        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), pendingIntent);
-    }
-
-    @Override
-    public void removeLocationUpdates(@NonNull LocationCallback listener) {
-        if (listener != null) {
-            fusedLocationProviderClient.removeLocationUpdates(listener);
-        }
-    }
-
-    @Override
-    public void removeLocationUpdates(PendingIntent pendingIntent) {
-        if (pendingIntent != null) {
-            fusedLocationProviderClient.removeLocationUpdates(pendingIntent);
-        }
-    }
-
-    private static LocationRequest toGMSLocationRequest(LocationEngineRequest request) {
-        LocationRequest.Builder builder = new LocationRequest.Builder(request.getInterval());
-        builder.setMinUpdateIntervalMillis(request.getFastestInterval());
-        builder.setMinUpdateDistanceMeters(request.getDisplacement());
-        builder.setMaxUpdateDelayMillis(request.getMaxWaitTime());
-        builder.setPriority(toGMSLocationPriority(request.getPriority()));
-        return builder.build();
-    }
-
-    private static int toGMSLocationPriority(int enginePriority) {
-        switch (enginePriority) {
-            case LocationEngineRequest.PRIORITY_HIGH_ACCURACY:
-                return Priority.PRIORITY_HIGH_ACCURACY;
-            case LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY:
-                return Priority.PRIORITY_BALANCED_POWER_ACCURACY;
-            case LocationEngineRequest.PRIORITY_LOW_POWER:
-                return Priority.PRIORITY_LOW_POWER;
-            case LocationEngineRequest.PRIORITY_NO_POWER:
-            default:
-                return Priority.PRIORITY_PASSIVE;
-        }
-    }
-
-    private static final class GoogleLocationEngineCallbackTransport extends LocationCallback {
-        private final LocationEngineCallback<LocationEngineResult> callback;
-
-        GoogleLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
-            this.callback = callback;
-        }
-
-        @Override
-        public void onLocationResult(LocationResult locationResult) {
-            super.onLocationResult(locationResult);
-            List<Location> locations = locationResult.getLocations();
-            if (!locations.isEmpty()) {
-                callback.onSuccess(LocationEngineResult.create(locations));
-            } else {
-                callback.onFailure(new Exception("Unavailable location"));
-            }
-        }
-    }
-
-    @VisibleForTesting
-    static final class GoogleLastLocationEngineCallbackTransport
-            implements OnSuccessListener<Location>, OnFailureListener {
-        private final LocationEngineCallback<LocationEngineResult> callback;
-
-        GoogleLastLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
-            this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Location location) {
-            callback.onSuccess(location != null ? LocationEngineResult.create(location) :
-                    LocationEngineResult.create(Collections.<Location>emptyList()));
-        }
-
-        @Override
-        public void onFailure(@NonNull Exception e) {
-            callback.onFailure(e);
-        }
-    }
-}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineProvider.java

@@ -1,24 +0,0 @@
-package org.maplibre.reactnative.location.engine;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-
-import org.maplibre.android.location.engine.LocationEngine;
-import org.maplibre.android.location.engine.LocationEngineProxy;
-
-public class GoogleLocationEngineProvider implements LocationEngineProvidable {
-    private static final String LOG_TAG = "GoogleLocationEngineProvider";
-
-    public LocationEngine getLocationEngine(Context context) {
-        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
-            LocationEngine locationEngine = new LocationEngineProxy<>(new GoogleLocationEngineImpl(context.getApplicationContext()));
-            Log.d(LOG_TAG, "GoogleLocationEngine will be used.");
-            return locationEngine;
-        } else {
-            return new DefaultLocationEngineProvider().getLocationEngine(context);
-        }
-    }
-}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/LocationEngineProvider.java

@@ -1,12 +0,0 @@
-package org.maplibre.reactnative.location.engine;
-
-import android.content.Context;
-
-import org.maplibre.android.location.engine.LocationEngine;
-
-public class LocationEngineProvider implements LocationEngineProvidable {
-    @Override
-    public LocationEngine getLocationEngine(Context context) {
-        return new GoogleLocationEngineProvider().getLocationEngine(context);
-    }
-}