@rnmapbox/maps 10.0.0-beta.64 → 10.0.0-beta.66

package/android/rctmgl/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +1,13 @@
-connection.project.dir=../../example/android
+arguments=--init-script /var/folders/nf/xt27lc4j4sv73tqskhkd_8xc0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/nf/xt27lc4j4sv73tqskhkd_8xc0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2))
+connection.project.dir=
 eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.14.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

package/android/rctmgl/src/main/java-mapboxgl/common/com/mapbox/rctmgl/modules/RCTMGLLocationModule.java

@@ -94,6 +94,11 @@ public class RCTMGLLocationModule extends ReactContextBaseJavaModule {
         }
     }
 
+    @ReactMethod
+    public void setRequestsAlwaysUse(boolean requestsAlwaysUse) {
+        // IOS only. Ignored on Android.
+    }
+
     @ReactMethod
     public void stop() {
         stopLocationManager();

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/camera/RCTMGLCamera.kt

@@ -93,7 +93,7 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         override fun onAnimationStart(animator: Animator) {}
         override fun onAnimationEnd(animator: Animator) {
             if (!hasSentFirstRegion) {
-                mMapView!!.sendRegionChangeEvent(false)
+                mMapView?.sendRegionChangeEvent(false)
                 hasSentFirstRegion = true
             }
         }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLVectorSource.java

@@ -73,9 +73,6 @@ public class RCTMGLVectorSource extends RCTMGLTileSource<VectorSource> {
             return;
         }
 
-
-        WritableMap payload = new WritableNativeMap();
-
         mMap.querySourceFeatures(
                 getID(),
                 new SourceQueryOptions(layerIDs, filter),
@@ -83,6 +80,7 @@ public class RCTMGLVectorSource extends RCTMGLTileSource<VectorSource> {
                 new QueryFeaturesCallback() {
                     @Override
                     public void run(@NonNull Expected<String, List<QueriedFeature>> queriedFeatures) {
+                        WritableMap payload = new WritableNativeMap();
                         if (queriedFeatures.isError()) {
                             //V10todo
                             payload.putString("error", queriedFeatures.getError());
@@ -93,11 +91,10 @@ public class RCTMGLVectorSource extends RCTMGLTileSource<VectorSource> {
                             }
                             payload.putString("data", FeatureCollection.fromFeatures(features).toJson());
                         }
+                        AndroidCallbackEvent event = new AndroidCallbackEvent(RCTMGLVectorSource.this, callbackID, payload);
+                        mManager.handleEvent(event);
                     }
                 }
         );
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
     }
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/modules/RCTMGLLocationModule.kt

@@ -87,6 +87,11 @@ class RCTMGLLocationModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    fun setRequestsAlwaysUse(requestsAlwaysUse: Boolean) {
+        // IOS only. Ignored on Android.
+    }
+
     @ReactMethod
     fun stop() {
         stopLocationManager()

package/index.d.ts

@@ -24,7 +24,14 @@ import {
 
 import type {
   SymbolLayerStyleProps,
+  CircleLayerStyleProps,
+  FillExtrusionLayerStyleProps,
+  SkyLayerStyleProps,
+  RasterLayerStyleProps,
+  HeatmapLayerStyleProps,
+  FillLayerStyleProps,
   LineLayerStyleProps,
+  BackgroundLayerStyleProps,
 } from './javascript/utils/MapboxStyles';
 import { getAnnotationsLayerID as _getAnnotationsLayerID } from './javascript/utils/getAnnotationsLayerID';
 import {
@@ -47,10 +54,16 @@ import {
   SymbolLayer as _SymbolLayer,
   Props as _SymbolLayerProps,
 } from './javascript/components/SymbolLayer';
-import {
-  LineLayer as _LineLayer,
+import _LineLayer, {
   Props as _LineLayerProps,
 } from './javascript/components/LineLayer';
+import { Props as _BackgroundLayerProps } from './javascript/components/BackgroundLayer';
+import { Props as _CircleLayerProps } from './javascript/components/CircleLayer';
+import { Props as _FillLayerProps } from './javascript/components/FillLayer';
+import { Props as _FillExtrusionLayerProps } from './javascript/components/FillExtrusionLayer';
+import { Props as _RasterLayerProps } from './javascript/components/RasterLayer';
+import { Props as _HeatmapLayerProps } from './javascript/components/HeatmapLayer';
+import { Props as _SkyLayerProps } from './javascript/components/SkyLayer';
 import {
   ShapeSource as _ShapeSource,
   Props as _ShapeSourceProps,
@@ -111,17 +124,6 @@ type Visibility = 'visible' | 'none';
 type Alignment = 'map' | 'viewport';
 type AutoAlignment = Alignment | 'auto';
 
-type NamedStyles<T> = {
-  [P in keyof T]:
-    | SymbolLayerStyleProps
-    | RasterLayerStyle
-    | LineLayerStyleProps
-    | FillLayerStyle
-    | FillExtrusionLayerStyle
-    | CircleLayerStyle
-    | BackgroundLayerStyle;
-};
-
 export type OnPressEvent = {
   features: Array<GeoJSON.Feature>;
   coordinates: {
@@ -281,13 +283,13 @@ declare namespace MapboxGL {
     class ImageSource extends Component<ImageSourceProps> {}
 
     // layers
-    class FillLayer extends Component<FillLayerProps> {}
-    class FillExtrusionLayer extends Component<FillExtrusionLayerProps> {}
+    class FillLayer extends Component<_FillLayerProps> {}
+    class FillExtrusionLayer extends Component<_FillExtrusionLayerProps> {}
     class LineLayer extends Component<_LineLayerProps> {}
-    class CircleLayer extends Component<CircleLayerProps> {}
+    class CircleLayer extends Component<_CircleLayerProps> {}
     class SymbolLayer extends Component<_SymbolLayerProps> {}
-    class RasterLayer extends Component<RasterLayerProps> {}
-    class BackgroundLayer extends Component<BackgroundLayerProps> {}
+    class RasterLayer extends Component<_RasterLayerProps> {}
+    class BackgroundLayer extends Component<_BackgroundLayerProps> {}
   }
 
   /**
@@ -370,26 +372,6 @@ declare namespace MapboxGL {
 
   class Light extends Component<LightProps> {}
 
-  class StyleSheet extends Component {
-    static create<T extends NamedStyles<T> | NamedStyles<any>>(styles: T): T;
-    camera(
-      stops: { [key: number]: string },
-      interpolationMode?: InterpolationMode,
-    ): void;
-    source(
-      stops: { [key: number]: string },
-      attributeName: string,
-      interpolationMode?: InterpolationMode,
-    ): void;
-    composite(
-      stops: { [key: number]: string },
-      attributeName: string,
-      interpolationMode?: InterpolationMode,
-    ): void;
-
-    identity(attributeName: string): number;
-  }
-
   class Callout extends Component<CalloutProps> {}
   type Style = React.FC<StyleProps>;
 
@@ -403,16 +385,16 @@ declare namespace MapboxGL {
   /**
    * Layers
    */
-  class BackgroundLayer extends Component<BackgroundLayerProps> {}
-  class CircleLayer extends Component<CircleLayerProps> {}
-  class FillExtrusionLayer extends Component<FillExtrusionLayerProps> {}
-  class FillLayer extends Component<FillLayerProps> {}
-  class LineLayer extends Component<LineLayerProps> {}
-  class RasterLayer extends Component<RasterLayerProps> {}
-  class HeatmapLayer extends Component<HeatmapLayerProps> {}
+  class BackgroundLayer extends Component<_BackgroundLayerProps> {}
+  class CircleLayer extends Component<_CircleLayerProps> {}
+  class FillExtrusionLayer extends Component<_FillExtrusionLayerProps> {}
+  class FillLayer extends Component<_FillLayerProps> {}
+  class LineLayer extends Component<_LineLayerProps> {}
+  class RasterLayer extends Component<_RasterLayerProps> {}
+  class HeatmapLayer extends Component<_HeatmapLayerProps> {}
   class Images extends Component<ImagesProps> {}
   class ImageSource extends Component<ImageSourceProps> {}
-  class SkyLayer extends Component<SkyLayerProps> {}
+  class SkyLayer extends Component<_SkyLayerProps> {}
 
   class LocationManager extends Component {
     start(displacement?: number): void;
@@ -612,6 +594,7 @@ export interface UserLocationProps {
   animated?: boolean;
   children?: ReactNode;
   minDisplacement?: number;
+  requestsAlwaysUse?: boolean;
   onPress?: () => void;
   onUpdate?: (location: MapboxGL.Location) => void;
   renderMode?: 'normal' | 'native';
@@ -638,121 +621,19 @@ export interface Transition {
   delay: number;
 }
 
-export interface BackgroundLayerStyle {
-  visibility?: Visibility | Expression;
-  backgroundColor?: string | Expression;
-  backgroundColorTransition?: Transition | Expression;
-  backgroundPattern?: string | Expression;
-  backgroundPatternTransition?: Transition | Expression;
-  backgroundOpacity?: number | Expression;
-  backgroundOpacityTransition?: Transition | Expression;
-}
+export type BackgroundLayerStyle = BackgroundLayerStyleProps;
 
-export interface CircleLayerStyle {
-  visibility?: Visibility | Expression;
-  circleRadius?: number | Expression;
-  circleRadiusTransition?: Transition | Expression;
-  circleColor?: string | Expression;
-  circleColorTransition?: Transition | Expression;
-  circleBlur?: number | Expression;
-  circleBlurTransition?: Transition | Expression;
-  circleOpacity?: number | Expression;
-  circleOpacityTransition?: Transition | Expression;
-  circleTranslate?: Array<number> | Expression;
-  circleTranslateTransition?: Transition | Expression;
-  circleTranslateAnchor?: Alignment | Expression;
-  circlePitchScale?: Alignment | Expression;
-  circlePitchAlignment?: Alignment | Expression;
-  circleStrokeWidth?: number | Expression;
-  circleStrokeWidthTransition?: Transition | Expression;
-  circleStrokeColor?: string | Expression;
-  circleStrokeColorTransition?: Transition | Expression;
-  circleStrokeOpacity?: number | Expression;
-  circleStrokeOpacityTransition?: Transition | Expression;
-}
+export type CircleLayerStyle = CircleLayerStyleProps;
 
-export interface FillExtrusionLayerStyle {
-  visibility?: Visibility | Expression;
-  fillExtrusionOpacity?: number | Expression;
-  fillExtrusionOpacityTransition?: Transition | Expression;
-  fillExtrusionColor?: string | Expression;
-  fillExtrusionColorTransition?: Transition | Expression;
-  fillExtrusionTranslate?: Array<number> | Expression;
-  fillExtrusionTranslateTransition?: Transition | Expression;
-  fillExtrusionTranslateAnchor?: Alignment | Expression;
-  fillExtrusionPattern?: string | Expression;
-  fillExtrusionPatternTransition?: Transition | Expression;
-  fillExtrusionHeight?: number | Expression;
-  fillExtrusionHeightTransition?: Transition | Expression;
-  fillExtrusionBase?: number | Expression;
-  fillExtrusionBaseTransition?: Transition | Expression;
-}
+export type FillExtrusionLayerStyle = FillExtrusionLayerStyleProps;
 
-export interface FillLayerStyle {
-  visibility?: Visibility | Expression;
-  fillAntialias?: boolean | Expression;
-  fillOpacity?: number | Expression;
-  fillExtrusionOpacityTransition?: Transition | Expression;
-  fillColor?: string | Expression;
-  fillColorTransition?: Transition | Expression;
-  fillOutlineColor?: string | Expression;
-  fillOutlineColorTransition?: Transition | Expression;
-  fillTranslate?: Array<number> | Expression;
-  fillTranslateTransition?: Transition | Expression;
-  fillTranslateAnchor?: Alignment | Expression;
-  fillPattern?: string | Expression;
-  fillPatternTransition?: Transition | Expression;
-}
+export type FillLayerStyle = FillLayerStyleProps;
 
-export interface SkyLayerStyle {
-  skyType: string | Expression;
-  skyAtmosphereSun?: Array<number> | Expression;
-  skyAtmosphereSunIntensity: number | Expression;
-}
+export type SkyLayerStyle = SkyLayerStyleProps;
 
-export interface LineLayerStyle {
-  lineCap?: 'butt' | 'round' | 'square' | Expression;
-  lineJoin?: 'bevel' | 'round' | 'miter' | Expression;
-  lineMiterLimit?: number | Expression;
-  lineRoundLimit?: number | Expression;
-  visibility?: Visibility | Expression;
-  lineOpacity?: number | Expression;
-  lineOpacityTransition?: Transition | Expression;
-  lineColor?: string | Expression;
-  lineColorTransition?: Transition | Expression;
-  lineTranslate?: Array<number> | Expression;
-  lineTranslateTransition?: Transition | Expression;
-  lineTranslateAnchor?: Alignment | Expression;
-  lineWidth?: number | Expression;
-  lineWidthTransition?: Transition | Expression;
-  lineGapWidth?: number | Expression;
-  lineGapWidthTransition?: Transition | Expression;
-  lineOffset?: number | Expression;
-  lineOffsetTransition?: Transition | Expression;
-  lineBlur?: number | Expression;
-  lineBlurTransition?: Transition | Expression;
-  lineDasharray?: Array<number> | Expression;
-  lineDasharrayTransition?: Transition | Expression;
-  linePattern?: string | Expression;
-  linePatternTransition?: Transition | Expression;
-}
+export type LineLayerStyle = LineLayerStyleProps;
 
-export interface RasterLayerStyle {
-  visibility?: Visibility | Expression;
-  rasterOpacity?: number | Expression;
-  rasterOpacityTransition?: Transition | Expression;
-  rasterHueRotate?: Expression;
-  rasterHueRotateTransition?: Transition | Expression;
-  rasterBrightnessMin?: number | Expression;
-  rasterBrightnessMinTransition?: Transition | Expression;
-  rasterBrightnessMax?: number | Expression;
-  rasterBrightnessMaxTransition?: Transition | Expression;
-  rasterSaturation?: number | Expression;
-  rasterSaturationTransition?: Transition | Expression;
-  rasterContrast?: number | Expression;
-  rasterContrastTransition?: Transition | Expression;
-  rasterFadeDuration?: number | Expression;
-}
+export type RasterLayerStyle = RasterLayerStyleProps;
 
 export type TextVariableAnchorValues =
   | 'center'
@@ -768,17 +649,7 @@ export type TextVariableAnchorValues =
 export type SymbolLayerStyle = SymbolLayerStyleProps;
 export type LineLayerStyle = LineLayerStyleProps;
 
-export interface HeatmapLayerStyle {
-  visibility?: Visibility | Expression;
-  heatmapRadius?: number | Expression;
-  heatmapRadiusTransition?: Transition | Expression;
-  heatmapWeight?: number | Expression;
-  heatmapIntensity?: number | Expression;
-  heatmapIntensityTransition?: Transition | Expression;
-  heatmapColor?: string | Expression;
-  heatmapOpacity?: number | Expression;
-  heatmapOpacityTransition?: Transition | Expression;
-}
+export type HeatmapLayerStyle = HeatmapLayerStyleProps;
 
 export interface Point {
   x: number;

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -123,28 +123,35 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       _updateCameraFromTrackingMode()
     }
   }
+
   @objc var followUserMode: String? {
     didSet {
       _updateCameraFromTrackingMode()
     }
   }
+
   @objc var followUserLocation : Bool = false {
     didSet {
       _updateCameraFromTrackingMode()
     }
   }
+
   @objc var followZoomLevel: NSNumber? {
     didSet {
       _updateCameraFromTrackingMode()
     }
   }
+
   @objc var maxZoomLevel: NSNumber? {
     didSet { _updateMaxBounds() }
   }
+
   @objc var minZoomLevel: NSNumber? {
     didSet { _updateMaxBounds() }
   }
+
   @objc var onUserTrackingModeChange: RCTBubblingEventBlock? = nil
+
   @objc var stop: [String: Any]? {
     didSet {
       _updateCamera()
@@ -319,6 +326,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       }
       let followState = map.viewport.makeFollowPuckViewportState(options: followOptions)
       map.viewport.transition(to: followState)
+      map.viewport.addStatusObserver(self)
       map.mapboxMap.setCamera(to: _camera)
     }
   }
@@ -468,6 +476,11 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     map.reactCamera = self
   }
   
+  override func removeFromMap(_ map: RCTMGLMapView) {
+    map.viewport.removeStatusObserver(self)
+    super.removeFromMap(map)
+  }
+
   // MARK: - LocationConsumer
   
   func locationUpdate(newLocation: Location) {
@@ -495,6 +508,106 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
   }
 }
 
+// MARK: - ViewportStatusObserver
+
+extension RCTMGLCamera : ViewportStatusObserver {
+  func toDict(_ status: ViewportStatus) -> [String: Any] {
+    switch (status) {
+    case .idle:
+      return ["state":"idle"]
+    case .state(let state):
+      return ["state":String(describing: type(of: state))]
+    case .transition(let transition, toState: let toState):
+      return [
+        "transition": String(describing: type(of: transition)),
+        "state":String(describing: type(of: toState))
+      ]
+    }
+  }
+
+  func toFollowUserLocation(_ status: ViewportStatus) -> Bool {
+    switch status {
+    case .idle:
+      return false
+    case .state(_):
+      return true
+    case .transition(_, toState: _):
+      return true
+    }
+  }
+
+  func toFollowUserMode(_ state: ViewportState) -> String? {
+    if let state = state as? FollowPuckViewportState {
+      switch state.options.bearing {
+      case .heading:
+        return "compass"
+      case .course:
+        return "course"
+      case .some(let bearing):
+        return "constant"
+      case .none:
+        return "normal"
+      }
+    } else if let state = state as? OverviewViewportState {
+      return "overview"
+    } else {
+      return "custom"
+    }
+  }
+
+  func toFollowUserMode(_ status: ViewportStatus) -> String? {
+    switch status {
+    case .idle:
+      return nil
+    case .state(let state):
+      return toFollowUserMode(state)
+    case .transition(_, toState: let state):
+      return toFollowUserMode(state)
+    }
+  }
+
+  func toString(_ reason: ViewportStatusChangeReason) -> String {
+    if reason == .idleRequested {
+      return "idleRequested"
+    } else if reason == .transitionFailed {
+      return "transitionFailied"
+    } else if reason == .transitionStarted {
+      return "transitionStarted"
+    } else if reason == .transitionSucceeded {
+      return "transitionSucceeded"
+    } else if reason == .userInteraction {
+      return "userInteraction"
+    } else {
+      return "unkown \(reason)"
+    }
+  }
+
+  func viewportStatusDidChange(from fromStatus: ViewportStatus,
+                               to toStatus: ViewportStatus,
+                               reason: ViewportStatusChangeReason)
+  {
+    if (reason == .userInteraction) {
+      followUserLocation = toFollowUserLocation(toStatus)
+
+      if let onUserTrackingModeChange = onUserTrackingModeChange {
+        let event = RCTMGLEvent(
+          type: .onUserTrackingModeChange,
+          payload: [
+            "followUserMode": toFollowUserMode(toStatus) as Any,
+            "followUserLocation": followUserLocation,
+            "fromViewportStatus": toDict(fromStatus),
+            "toViewportState": toDict(toStatus),
+            "reason": toString(reason)
+          ]
+        )
+
+        onUserTrackingModeChange(event.toJSON())
+      }
+    }
+  }
+}
+
 private func toSeconds(_ ms: Double) -> TimeInterval {
   return ms * 0.001
 }
+

package/ios/RCTMGL-v10/RCTMGLLocationModule.m

@@ -10,6 +10,7 @@ RCT_EXTERN_METHOD(stop)
 RCT_EXTERN_METHOD(getLastKnownLocation)
 
 RCT_EXTERN_METHOD(setMinDisplacement:(CLLocationDistance)minDisplacement)
+RCT_EXTERN_METHOD(setRequestsAlwaysUse:(BOOL)requestsAlwaysUse)
 
 
 @end

package/ios/RCTMGL-v10/RCTMGLLocationModule.swift

@@ -52,6 +52,7 @@ class RCTMGLLocationManager : LocationProviderDelegate {
   
   var lastKnownLocation : CLLocation?
   var lastKnownHeading : CLHeading?
+  var shouldRequestAlwaysAuthorization: Bool?
   
   weak var delegate: RCTMGLLocationManagerDelegate?
   weak var locationProviderDelage: LocationProviderDelegate?
@@ -67,8 +68,14 @@ class RCTMGLLocationManager : LocationProviderDelegate {
     provider.locationProviderOptions = options
   }
   
+  func setRequestsAlwaysUse(_ requestsAlwaysUse: Bool) {
+    shouldRequestAlwaysAuthorization = requestsAlwaysUse;
+  }
+
   func start() {
-    provider.requestAlwaysAuthorization()
+    if shouldRequestAlwaysAuthorization == true {
+      provider.requestAlwaysAuthorization()
+    }
     provider.requestWhenInUseAuthorization()
     provider.setDelegate(self)
     provider.startUpdatingHeading()
@@ -266,6 +273,10 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
     locationManager.setDistanceFilter(minDisplacement)
   }
   
+  @objc func setRequestsAlwaysUse(_ requestsAlwaysUse: Bool) {
+    locationManager.setRequestsAlwaysUse(requestsAlwaysUse);
+  }
+
   @objc
   override func startObserving() {
     super.startObserving()
@@ -278,7 +289,6 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
     hasListener = false
   }
   
-  
   func locationManager(_ locationManager: RCTMGLLocationManager, didUpdateLocation location: RCTMGLLocation) {
     guard hasListener else {
       return
@@ -290,5 +300,4 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
 
     self.sendEvent(withName: RCT_MAPBOX_USER_LOCATION_UPDATE, body: location.toJSON())
   }
-
 }

package/ios/RCTMGL-v10/RCTMGLLogging.swift

@@ -81,6 +81,19 @@ func errorMessage(_ error: Error) -> String {
   }
 }
 
+/// log message if optional returned by `fn` is nil
+func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn: () -> T?) ->T? {
+  let ret = fn()
+  if ret == nil {
+    Logger.log(level:level, message: "\(msg) \(info?() ?? "")")
+    rejecter?(msg, "\(info?() ?? "")", NSError(domain:"is null", code: 0))
+    return nil
+  } else {
+    return ret
+  }
+}
+
+/// log message if `fn` throws and return nil
 func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
   do {
     return try fn()