@rnmapbox/maps 10.0.0-beta.48 → 10.0.0-beta.53

package/android/.gitignore

@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild

package/android/.npmignore

@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild

package/android/rctmgl/.gitignore

@@ -0,0 +1 @@
+/build

package/android/rctmgl/.npmignore

@@ -0,0 +1 @@
+/build

package/android/rctmgl/build.gradle

@@ -130,8 +130,8 @@ dependencies {
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
         }
         else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
-            implementation 'com.mapbox.maps:android:10.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.4.0'
+            implementation 'com.mapbox.maps:android:10.9.0'
+            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.8.0'
         }
     }
 

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

@@ -299,11 +299,12 @@ public class RCTMGLModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setAccessToken(final String accessToken) {
+    public void setAccessToken(final String accessToken, Promise promise) {
         mReactContext.runOnUiQueueThread(new Runnable() {
             @Override
             public void run() {
                 InstanceManagerImpl.getInstance(getReactApplicationContext(), accessToken);
+                promise.resolve(accessToken);
             }
         });
     }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt

@@ -23,7 +23,10 @@ import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.Layer
 import com.mapbox.maps.extension.style.layers.generated.*
 import com.mapbox.maps.extension.style.layers.getLayer
+import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.extension.style.layers.properties.generated.Visibility
+import com.mapbox.maps.extension.style.projection.generated.Projection
+import com.mapbox.maps.extension.style.projection.generated.setProjection
 import com.mapbox.maps.plugin.annotation.Annotation
 import com.mapbox.maps.plugin.annotation.annotations
 import com.mapbox.maps.plugin.annotation.generated.*
@@ -89,6 +92,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private val mImages: MutableList<RCTMGLImages>
     private var mPointAnnotationManager: PointAnnotationManager? = null
     private var mActiveMarkerID: Long = -1
+    private var mProjection: ProjectionName = ProjectionName.MERCATOR
     private var mStyleURL: String? = null
     val isDestroyed = false
     private var mCamera: RCTMGLCamera? = null
@@ -394,6 +398,16 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         return true
     }
 
+    fun setReactProjection(projection: ProjectionName) {
+        if (projection != null) {
+            mProjection = projection
+        }
+
+        if (mMap != null) {
+            mMap.getStyle()?.setProjection(Projection(projection))
+        }
+    }
+
     fun setReactStyleURL(styleURL: String) {
         mStyleURL = styleURL
         if (mMap != null) {
@@ -401,6 +415,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             if (isJSONValid(mStyleURL)) {
                 mMap.loadStyleJson(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
+                        style.setProjection(Projection(mProjection))
                         addAllFeaturesToMap()
                     }
                 })
@@ -408,6 +423,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                 mMap.loadStyleUri(styleURL, object : Style.OnStyleLoaded {
                     override fun onStyleLoaded(style: Style) {
                         savedStyle = style
+                        style.setProjection(Projection(mProjection))
                         addAllFeaturesToMap()
                     }
                 },

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapViewManager.kt

@@ -11,6 +11,7 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.rctmgl.events.constants.EventKeys
 import com.mapbox.maps.MapboxMap
 import com.facebook.react.common.MapBuilder
+import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.plugin.compass.compass
 import com.mapbox.maps.plugin.gestures.gestures
 import com.mapbox.maps.plugin.logo.logo
@@ -78,7 +79,12 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
         return mViews[reactTag]
     }
 
-    //region React Props
+    // region React Props
+    @ReactProp(name = "projection")
+    fun setProjection(mapView: RCTMGLMapView, projection: String?) {
+        mapView.setReactProjection( if (projection == "globe") ProjectionName.GLOBE else ProjectionName.MERCATOR )
+    }
+
     @ReactProp(name = "styleURL")
     fun setStyleURL(mapView: RCTMGLMapView, styleURL: String?) {
         mapView.setReactStyleURL(styleURL!!)

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

@@ -594,18 +594,6 @@ public class RCTMGLStyleFactory {
             case "fillExtrusionVerticalGradient":
               RCTMGLStyleFactory.setFillExtrusionVerticalGradient(layer, styleValue);
               break;
-            case "fillExtrusionAmbientOcclusionIntensity":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionIntensity(layer, styleValue);
-              break;
-            case "fillExtrusionAmbientOcclusionIntensityTransition":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionIntensityTransition(layer, styleValue);
-              break;
-            case "fillExtrusionAmbientOcclusionRadius":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionRadius(layer, styleValue);
-              break;
-            case "fillExtrusionAmbientOcclusionRadiusTransition":
-              RCTMGLStyleFactory.setFillExtrusionAmbientOcclusionRadiusTransition(layer, styleValue);
-              break;
         }
       }
     }
@@ -2129,38 +2117,6 @@ public class RCTMGLStyleFactory {
       }
     }
 
-    public static void setFillExtrusionAmbientOcclusionIntensity(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      if (styleValue.isExpression()) {
-        layer.fillExtrusionAmbientOcclusionIntensity(styleValue.getExpression());
-      } else {
-          layer.fillExtrusionAmbientOcclusionIntensity(styleValue.getFloat(VALUE_KEY));
-      }
-    }
-
-
-    public static void setFillExtrusionAmbientOcclusionIntensityTransition(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.fillExtrusionAmbientOcclusionIntensityTransition(transition);
-      }
-    }
-
-    public static void setFillExtrusionAmbientOcclusionRadius(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      if (styleValue.isExpression()) {
-        layer.fillExtrusionAmbientOcclusionRadius(styleValue.getExpression());
-      } else {
-          layer.fillExtrusionAmbientOcclusionRadius(styleValue.getFloat(VALUE_KEY));
-      }
-    }
-
-
-    public static void setFillExtrusionAmbientOcclusionRadiusTransition(FillExtrusionLayer layer, RCTMGLStyleValue styleValue) {
-      StyleTransition transition = styleValue.getTransition();
-      if (transition != null) {
-        layer.fillExtrusionAmbientOcclusionRadiusTransition(transition);
-      }
-    }
-
     public static void setVisibility(RasterLayer layer, RCTMGLStyleValue styleValue) {
         layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
     }

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

@@ -1,6 +1,7 @@
 package com.mapbox.rctmgl.modules
 
 import android.os.Handler
+import com.facebook.react.bridge.Promise
 import com.mapbox.maps.extension.style.layers.properties.generated.LineJoin
 import com.mapbox.maps.ResourceOptionsManager.Companion.getDefault
 import com.facebook.react.module.annotations.ReactModule
@@ -112,11 +113,12 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
     }
 
     @ReactMethod
-    fun setAccessToken(accessToken: String?) {
+    fun setAccessToken(accessToken: String?, promise: Promise) {
         mReactContext.runOnUiQueueThread(Runnable {
             getDefault(
                 reactApplicationContext, accessToken
             )
+            promise.resolve(accessToken)
         })
     }
 

package/index.d.ts

@@ -129,7 +129,7 @@ export type OnPressEvent = {
 declare namespace MapboxGL {
   function removeCustomHeader(headerName: string): void;
   function addCustomHeader(headerName: string, headerValue: string): void;
-  function setAccessToken(accessToken: string | null): void;
+  function setAccessToken(accessToken: string | null): Promise<string | null>;
   function setWellKnownTileServer(tileServer: string): void;
   function getAccessToken(): Promise<string>;
   function setTelemetryEnabled(telemetryEnabled: boolean): void;
@@ -526,6 +526,7 @@ export interface MapViewProps extends ViewProps {
   userTrackingMode?: MapboxGL.UserTrackingModes;
   userLocationVerticalAlignment?: number;
   contentInset?: Array<number>;
+  projection?: 'mercator' | 'globe';
   style?: StyleProp<ViewStyle>;
   styleURL?: string;
   styleJSON?: string;

package/ios/RCTMGL/MGLModule.m

@@ -263,7 +263,7 @@ RCT_EXPORT_MODULE();
     };
 }
 
-RCT_EXPORT_METHOD(setAccessToken:(NSString *)accessToken)
+RCT_EXPORT_METHOD(setAccessToken:(NSString *)accessToken  resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
 #ifdef RNMBGL_USE_MAPLIBRE
     if (accessToken.length > 0) {
@@ -272,6 +272,7 @@ RCT_EXPORT_METHOD(setAccessToken:(NSString *)accessToken)
 #else
     [MGLAccountManager setAccessToken:accessToken];
 #endif
+  resolve(accessToken);
 }
 
 RCT_EXPORT_METHOD(setWellKnownTileServer:(NSString*)tileServer)

package/ios/RCTMGL-v10/MGLModule.m

@@ -2,9 +2,11 @@
 
 @interface RCT_EXTERN_MODULE(MGLModule, NSObject)
 
-RCT_EXTERN_METHOD(setAccessToken:)
+RCT_EXTERN_METHOD(setAccessToken:(NSString *)accessToken resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(addCustomHeader:(NSString *)headerName forHeaderValue:(NSString *) headerValue)
 RCT_EXTERN_METHOD(removeCustomHeader:(NSString *)headerName)
 
+RCT_EXTERN_METHOD(setTelemetryEnabled:(BOOL)telemetryEnabled )
+
 @end

package/ios/RCTMGL-v10/MGLModule.swift

@@ -1,5 +1,6 @@
 import Foundation
 import MapboxMaps
+import MapboxMobileEvents
 
 
 let DEFAULT_SOURCE_ID = "composite";
@@ -31,7 +32,11 @@ class MGLModule : NSObject {
       "StyleSource":
         ["DefaultSourceID": DEFAULT_SOURCE_ID],
       "LineJoin":
-        ["Round": LineJoin.round],
+        [
+          "Bevel": LineJoin.bevel.rawValue,
+          "Round": LineJoin.round.rawValue,
+          "Miter": LineJoin.miter.rawValue,
+        ],
       "LocationCallbackName":
         ["Update": RCT_MAPBOX_USER_LOCATION_UPDATE],
       "CameraModes":
@@ -65,8 +70,12 @@ class MGLModule : NSObject {
       return true
   }
 
-  @objc func setAccessToken(_ token: String) {
+  @objc func setAccessToken(
+    _ token: String, 
+    resolver: RCTPromiseResolveBlock,
+    rejecter: RCTPromiseRejectBlock) {
       MGLModule.accessToken = token
+      resolver(token)
   }
 
   @objc func addCustomHeader(_ headerName: String, forHeaderValue headerValue: String ) {
@@ -76,4 +85,8 @@ class MGLModule : NSObject {
   @objc func removeCustomHeader(_ headerName: String) {
     CustomHttpHeaders.shared.customHeaders[headerName] = nil
   }
+  
+  @objc func setTelemetryEnabled(_ telemetryEnabled: Bool) {
+    UserDefaults.mme_configuration().mme_isCollectionEnabled = telemetryEnabled
+  }
 }

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -135,6 +135,14 @@ open class RCTMGLMapView : MapView {
 
   
   // MARK: - React Native properties
+
+  @objc func setReactProjection(_ value: String?) {
+    if let value = value {
+      var projection = StyleProjection(name: value == "globe" ? .globe : .mercator)
+      try! self.mapboxMap.style.setProjection(projection)
+    }
+  }
+  
   
   @objc func setReactAttributionEnabled(_ value: Bool) {
     mapView.ornaments.options.attributionButton.visibility = value ? .visible : .hidden

package/ios/RCTMGL-v10/RCTMGLMapViewManager.m

@@ -21,6 +21,7 @@ RCT_REMAP_VIEW_PROPERTY(scrollEnabled, reactScrollEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(rotateEnabled, reactRotateEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(pitchEnabled, reactPitchEnabled, BOOL)
 
+RCT_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString)
 
 RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString)
 RCT_REMAP_VIEW_PROPERTY(onPress, reactOnPress, RCTBubblingEventBlock)

package/ios/RCTMGL-v10/RCTMGLStyle.swift

@@ -516,14 +516,6 @@ func fillExtrusionLayer(layer: inout FillExtrusionLayer, reactStyle:Dictionary<S
       self.setFillExtrusionBaseTransition(&layer, styleValue:styleValue);
     } else if (prop == "fillExtrusionVerticalGradient") {
       self.setFillExtrusionVerticalGradient(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionIntensity") {
-      self.setFillExtrusionAmbientOcclusionIntensity(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionIntensityTransition") {
-      self.setFillExtrusionAmbientOcclusionIntensityTransition(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionRadius") {
-      self.setFillExtrusionAmbientOcclusionRadius(&layer, styleValue:styleValue);
-    } else if (prop == "fillExtrusionAmbientOcclusionRadiusTransition") {
-      self.setFillExtrusionAmbientOcclusionRadiusTransition(&layer, styleValue:styleValue);
     } else {
       Logger.log(level:.error, message: "Unexpected property \(prop) for layer: fill-extrusion")
     }
@@ -2027,34 +2019,6 @@ func setFillExtrusionVerticalGradient(_ layer: inout FillExtrusionLayer, styleVa
       
 }
 
-func setFillExtrusionAmbientOcclusionIntensity(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-      
-        
-          layer.fillExtrusionAmbientOcclusionIntensity = styleValue.mglStyleValueNumber();
-        
-      
-}
-
-func setFillExtrusionAmbientOcclusionIntensityTransition(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-    layer.fillExtrusionAmbientOcclusionIntensityTransition = styleValue.getTransition();
-}
-
-func setFillExtrusionAmbientOcclusionRadius(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-      
-        
-          layer.fillExtrusionAmbientOcclusionRadius = styleValue.mglStyleValueNumber();
-        
-      
-}
-
-func setFillExtrusionAmbientOcclusionRadiusTransition(_ layer: inout FillExtrusionLayer, styleValue: RCTMGLStyleValue)
-{
-    layer.fillExtrusionAmbientOcclusionRadiusTransition = styleValue.getTransition();
-}
-
 
 
 func setRasterStyleLayerVisibility(_ layer: inout RasterLayer, styleValue: RCTMGLStyleValue)

package/javascript/components/AbstractLayer.tsx

@@ -3,8 +3,8 @@ import React from 'react';
 import { NativeMethods, processColor } from 'react-native';
 
 import { getFilter } from '../utils/filterUtils';
-import { transformStyle } from '../utils/StyleValue';
 import { AllLayerStyleProps, Expression } from '../utils/MapboxStyles';
+import { transformStyle } from '../utils/StyleValue';
 
 type PropsBase = {
   id: string;
@@ -52,6 +52,7 @@ class AbstractLayer<
     if (styleType === 'color') {
       return processColor;
     }
+    return undefined;
   }
 
   getStyle(style: AllLayerStyleProps) {

package/javascript/components/Camera.tsx

@@ -1,3 +1,4 @@
+import { Position } from '@turf/helpers';
 import React, {
   forwardRef,
   memo,
@@ -7,7 +8,6 @@ import React, {
   useRef,
 } from 'react';
 import { NativeModules, requireNativeComponent } from 'react-native';
-import { Position } from '@turf/helpers';
 
 import { MapboxGLEvent } from '../types';
 import { makeLatLngBounds, makePoint } from '../utils/geoUtils';
@@ -234,7 +234,6 @@ export const Camera = memo(
         followHeading,
         defaultSettings,
         allowUpdates = true,
-        triggerKey,
         onUserTrackingModeChange,
       } = props;
 

package/javascript/components/MapView.js

@@ -57,6 +57,11 @@ class MapView extends NativeBridgeComponent(
       PropTypes.number,
     ]),
 
+    /**
+     * The projection used when rendering the map
+     */
+    projection: PropTypes.oneOf(['mercator', 'globe']),
+
     /**
      * Style for wrapping React Native View
      */
@@ -294,6 +299,7 @@ class MapView extends NativeBridgeComponent(
   };
 
   static defaultProps = {
+    projection: 'mercator',
     localizeLabels: false,
     scrollEnabled: true,
     pitchEnabled: true,
@@ -391,21 +397,27 @@ class MapView extends NativeBridgeComponent(
         );
         if (props.onRegionDidChange) {
           console.warn(
-            'rnmapbox/maps: only one of  MapView.onRegionDidChange or onMapIdle is supported',
+            'rnmapbox/maps: only one of MapView.onRegionDidChange or onMapIdle is supported',
           );
         }
       }
       if (addIfHasHandler('CameraChanged')) {
         console.warn(
-          'onCameraChanged is deprecated and will be removed in next beta - please use onRegionWillChange',
+          'onCameraChanged is deprecated and will be removed in next beta - please use onRegionIsChanging',
         );
-        if (props.onRegionWillChange) {
+        if (props.onRegionIsChanging) {
           console.warn(
-            'rnmapbox/maps: only one of MapView.onRegionWillChange or onCameraChanged is supported',
+            'rnmapbox/maps: only one of MapView.onRegionIsChanging or onCameraChanged is supported',
           );
         }
       }
 
+      if (props.onRegionWillChange) {
+        console.warn(
+          'onRegionWillChange is deprecated and will be removed in v10 - please use onRegionIsChanging',
+        );
+      }
+
       this._runNativeCommand('setHandledMapChangedEvents', this._nativeRef, [
         events,
       ]);

package/javascript/components/SymbolLayer.tsx

@@ -82,12 +82,12 @@ export class SymbolLayer extends AbstractLayer<Props, NativeTypeProps> {
   _shouldSnapshot() {
     let isSnapshot = false;
 
-    if (React.Children.count(this.props.children) <= 0) {
+    if (React.Children.count(this.baseProps.children) <= 0) {
       return isSnapshot;
     }
 
-    React.Children.forEach(this.props.children, (child) => {
-      if (child !== undefined && 'type' in child && child.type === View) {
+    React.Children.forEach(this.baseProps.children, (child) => {
+      if (child?.type === View) {
         isSnapshot = true;
       }
     });

package/javascript/index.js

@@ -1,6 +1,6 @@
 import { NativeModules } from 'react-native';
 
-import { Camera, UserTrackingModes } from './components/Camera';
+import { Camera, UserTrackingMode } from './components/Camera';
 import { Atmosphere } from './components/Atmosphere';
 import MapView from './components/MapView';
 import Light from './components/Light';
@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };
 
 // static methods
 MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
-MapboxGL.UserTrackingModes = UserTrackingModes;
+MapboxGL.UserTrackingModes = UserTrackingMode;
 
 // components
 MapboxGL.MapView = MapView;

package/javascript/requestAndroidLocationPermissions.ts

@@ -1,5 +1,4 @@
-import { number } from 'prop-types';
-import { PermissionsAndroid, Permission } from 'react-native';
+import { Permission, PermissionsAndroid } from 'react-native';
 
 import { isAndroid } from './utils';
 

package/javascript/utils/{MapboxStyles.ts → MapboxStyles.d.ts}

@@ -1258,24 +1258,6 @@ export interface FillExtrusionLayerStyleProps {
    * Whether to apply a vertical gradient to the sides of a fillExtrusion layer. If true, sides will be shaded slightly darker farther down.
    */
   fillExtrusionVerticalGradient?: Value<boolean, ['zoom']>;
-  /**
-   * Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionIntensity?: Value<number, ['zoom']>;
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionIntensity property.
-   */
-  fillExtrusionAmbientOcclusionIntensityTransition?: Transition;
-  /**
-   * The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionRadius?: Value<number, ['zoom']>;
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionRadius property.
-   */
-  fillExtrusionAmbientOcclusionRadiusTransition?: Transition;
 }
 export interface RasterLayerStyleProps {
   /**

package/javascript/utils/StyleValue.ts

@@ -1,16 +1,11 @@
-import {
-  Image,
-  ImageResolvedAssetSource,
-  processColor,
-  ProcessedColorValue,
-} from 'react-native';
+import { Image, processColor } from 'react-native';
 
-import { getStyleType } from './styleMap';
 import BridgeValue, {
-  type StyleValueJSON,
   type RawValueType,
+  type StyleValueJSON,
 } from './BridgeValue';
 import { AllLayerStyleProps } from './MapboxStyles';
+import { getStyleType } from './styleMap';
 
 export type StyleValue = {
   styletype: string;

package/javascript/utils/styleMap.ts

@@ -1196,38 +1196,6 @@ export const FillExtrusionLayerStyleProp = PropTypes.shape({
     PropTypes.bool,
     PropTypes.array,
   ]),
-
-  /**
-   * Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionIntensity: PropTypes.oneOfType([
-    PropTypes.number,
-    PropTypes.array,
-  ]),
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionIntensity property.
-   */
-  fillExtrusionAmbientOcclusionIntensityTransition: PropTypes.shape({
-    duration: PropTypes.number,
-    delay: PropTypes.number,
-  }),
-
-  /**
-   * The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a lowCost bestEffort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.
-   */
-  fillExtrusionAmbientOcclusionRadius: PropTypes.oneOfType([
-    PropTypes.number,
-    PropTypes.array,
-  ]),
-
-  /**
-   * The transition affecting any changes to this layer’s fillExtrusionAmbientOcclusionRadius property.
-   */
-  fillExtrusionAmbientOcclusionRadiusTransition: PropTypes.shape({
-    duration: PropTypes.number,
-    delay: PropTypes.number,
-  }),
 });
 
 export const RasterLayerStyleProp = PropTypes.shape({
@@ -1847,10 +1815,6 @@ const styleMap = {
   fillExtrusionBase: StyleTypes.Constant,
   fillExtrusionBaseTransition: StyleTypes.Transition,
   fillExtrusionVerticalGradient: StyleTypes.Constant,
-  fillExtrusionAmbientOcclusionIntensity: StyleTypes.Constant,
-  fillExtrusionAmbientOcclusionIntensityTransition: StyleTypes.Transition,
-  fillExtrusionAmbientOcclusionRadius: StyleTypes.Constant,
-  fillExtrusionAmbientOcclusionRadiusTransition: StyleTypes.Transition,
 
   rasterOpacity: StyleTypes.Constant,
   rasterOpacityTransition: StyleTypes.Transition,