@rnmapbox/maps 10.0.0-beta.41 → 10.0.0-beta.43

package/docs/docs.json

@@ -696,9 +696,12 @@
       {
         "name": "onUserTrackingModeChange",
         "required": false,
-        "type": "UserTrackingModeChangeCallback",
+        "type": {
+          "name": "func",
+          "funcSignature": "(event:MapboxGLEvent) => void"
+        },
         "default": "none",
-        "description": "Executes when user tracking mode changes."
+        "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
       }
     ],
     "fileNameWithExt": "Camera.tsx",
@@ -1643,7 +1646,7 @@
         "description": "FIX ME NO DESCRIPTION"
       }
     ],
-    "fileNameWithExt": "HeadingIndicator.js",
+    "fileNameWithExt": "HeadingIndicator.tsx",
     "name": "HeadingIndicator"
   },
   "HeatmapLayer": {
@@ -3055,34 +3058,14 @@
         "required": false,
         "type": "func",
         "default": "none",
-        "description": "iOS, v10 only, experimental.\n\nCalled when the currently displayed map area changes.\nReplaces onRegionIsChanging, so can't set both",
-        "params": [
-          {
-            "name": "region",
-            "description": "A payload containing the map center, bounds, and other properties.",
-            "type": {
-              "name": "MapState"
-            },
-            "optional": false
-          }
-        ]
+        "description": "iOS, v10 only, deprecated will be removed in next version - please use onRegionIsChanging."
       },
       {
         "name": "onMapIdle",
         "required": false,
         "type": "func",
         "default": "none",
-        "description": "iOS, v10 only, experimental\n\nCalled when the currently displayed map area stops changing.\nReplaces onRegionDidChange, so can't set both",
-        "params": [
-          {
-            "name": "region",
-            "description": "A payload containing the map center, bounds, and other properties.",
-            "type": {
-              "name": "MapState"
-            },
-            "optional": false
-          }
-        ]
+        "description": "iOS, v10 only, deprecated will be removed in next version - please use onRegionDidChange"
       },
       {
         "name": "onWillStartLoadingMap",
@@ -4428,7 +4411,7 @@
       {
         "name": "filter",
         "required": false,
-        "type": "array",
+        "type": "Array",
         "default": "none",
         "description": "Filter only the features in the source layer that satisfy a condition that you define"
       },
@@ -4448,16 +4431,20 @@
       },
       {
         "name": "style",
+        "required": true,
+        "type": "SymbolLayerStyleProps",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "children",
         "required": false,
-        "type": "union",
+        "type": "JSX.Element \\| JSX.Element[]",
         "default": "none",
-        "description": "Customizable style attributes"
+        "description": "FIX ME NO DESCRIPTION"
       }
     ],
-    "composes": [
-      "../utils"
-    ],
-    "fileNameWithExt": "SymbolLayer.js",
+    "fileNameWithExt": "SymbolLayer.tsx",
     "name": "SymbolLayer",
     "styles": [
       {
@@ -5795,40 +5782,66 @@
     ]
   },
   "Terrain": {
-    "description": "A global modifier that elevates layers and markers based on a DEM data source.",
+    "description": "",
     "displayName": "Terrain",
-    "methods": [
-      {
-        "name": "baseProps",
-        "docblock": null,
-        "modifiers": [
-          "get"
-        ],
-        "params": [],
-        "returns": null
-      }
-    ],
+    "methods": [],
     "props": [
       {
         "name": "sourceID",
-        "required": false,
+        "required": true,
         "type": "string",
-        "default": "MapboxGL.StyleSource.DefaultSourceID",
+        "default": "none",
         "description": "Name of a source of raster_dem type to be used for terrain elevation."
       },
       {
         "name": "exaggeration",
         "required": false,
-        "type": "union",
+        "type": "Value",
         "default": "none",
-        "description": "Optional number between 0 and 1000 inclusive. Defaults to 1. Supports interpolateexpressions. Transitionable.\nExaggerates the elevation of the terrain by multiplying the data from the DEM with this value."
+        "description": "Deprecated, use exaggeration in style instead"
+      },
+      {
+        "name": "style",
+        "required": true,
+        "type": "TerrainLayerStyleProps",
+        "default": "none",
+        "description": "Customizable style attributes"
       }
     ],
-    "composes": [
-      "../utils"
-    ],
-    "fileNameWithExt": "Terrain.js",
-    "name": "Terrain"
+    "fileNameWithExt": "Terrain.tsx",
+    "name": "Terrain",
+    "styles": [
+      {
+        "name": "source",
+        "type": "string",
+        "values": [],
+        "description": "Name of a source of `raster_dem` type to be used for terrain elevation.",
+        "requires": [],
+        "disabledBy": [],
+        "allowedFunctionTypes": []
+      },
+      {
+        "name": "exaggeration",
+        "type": "number",
+        "values": [],
+        "minimum": 0,
+        "maximum": 1000,
+        "default": 1,
+        "description": "Exaggerates the elevation of the terrain by multiplying the data from the DEM with this value.",
+        "requires": [
+          "source"
+        ],
+        "disabledBy": [],
+        "allowedFunctionTypes": [],
+        "expression": {
+          "interpolated": true,
+          "parameters": [
+            "zoom"
+          ]
+        },
+        "transition": true
+      }
+    ]
   },
   "UserLocation": {
     "description": "",

package/index.d.ts

@@ -22,6 +22,7 @@ import {
   FeatureCollection,
 } from '@turf/helpers';
 
+import type { SymbolLayerStyleProps } from './javascript/utils/MapboxStyles';
 import {
   Camera as _Camera,
   CameraStop as _CameraStop,
@@ -32,14 +33,18 @@ import {
   CameraBoundsWithPadding as _CameraBoundsWithPadding,
   CameraStops as _CameraStops,
   CameraAnimationMode as _CameraAnimationMode,
+  type UserTrackingMode as _UserTrackingMode,
+  type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 } from './javascript/components/Camera';
 import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
 import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
 import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
+import {
+  SymbolLayer as _SymbolLayer,
+  Props as _SymbolLayerProps,
+} from './javascript/components/SymbolLayer';
 import type {
   MapboxGLEvent as _MapboxGLEvent,
-  UserTrackingMode as _UserTrackingMode,
-  UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
   AnimatedPoint as _AnimatedPoint,
   AnimatedShape as _AnimatedShape,
 } from './javascript/types/index';
@@ -96,7 +101,7 @@ type AutoAlignment = Alignment | 'auto';
 
 type NamedStyles<T> = {
   [P in keyof T]:
-    | SymbolLayerStyle
+    | SymbolLayerStyleProps
     | RasterLayerStyle
     | LineLayerStyle
     | FillLayerStyle
@@ -142,6 +147,7 @@ declare namespace MapboxGL {
   const Atmosphere = _Atmosphere;
   const MarkerView = _MarkerView;
   const PointAnnotation = _PointAnnotation;
+  const SymbolLayer = _SymbolLayer;
 
   type MapboxGLEvent = _MapboxGLEvent;
   type UserTrackingMode = _UserTrackingMode;
@@ -246,7 +252,7 @@ declare namespace MapboxGL {
     class FillExtrusionLayer extends Component<FillExtrusionLayerProps> {}
     class LineLayer extends Component<LineLayerProps> {}
     class CircleLayer extends Component<CircleLayerProps> {}
-    class SymbolLayer extends Component<SymbolLayerProps> {}
+    class SymbolLayer extends Component<_SymbolLayerProps> {}
     class RasterLayer extends Component<RasterLayerProps> {}
     class BackgroundLayer extends Component<BackgroundLayerProps> {}
   }
@@ -397,7 +403,6 @@ declare namespace MapboxGL {
   class FillLayer extends Component<FillLayerProps> {}
   class LineLayer extends Component<LineLayerProps> {}
   class RasterLayer extends Component<RasterLayerProps> {}
-  class SymbolLayer extends Component<SymbolLayerProps> {}
   class HeatmapLayer extends Component<HeatmapLayerProps> {}
   class Images extends Component<ImagesProps> {}
   class ImageSource extends Component<ImageSourceProps> {}
@@ -482,11 +487,6 @@ declare namespace MapboxGL {
   /**
    * Constants
    */
-  enum UserTrackingModes {
-    Follow = 'normal',
-    FollowWithHeading = 'compass',
-    FollowWithCourse = 'course',
-  }
 
   enum InterpolationMode {
     Exponential = 0,
@@ -757,75 +757,8 @@ export type TextVariableAnchorValues =
   | 'bottom-left'
   | 'bottom-right';
 
-export interface SymbolLayerStyle {
-  symbolPlacement?: 'point' | 'line' | Expression;
-  symbolSpacing?: number | Expression;
-  symbolAvoidEdges?: boolean | Expression;
-  symbolSortKey?: number | Expression;
-  symbolZOrder?: 'auto' | 'viewport-y' | 'source' | Expression;
-  iconAllowOverlap?: boolean | Expression;
-  iconIgnorePlacement?: boolean | Expression;
-  iconOptional?: boolean | Expression;
-  iconRotationAlignment?: AutoAlignment | Expression;
-  iconSize?: number | Expression;
-  iconTextFit?: 'none' | 'width' | 'height' | 'both' | Expression;
-  iconTextFitPadding?: Array<number> | Expression;
-  iconImage?: string | Expression;
-  iconRotate?: number | Expression;
-  iconPadding?: number | Expression;
-  iconKeepUpright?: boolean | Expression;
-  iconOffset?: Array<number> | Expression;
-  iconAnchor?: Anchor | Expression;
-  iconPitchAlignment?: AutoAlignment | Expression;
-  textPitchAlignment?: AutoAlignment | Expression;
-  textRotationAlignment?: AutoAlignment | Expression;
-  textField?: string | Expression;
-  textFont?: Array<string> | Expression;
-  textSize?: number | Expression;
-  textMaxWidth?: number | Expression;
-  textLineHeight?: number | Expression;
-  textLetterSpacing?: number | Expression;
-  textJustify?: 'left' | 'center' | 'right' | Expression;
-  textAnchor?: Anchor | Expression;
-  textMaxAngle?: number | Expression;
-  textRotate?: number | Expression;
-  textPadding?: number | Expression;
-  textKeepUpright?: boolean | Expression;
-  textTransform?: 'none' | 'uppercase' | 'lowercase' | Expression;
-  textOffset?: Array<number> | Expression;
-  textAllowOverlap?: boolean | Expression;
-  textIgnorePlacement?: boolean | Expression;
-  textOptional?: boolean | Expression;
-  textVariableAnchor?: Array<TextVariableAnchorValues>;
-  textRadialOffset?: number | Expression;
-  visibility?: Visibility | Expression;
-  iconOpacity?: number | Expression;
-  iconOpacityTransition?: Transition | Expression;
-  iconColor?: string | Expression;
-  iconColorTransition?: Transition | Expression;
-  iconHaloColor?: string | Expression;
-  iconHaloColorTransition?: Transition | Expression;
-  iconHaloWidth?: number | Expression;
-  iconHaloWidthTransition?: Transition | Expression;
-  iconHaloBlur?: number | Expression;
-  iconHaloBlurTransition?: Transition | Expression;
-  iconTranslate?: Array<number> | Expression;
-  iconTranslateTransition?: Transition | Expression;
-  iconTranslateAnchor?: Alignment | Expression;
-  textOpacity?: number | Expression;
-  textOpacityTransition?: Transition | Expression;
-  textColor?: string | Expression;
-  textColorTransition?: Transition | Expression;
-  textHaloColor?: string | Expression;
-  textHaloColorTransition?: Transition | Expression;
-  textHaloWidth?: number | Expression;
-  textHaloWidthTransition?: Transition | Expression;
-  textHaloBlur?: number | Expression;
-  textHaloBlurTransition?: Transition | Expression;
-  textTranslate?: Array<number> | Expression;
-  textTranslateTransition?: Transition | Expression;
-  textTranslateAnchor?: Alignment | Expression;
-}
+/** @deprecated Will be removed in next betas */
+export type SymbolLayerStyle = SymbolLayerStyleProps;
 
 export interface HeatmapLayerStyle {
   visibility?: Visibility | Expression;
@@ -943,7 +876,7 @@ export interface RasterLayerProps extends LayerBaseProps {
 }
 
 export interface SymbolLayerProps extends LayerBaseProps {
-  style?: StyleProp<SymbolLayerStyle>;
+  style?: SymbolLayerStyleProps;
 }
 
 export interface HeatmapLayerProps extends LayerBaseProps {

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -1,8 +1,8 @@
 import Foundation
-@_spi(Experimental) import MapboxMaps
+import MapboxMaps
 import Turf
 
-protocol RCTMGLMapComponent : class {
+protocol RCTMGLMapComponent : AnyObject {
   func addToMap(_ map: RCTMGLMapView, style: Style)
   func removeFromMap(_ map: RCTMGLMapView)
   
@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
   case flight, ease, linear, none
 }
 
+enum UserTrackingMode: String {
+  case none,compass, course, normal
+}
+
 struct CameraUpdateItem {
   var camera: CameraOptions
   var mode: CameraMode
@@ -25,10 +29,7 @@ struct CameraUpdateItem {
       }
       switch mode {
         case .flight:
-          var _camera = camera
-          _camera.padding = nil
-          map.camera.fly(to: _camera, duration: duration)
-          changePadding(map: map, cameraAnimator: &cameraAnimator, curve: .linear)
+          map.camera.fly(to: camera, duration: duration)
         case .ease:
           map.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
         case .linear:
@@ -38,18 +39,6 @@ struct CameraUpdateItem {
       }
     }
   }
-  
-  /// Padding is not currently animatable on the camera's `fly(to:)` method, so we create a separate animator instead.
-  /// If this changes, remove this and call `fly(to:)` with an unmodified `camera`.
-  func changePadding(map: RCTMGLMapView, cameraAnimator: inout BasicCameraAnimator?, curve: UIView.AnimationCurve) {
-    if let cameraAnimator = cameraAnimator {
-      cameraAnimator.stopAnimation()
-    }
-    cameraAnimator = map.camera.makeAnimator(duration: duration ?? 0, curve: curve) { (transition) in
-      transition.padding.toValue = camera.padding
-    }
-    cameraAnimator?.startAnimation()
-  }
 }
 
 class CameraUpdateQueue {
@@ -133,7 +122,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       _updateCameraFromTrackingMode()
     }
   }
-  @objc var followUserMode: NSString? {
+  @objc var followUserMode: String? {
     didSet {
       _updateCameraFromTrackingMode()
     }
@@ -192,11 +181,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     }
   }
   
+  func _disableUsetTracking(_ map: MapView) {
+    map.viewport.idle()
+    map.location.removeLocationConsumer(consumer: self)
+  }
+
   func _updateCameraFromTrackingMode() {
     withMapView { map in
-      guard self.followUserLocation else {
-        map.viewport.idle()
-        map.location.removeLocationConsumer(consumer: self)
+      let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
+      guard let userTrackingMode = userTrackingMode else {
+        Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
+        self._disableUsetTracking(map)
+        return
+      }
+
+      guard self.followUserLocation && userTrackingMode != .none else {
+        self._disableUsetTracking(map)
         return
       }
 
@@ -207,17 +207,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       map.location.addLocationConsumer(newConsumer: self)
       var trackingModeChanged = false
       var followOptions = FollowPuckViewportStateOptions()
-      if (self.followUserMode == "compass") {
+      switch userTrackingMode {
+      case .none:
+        Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
+      case .compass:
         map.location.options.puckBearingEnabled = true
         map.location.options.puckBearingSource = PuckBearingSource.heading
         followOptions.bearing = FollowPuckViewportStateBearing.heading
         trackingModeChanged = true
-      } else if (self.followUserMode == "course") {
+      case .course:
         map.location.options.puckBearingEnabled = true
         map.location.options.puckBearingSource = PuckBearingSource.course
         followOptions.bearing = FollowPuckViewportStateBearing.course
         trackingModeChanged = true
-      } else if (self.followUserMode == "normal") {
+      case .normal:
         map.location.options.puckBearingEnabled = false
         followOptions.bearing = nil
         trackingModeChanged = true
@@ -436,7 +439,6 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
   }
 }
 
-/// Converts milliseconds to seconds.
 private func toSeconds(_ ms: Double) -> TimeInterval {
   return ms * 0.001
 }

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -69,7 +69,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     return false
   }
   
-  public func sendImageMissingEvent(imageName: String, event: Event) {
+  public func sendImageMissingEvent(imageName: String, payload: StyleImageMissingPayload) {
     let payload = ["imageKey":imageName]
     let event = RCTMGLEvent(type: .imageMissing, payload: payload)
     if let onImageMissing = onImageMissing {
@@ -97,101 +97,3 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
   }()
 
 }
-/*
-#import "RCTMGLImages.h"
-#import "UIView+React.h"
-#import "RCTMGLMapView.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLEvent.h"
-#import "RCTMGLEventTypes.h"
-
-
-@implementation RCTMGLImages : UIView
-
-static UIImage * _placeHolderImage;
-
-- (void)addToMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    [self _addNativeImages:_nativeImages];
-    [self _addRemoteImages:_images];
-}
-
-- (void)removeFromMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    
-    [self _removeImages];
-}
-
-- (void)_removeImages
-{
-    if ([self _hasImages]) {
-        NSArray<NSString *> *imageNames = _images.allKeys;
-        
-        for (NSString *imageName in imageNames) {
-            [self.map.style removeImageForName:imageName];
-        }
-    }
-    
-    if ([self _hasNativeImages]) {
-        for (NSString *imageName in _nativeImages) {
-            [self.map.style removeImageForName:imageName];
-        }
-    }
-}
-
-- (void)_addNativeImages:(NSArray<NSString *>*)nativeImages
-{
-    if (!nativeImages) return;
-
-    for (NSString *imageName in nativeImages) {
-        // only add native images if they are not in the style yet (similar to [RCTMGLUtils fetchImages: style:])
-        if (![self.map.style imageForName:imageName]) {
-            UIImage *image = [UIImage imageNamed:imageName];
-            [self.map.style setImage:image forName:imageName];
-        }
-    }
-}
-
-- (void)_addRemoteImages:(NSDictionary<NSString *, NSString *>*)remoteImages
-{
-    if (!remoteImages) return;
-    NSDictionary<NSString *, NSString *> *missingImages = [NSMutableDictionary new];
-    
-    // Add image placeholder for images that are not yet available in the style. This way
-    // we can load the images asynchronously and add the ShapeSource to the map without delay.
-    // The same is required when this ShapeSource is updated with new/added images and the
-    // data references them. In which case addMissingImageToStyle will take care of loading
-    // them in a similar way.
-    //
-    // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
-    for (NSString *imageName in remoteImages.allKeys) {
-        if (![self.map.style imageForName:imageName]) {
-            [self.map.style setImage:[RCTMGLImages placeholderImage] forName:imageName];
-            [missingImages setValue:_images[imageName] forKey:imageName];
-        }
-    }
-    
-    if (missingImages.count > 0) {
-        // forceUpdate to ensure the placeholder images are updated
-        [RCTMGLUtils fetchImages:_bridge style:self.map.style objects:_images forceUpdate:true callback:^{ }];
-    }
-}
-
-- (BOOL)_hasImages
-{
-    return _images != nil && _images.count > 0;
-}
-
-- (BOOL)_hasNativeImages
-{
-    return _nativeImages != nil && _nativeImages.count > 0;
-}
-
-@end
-*/

package/ios/RCTMGL-v10/RCTMGLLogging.swift

@@ -63,6 +63,14 @@ class Logger {
   static func log(level: LogLevel, message: String, error: Error) {
     sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
   }
+
+  static func error(_ message: String) {
+    log(level: .error, message: message)
+  }
+
+  static func assert(_ message: String) {
+    log(level: .error, message: "Assertion failure: \(message)")
+  }
 }
 
 func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {