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

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);
-    }
-}

package/ios/CameraMode.h

@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface CameraMode : NSObject
-
-extern int const RCT_MAPBOX_CAMERA_MODE_FLIGHT;
-extern int const RCT_MAPBOX_CAMERA_MODE_EASE;
-extern int const RCT_MAPBOX_CAMERA_MODE_LINEAR;
-extern int const RCT_MAPBOX_CAMERA_MODE_NONE;
-
-@end

package/ios/CameraMode.m

@@ -1,10 +0,0 @@
-#import "CameraMode.h"
-
-@implementation CameraMode
-
-int const RCT_MAPBOX_CAMERA_MODE_FLIGHT = 1;
-int const RCT_MAPBOX_CAMERA_MODE_EASE = 2;
-int const RCT_MAPBOX_CAMERA_MODE_LINEAR = 3;
-int const RCT_MAPBOX_CAMERA_MODE_NONE = 4;
-
-@end

package/ios/CameraStop.h

@@ -1,18 +0,0 @@
-@import MapLibre;
-#import "MLRNCamera.h"
-
-@interface CameraStop : NSObject
-
-@property (nonatomic, strong) NSNumber *pitch;
-@property (nonatomic, strong) NSNumber *heading;
-@property (nonatomic, strong) NSNumber *zoom;
-@property (nonatomic, strong) NSNumber *mode;
-@property (nonatomic, assign) NSTimeInterval duration;
-
-@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
-@property (nonatomic, assign) MLNCoordinateBounds bounds;
-@property (nonatomic, assign) UIEdgeInsets padding;
-
-+ (CameraStop *)fromDictionary:(NSDictionary *)args;
-
-@end

package/ios/CameraStop.m

@@ -1,73 +0,0 @@
-#import "CameraStop.h"
-#import "CameraMode.h"
-#import "MLRNCamera.h"
-#import "MLRNUtils.h"
-
-@implementation CameraStop
-
-- (void)setMode:(NSNumber *)mode {
-  int modeInt = [mode intValue];
-
-  if (modeInt == RCT_MAPBOX_CAMERA_MODE_FLIGHT) {
-    _mode = [NSNumber numberWithInt:modeInt];
-  } else if (modeInt == RCT_MAPBOX_CAMERA_MODE_NONE) {
-    _mode = [NSNumber numberWithInt:modeInt];
-  } else if (modeInt == RCT_MAPBOX_CAMERA_MODE_LINEAR) {
-    _mode = [NSNumber numberWithInt:modeInt];
-  } else {
-    _mode = [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_EASE];
-  }
-}
-
-- (id)init {
-  if (self = [super init]) {
-    self.coordinate = kCLLocationCoordinate2DInvalid;
-    self.bounds =
-        MLNCoordinateBoundsMake(kCLLocationCoordinate2DInvalid, kCLLocationCoordinate2DInvalid);
-  }
-  return self;
-}
-
-+ (CameraStop *)fromDictionary:(NSDictionary *)args {
-  CameraStop *stop = [[CameraStop alloc] init];
-
-  if (args[@"pitch"]) {
-    stop.pitch = args[@"pitch"];
-  }
-
-  if (args[@"heading"]) {
-    stop.heading = args[@"heading"];
-  }
-
-  if (args[@"centerCoordinate"]) {
-    stop.coordinate = [MLRNUtils fromFeature:args[@"centerCoordinate"]];
-  }
-
-  if (args[@"zoom"]) {
-    stop.zoom = args[@"zoom"];
-  }
-
-  if (args[@"mode"]) {
-    stop.mode = args[@"mode"];
-  }
-
-  if (args[@"bounds"]) {
-    stop.bounds = [MLRNUtils fromFeatureCollection:args[@"bounds"]];
-  }
-
-  CGFloat paddingTop = args[@"paddingTop"] ? [args[@"paddingTop"] floatValue] : 0.0;
-  CGFloat paddingRight = args[@"paddingRight"] ? [args[@"paddingRight"] floatValue] : 0.0;
-  CGFloat paddingBottom = args[@"paddingBottom"] ? [args[@"paddingBottom"] floatValue] : 0.0;
-  CGFloat paddingLeft = args[@"paddingLeft"] ? [args[@"paddingLeft"] floatValue] : 0.0;
-  stop.padding = UIEdgeInsetsMake(paddingTop, paddingLeft, paddingBottom, paddingRight);
-
-  NSTimeInterval duration = 2.0;
-  if (args[@"duration"]) {
-    duration = [MLRNUtils fromMS:args[@"duration"]];
-  }
-  stop.duration = duration;
-
-  return stop;
-}
-
-@end

package/ios/CameraUpdateItem.m

@@ -1,168 +0,0 @@
-#import "CameraUpdateItem.h"
-#import "CameraMode.h"
-
-@interface MLNMapView (FlyToWithPadding)
-- (void)_flyToCamera:(MLNMapCamera *)camera
-          edgePadding:(UIEdgeInsets)insets
-         withDuration:(NSTimeInterval)duration
-         peakAltitude:(CLLocationDistance)peakAltitude
-    completionHandler:(nullable void (^)(void))completion;
-@end
-
-@interface MLRNCameraWithPadding : MLNMapCamera
-
-@property (nonatomic) MLNMapCamera *_Nonnull camera;
-@property (nonatomic) UIEdgeInsets boundsPadding;
-
-@end
-
-@implementation MLRNCameraWithPadding
-
-@end
-
-@implementation CameraUpdateItem
-
-- (void)execute:(MLRNMapView *)mapView withCompletionHandler:(void (^)(void))completionHandler {
-  if (_cameraStop.mode == [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_FLIGHT]) {
-    [self _flyToCamera:mapView withCompletionHandler:completionHandler];
-  } else if (_cameraStop.mode == [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_EASE]) {
-    [self _moveCamera:mapView animated:YES ease:YES withCompletionHandler:completionHandler];
-  } else if (_cameraStop.mode == [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_LINEAR]) {
-    [self _moveCamera:mapView animated:YES ease:NO withCompletionHandler:completionHandler];
-  } else {
-    [self _moveCamera:mapView animated:NO ease:NO withCompletionHandler:completionHandler];
-  }
-}
-
-- (void)_flyToCamera:(MLRNMapView *)mapView
-    withCompletionHandler:(void (^)(void))completionHandler {
-  MLRNCameraWithPadding *nextCamera = [self _makeCamera:mapView];
-
-  if ([mapView respondsToSelector:@selector
-               (_flyToCamera:edgePadding:withDuration:peakAltitude:completionHandler:)]) {
-    [mapView _flyToCamera:nextCamera.camera
-              edgePadding:nextCamera.boundsPadding
-             withDuration:_cameraStop.duration
-             peakAltitude:-1
-        completionHandler:completionHandler];
-  } else {
-    [mapView flyToCamera:nextCamera.camera
-             withDuration:_cameraStop.duration
-        completionHandler:completionHandler];
-  }
-}
-
-- (void)_moveCamera:(MLRNMapView *)mapView
-                 animated:(BOOL)animated
-                     ease:(BOOL)ease
-    withCompletionHandler:(void (^)(void))completionHandler {
-  MLRNCameraWithPadding *nextCamera = [self _makeCamera:mapView];
-  NSString *easeFunctionName =
-      ease ? kCAMediaTimingFunctionEaseInEaseOut : kCAMediaTimingFunctionLinear;
-
-  [mapView setCamera:nextCamera.camera
-                 withDuration:animated ? _cameraStop.duration : 0
-      animationTimingFunction:[CAMediaTimingFunction functionWithName:easeFunctionName]
-                  edgePadding:nextCamera.boundsPadding
-            completionHandler:completionHandler];
-}
-
-- (MLRNCameraWithPadding *)_makeCamera:(MLRNMapView *)mapView {
-  MLNMapCamera *nextCamera = [mapView.camera copy];
-
-  UIEdgeInsets padding = [self _clippedPadding:_cameraStop.padding forView:mapView];
-  if (padding.top <= 0 && padding.bottom <= 0) {
-    // If all padding properties are 0 in the update, and the bounds and centerCoordinate do not
-    // change, the padding doesn't change either. This seems to be a bug in the iOS SDK.
-    padding.top = 1.0;
-    padding.bottom = 1.0;
-  }
-
-  bool hasSetAltitude = false;
-
-  if ([self _isCoordValid:_cameraStop.coordinate]) {
-    MLNCoordinateBounds boundsFromCoord = {.sw = _cameraStop.coordinate,
-                                           .ne = _cameraStop.coordinate};
-    MLNMapCamera *boundsCamera = [mapView camera:nextCamera
-                         fittingCoordinateBounds:boundsFromCoord
-                                     edgePadding:padding];
-    nextCamera.centerCoordinate = boundsCamera.centerCoordinate;
-  } else if ([self _areBoundsValid:_cameraStop.bounds]) {
-    MLNMapCamera *boundsCamera = [mapView camera:nextCamera
-                         fittingCoordinateBounds:_cameraStop.bounds
-                                     edgePadding:padding];
-    nextCamera.centerCoordinate = boundsCamera.centerCoordinate;
-    nextCamera.altitude = boundsCamera.altitude;
-    hasSetAltitude = true;
-  }
-
-  if (_cameraStop.pitch != nil) {
-    nextCamera.pitch = [_cameraStop.pitch floatValue];
-  }
-
-  if (_cameraStop.heading != nil) {
-    nextCamera.heading = [_cameraStop.heading floatValue];
-  }
-
-  if (_cameraStop.zoom != nil && hasSetAltitude == false) {
-    nextCamera.altitude = [mapView altitudeFromZoom:[_cameraStop.zoom doubleValue]
-                                         atLatitude:nextCamera.centerCoordinate.latitude
-                                            atPitch:nextCamera.pitch];
-  }
-
-  MLRNCameraWithPadding *cameraWithPadding = [[MLRNCameraWithPadding alloc] init];
-  cameraWithPadding.camera = nextCamera;
-  cameraWithPadding.boundsPadding = padding;
-  return cameraWithPadding;
-}
-
-- (UIEdgeInsets)_clippedPadding:(UIEdgeInsets)padding forView:(MLRNMapView *)mapView {
-  UIEdgeInsets result = padding;
-  if ((padding.top + padding.bottom) >= mapView.frame.size.height) {
-    double totalPadding = padding.top + padding.bottom;
-    double extra = totalPadding - mapView.frame.size.height + 1.0;
-    result.top -= (padding.top * extra) / totalPadding;
-    result.bottom -= (padding.bottom * extra) / totalPadding;
-  }
-  if ((padding.left + padding.right) >= mapView.frame.size.width) {
-    double totalPadding = padding.left + padding.right;
-    double extra = totalPadding - mapView.frame.size.width + 1.0;
-    result.left -= (padding.left * extra) / totalPadding;
-    result.right -= (padding.right * extra) / totalPadding;
-  }
-  return result;
-}
-
-- (BOOL)_areBoundsValid:(MLNCoordinateBounds)bounds {
-  if ([self _isLatitudeValid:bounds.ne.latitude] && [self _isLatitudeValid:bounds.sw.latitude]) {
-    return YES;
-  }
-
-  return NO;
-}
-
-- (BOOL)_isLatitudeValid:(CLLocationDegrees)latitude {
-  return latitude >= -90 && latitude <= 90;
-}
-
-- (BOOL)_isCoordValid:(CLLocationCoordinate2D)coord {
-  BOOL isValid = CLLocationCoordinate2DIsValid(coord);
-
-  if (!isValid) {
-    return NO;
-  }
-
-  return YES;
-}
-
-- (BOOL)_hasCenterCoordAndZoom {
-  BOOL isValid = CLLocationCoordinate2DIsValid(_cameraStop.coordinate) && _cameraStop.zoom != nil;
-
-  if (!isValid) {
-    return NO;
-  }
-
-  return [self _isCoordValid:_cameraStop.coordinate];
-}
-
-@end

package/ios/MLRN.h

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface MLRN : NSObject
-
-@end

package/ios/MLRN.m

@@ -1,5 +0,0 @@
-#import "MLRN.h"
-
-@implementation MLRN
-
-@end

package/ios/MLRNCallout.h

@@ -1,7 +0,0 @@
-#import <React/RCTView.h>
-
-@import MapLibre;
-
-@interface MLRNCallout : RCTView <MLNCalloutView>
-
-@end

package/ios/MLRNCamera.h

@@ -1,29 +0,0 @@
-#import <React/RCTComponent.h>
-#import <UIKit/UIKit.h>
-#import "MLRNMapView.h"
-
-@class MLRNMapView;
-
-@interface MLRNCamera : UIView <MLRNMapViewCamera>
-
-@property (nonatomic, strong) NSDictionary<NSString *, id> *stop;
-@property (nonatomic, strong) NSDictionary<NSString *, id> *defaultStop;
-@property (nonatomic, strong) MLRNMapView *map;
-
-@property (nonatomic, assign) BOOL followUserLocation;
-@property (nonatomic, copy) NSString *followUserMode;
-@property (nonatomic, copy) NSNumber *followZoomLevel;
-@property (nonatomic, copy) NSNumber *followPitch;
-@property (nonatomic, copy) NSNumber *followHeading;
-
-@property (nonatomic, copy) NSNumber *maxZoomLevel;
-@property (nonatomic, copy) NSNumber *minZoomLevel;
-
-@property (nonatomic, copy) NSString *maxBounds;
-
-@property (nonatomic, copy) NSString *alignment;
-@property (nonatomic, copy, readonly) NSNumber *cameraAnimationMode;
-
-@property (nonatomic, copy) RCTBubblingEventBlock onUserTrackingModeChange;
-
-@end