react-native-maps 1.21.0-alpha.73 → 1.21.0-alpha.75

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsMapViewManagerDelegate.java

@@ -163,6 +163,9 @@ public class RNMapsMapViewManagerDelegate<T extends View, U extends BaseViewMana
       case "zoomEnabled":
         mViewManager.setZoomEnabled(view, value == null ? true : (boolean) value);
         break;
+      case "showsTraffic":
+        mViewManager.setShowsTraffic(view, value == null ? false : (boolean) value);
+        break;
       case "zoomTapEnabled":
         mViewManager.setZoomTapEnabled(view, value == null ? true : (boolean) value);
         break;
@@ -195,6 +198,9 @@ public class RNMapsMapViewManagerDelegate<T extends View, U extends BaseViewMana
       case "fitToCoordinates":
         mViewManager.fitToCoordinates(view, args.getString(0), args.getString(1), args.getBoolean(2));
         break;
+      case "setIndoorActiveLevelIndex":
+        mViewManager.setIndoorActiveLevelIndex(view, args.getInt(0));
+        break;
     }
   }
 }

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsMapViewManagerInterface.java

@@ -60,6 +60,7 @@ public interface RNMapsMapViewManagerInterface<T extends View> {
   void setUserLocationUpdateInterval(T view, int value);
   void setZoomControlEnabled(T view, boolean value);
   void setZoomEnabled(T view, boolean value);
+  void setShowsTraffic(T view, boolean value);
   void setZoomTapEnabled(T view, boolean value);
   void setCameraZoomRange(T view, @Nullable ReadableMap value);
   void animateToRegion(T view, String regionJSON, int duration);
@@ -68,4 +69,5 @@ public interface RNMapsMapViewManagerInterface<T extends View> {
   void fitToElements(T view, String edgePaddingJSON, boolean animated);
   void fitToSuppliedMarkers(T view, String markersJSON, String edgePaddingJSON, boolean animated);
   void fitToCoordinates(T view, String coordinatesJSON, String edgePaddingJSON, boolean animated);
+  void setIndoorActiveLevelIndex(T view, int activeLevelIndex);
 }

package/android/generated/jni/react/renderer/components/RNMapsSpecs/EventEmitters.cpp

@@ -39,10 +39,10 @@ void RNMapsGoogleMapViewEventEmitter::onIndoorBuildingFocused(OnIndoorBuildingFo
   dispatchEvent("indoorBuildingFocused", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     {
-  auto IndoorBuilding = jsi::Object(runtime);
-  IndoorBuilding.setProperty(runtime, "underground", $event.IndoorBuilding.underground);
-  IndoorBuilding.setProperty(runtime, "activeLevelIndex", $event.IndoorBuilding.activeLevelIndex);
-  $payload.setProperty(runtime, "IndoorBuilding", IndoorBuilding);
+  auto indoorBuilding = jsi::Object(runtime);
+  indoorBuilding.setProperty(runtime, "underground", $event.indoorBuilding.underground);
+  indoorBuilding.setProperty(runtime, "activeLevelIndex", $event.indoorBuilding.activeLevelIndex);
+  $payload.setProperty(runtime, "indoorBuilding", indoorBuilding);
 }
     return $payload;
   });
@@ -53,11 +53,11 @@ void RNMapsGoogleMapViewEventEmitter::onIndoorLevelActivated(OnIndoorLevelActiva
   dispatchEvent("indoorLevelActivated", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     {
-  auto IndoorLevel = jsi::Object(runtime);
-  IndoorLevel.setProperty(runtime, "activeLevelIndex", $event.IndoorLevel.activeLevelIndex);
-  IndoorLevel.setProperty(runtime, "name", $event.IndoorLevel.name);
-  IndoorLevel.setProperty(runtime, "shortName", $event.IndoorLevel.shortName);
-  $payload.setProperty(runtime, "IndoorLevel", IndoorLevel);
+  auto indoorLevel = jsi::Object(runtime);
+  indoorLevel.setProperty(runtime, "activeLevelIndex", $event.indoorLevel.activeLevelIndex);
+  indoorLevel.setProperty(runtime, "name", $event.indoorLevel.name);
+  indoorLevel.setProperty(runtime, "shortName", $event.indoorLevel.shortName);
+  $payload.setProperty(runtime, "indoorLevel", indoorLevel);
 }
     return $payload;
   });

package/android/generated/jni/react/renderer/components/RNMapsSpecs/EventEmitters.h

@@ -45,7 +45,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
     };
 
   struct OnIndoorBuildingFocused {
-      OnIndoorBuildingFocusedIndoorBuilding IndoorBuilding;
+      OnIndoorBuildingFocusedIndoorBuilding indoorBuilding;
     };
 
   struct OnIndoorLevelActivatedIndoorLevel {
@@ -55,7 +55,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
     };
 
   struct OnIndoorLevelActivated {
-      OnIndoorLevelActivatedIndoorLevel IndoorLevel;
+      OnIndoorLevelActivatedIndoorLevel indoorLevel;
     };
 
   struct OnKmlReady {

package/android/generated/jni/react/renderer/components/RNMapsSpecs/Props.cpp

@@ -125,6 +125,7 @@ RNMapsMapViewProps::RNMapsMapViewProps(
     userLocationUpdateInterval(convertRawProp(context, rawProps, "userLocationUpdateInterval", sourceProps.userLocationUpdateInterval, {5000})),
     zoomControlEnabled(convertRawProp(context, rawProps, "zoomControlEnabled", sourceProps.zoomControlEnabled, {true})),
     zoomEnabled(convertRawProp(context, rawProps, "zoomEnabled", sourceProps.zoomEnabled, {true})),
+    showsTraffic(convertRawProp(context, rawProps, "showsTraffic", sourceProps.showsTraffic, {false})),
     zoomTapEnabled(convertRawProp(context, rawProps, "zoomTapEnabled", sourceProps.zoomTapEnabled, {true})),
     cameraZoomRange(convertRawProp(context, rawProps, "cameraZoomRange", sourceProps.cameraZoomRange, {}))
       {}

package/android/generated/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -888,6 +888,7 @@ class RNMapsMapViewProps final : public ViewProps {
   int userLocationUpdateInterval{5000};
   bool zoomControlEnabled{true};
   bool zoomEnabled{true};
+  bool showsTraffic{false};
   bool zoomTapEnabled{true};
   RNMapsMapViewCameraZoomRangeStruct cameraZoomRange{};
 };

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -105,7 +105,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
                     options.maxZoomPreference(initialProps.getInt("maxZoom", 0));
                 }
             }
-            if (initialProps.hasKey("userInterfaceStyle")){
+            if (initialProps.hasKey("userInterfaceStyle") && !initialProps.hasKey("liteMode")){
                 String style = initialProps.getString("userInterfaceStyle");
                 if ("system".equals(style)) {
                     options.mapColorScheme(MapColorScheme.FOLLOW_SYSTEM);
@@ -480,6 +480,11 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
         view.setZoomEnabled(value);
     }
 
+    @Override
+    public void setShowsTraffic(MapView view, boolean value) {
+        view.setShowsTraffic(value);
+    }
+
     @Override
     public void setZoomTapEnabled(MapView view, boolean value) {
         // not supported
@@ -585,6 +590,11 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
         }
     }
 
+    @Override
+    public void setIndoorActiveLevelIndex(MapView view, int activeLevelIndex) {
+        view.setIndoorActiveLevelIndex(activeLevelIndex);
+    }
+
     @Override
     public void onDropViewInstance(MapView view) {
         super.onDropViewInstance(view);

package/android/src/main/java/com/rnmaps/fabric/event/OnDoublePressEvent.java

@@ -0,0 +1,27 @@
+package com.rnmaps.fabric.event;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnDoublePressEvent extends Event<OnDoublePressEvent> {
+    public static final String EVENT_NAME = "topDoublePress";
+    private final WritableMap payload;
+
+    public OnDoublePressEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @NonNull
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnIndoorBuildingFocusedEvent.java

@@ -0,0 +1,28 @@
+package com.rnmaps.fabric.event;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnIndoorBuildingFocusedEvent extends Event<OnIndoorBuildingFocusedEvent> {
+    public static final String EVENT_NAME = "topIndoorBuildingFocused";
+
+    private final WritableMap payload;
+
+    public OnIndoorBuildingFocusedEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @NonNull
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnIndoorLevelActivatedEvent.java

@@ -0,0 +1,28 @@
+package com.rnmaps.fabric.event;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnIndoorLevelActivatedEvent extends Event<OnIndoorLevelActivatedEvent> {
+    public static final String EVENT_NAME = "topIndoorLevelActivated";
+
+    private final WritableMap payload;
+
+    public OnIndoorLevelActivatedEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @NonNull
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -2,13 +2,16 @@ package com.rnmaps.maps;
 
 import static androidx.core.content.PermissionChecker.checkSelfPermission;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.location.Location;
-import android.util.Log;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -26,7 +29,6 @@ import androidx.core.view.MotionEventCompat;
 import com.facebook.react.common.MapBuilder;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -84,7 +86,7 @@ import java.util.concurrent.ExecutionException;
 import com.rnmaps.fabric.event.*;
 
 public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter,
-        GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
+        GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener, DefaultLifecycleObserver {
     public GoogleMap map;
     private MarkerManager markerManager;
     private MarkerManager.Collection markerCollection;
@@ -109,6 +111,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private CameraUpdate cameraToSet;
     private boolean setPaddingDeferred = false;
     private boolean showUserLocation = false;
+
+    private boolean showsTraffic = false;
+
     private boolean handlePanDrag = false;
     private boolean moveOnMarkerPress = true;
     private boolean cacheEnabled = false;
@@ -136,7 +141,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private final Map<TileOverlay, MapHeatmap> heatmapMap = new HashMap<>();
     private final Map<TileOverlay, MapGradientPolyline> gradientPolylineMap = new HashMap<>();
     private final GestureDetectorCompat gestureDetector;
-    private LifecycleEventListener lifecycleListener;
     private boolean paused = false;
     private boolean destroyed = false;
     private final ThemedReactContext context;
@@ -188,13 +192,65 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         return superContext;
     }
 
+
+@Override
+public void onCreate(LifecycleOwner owner) {
+    super.onCreate(null);
+}
+
+    @Override
+    public void onStart(LifecycleOwner owner) {
+        super.onStart();
+    }
+    @Override
+    public void onResume(LifecycleOwner owner) {
+        if (hasPermissions() && map != null) {
+            //noinspection MissingPermission
+            map.setMyLocationEnabled(showUserLocation);
+            map.setLocationSource(fusedLocationSource);
+        }
+        synchronized (MapView.this) {
+            if (!destroyed) {
+                MapView.this.onResume();
+            }
+            paused = false;
+        }
+    }
+
+
+    @Override
+    public void onPause(LifecycleOwner owner){
+        super.onPause();
+        if (hasPermissions() && map != null) {
+            //noinspection MissingPermission
+            map.setMyLocationEnabled(false);
+        }
+        synchronized (MapView.this) {
+            if (!destroyed) {
+                MapView.this.onPause();
+            }
+            paused = true;
+        }
+    }
+
+    @Override
+    public void onStop(LifecycleOwner owner) {
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroy(LifecycleOwner owner){
+        MapView.this.doDestroy();
+    }
+
     public MapView(ThemedReactContext context,
                    GoogleMapOptions googleMapOptions) {
         super(context, googleMapOptions);
-        // todo add support for legacy renderer
         this.context = context;
-        super.onCreate(null);
-        super.onResume();
+        Activity activity = context.getCurrentActivity();
+        if (activity instanceof LifecycleOwner) {
+          ((LifecycleOwner) activity).getLifecycle().addObserver(this);
+        }
         super.getMapAsync(this);
 
         final MapView view = this;
@@ -279,6 +335,13 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         return null;
     }
 
+    public void setShowsTraffic(boolean value) {
+        showsTraffic = value;
+        if (map != null){
+            map.setTrafficEnabled(value);
+        }
+    }
+
 
     @FunctionalInterface
     public interface EventCreator<T extends Event> {
@@ -522,50 +585,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             MapView.this.cacheView();
         });
 
-        // We need to be sure to disable location-tracking when app enters background, in-case some
-        // other module
-        // has acquired a wake-lock and is controlling location-updates, otherwise, location-manager
-        // will be left
-        // updating location constantly, killing the battery, even though some other location-mgmt
-        // module may
-        // desire to shut-down location-services.
-        lifecycleListener = new LifecycleEventListener() {
-            @Override
-            public void onHostResume() {
-                if (hasPermissions() && map != null) {
-                    //noinspection MissingPermission
-                    map.setMyLocationEnabled(showUserLocation);
-                    map.setLocationSource(fusedLocationSource);
-                }
-                synchronized (MapView.this) {
-                    if (!destroyed) {
-                        MapView.this.onResume();
-                    }
-                    paused = false;
-                }
-            }
 
-            @Override
-            public void onHostPause() {
-                if (hasPermissions() && map != null) {
-                    //noinspection MissingPermission
-                    map.setMyLocationEnabled(false);
-                }
-                synchronized (MapView.this) {
-                    if (!destroyed) {
-                        MapView.this.onPause();
-                    }
-                    paused = true;
-                }
-            }
+        map.setTrafficEnabled(showsTraffic);
 
-            @Override
-            public void onHostDestroy() {
-                MapView.this.doDestroy();
-            }
-        };
 
-        context.addLifecycleEventListener(lifecycleListener);
         isMapReady = true;
         if (kmlSrc != null){
             setKmlSrc(kmlSrc);
@@ -624,8 +647,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         builder.put(OnMarkerDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragEndEvent.EVENT_NAME));
         builder.put(OnPoiClickEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPoiClickEvent.EVENT_NAME));
         builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnLongPressEvent.EVENT_NAME));
-        builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeStartEvent.EVENT_NAME));
-        builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeCompleteEvent.EVENT_NAME));
+        builder.put(OnRegionChangeStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeStartEvent.EVENT_NAME));
+        builder.put(OnDoublePressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDoublePressEvent.EVENT_NAME));
         return builder.build();
     }
 
@@ -633,7 +656,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         return MapBuilder.of(
                 OnMapReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapReadyEvent.EVENT_NAME),
                 OnUserLocationChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnUserLocationChangeEvent.EVENT_NAME),
-                OnRegionChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeEvent.EVENT_NAME)
+                OnRegionChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeEvent.EVENT_NAME),
+                OnIndoorBuildingFocusedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorBuildingFocusedEvent.EVENT_NAME),
+                OnIndoorLevelActivatedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorLevelActivatedEvent.EVENT_NAME)
         );
     }
 
@@ -647,9 +672,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         }
         destroyed = true;
 
-        if (lifecycleListener != null && context != null) {
-            context.removeLifecycleEventListener(lifecycleListener);
-            lifecycleListener = null;
+        Activity activity = context.getCurrentActivity();
+        if (activity instanceof LifecycleOwner) {
+            ((LifecycleOwner) activity).getLifecycle().removeObserver(this);
         }
         if (!paused) {
             onPause();
@@ -1592,7 +1617,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         LatLng coords = this.map.getProjection().fromScreenLocation(point);
         WritableMap event = makeClickEventData(coords);
         // todo: use Fabric events
-        // manager.pushEvent(context, this, "onDoublePress", event);
+        dispatchEvent(event, OnDoublePressEvent::new);
+
     }
 
     public void setKmlSrc(String kmlSrc) {
@@ -1717,9 +1743,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             indoorBuilding.putInt("activeLevelIndex", building.getActiveLevelIndex());
             indoorBuilding.putBoolean("underground", building.isUnderground());
 
-            event.putMap("IndoorBuilding", indoorBuilding);
-            // todo: use Fabric events
-            // manager.pushEvent(context, this, "onIndoorBuildingFocused", event);
+            event.putMap("indoorBuilding", indoorBuilding);
+            dispatchEvent(event, OnIndoorBuildingFocusedEvent::new);
         } else {
             WritableMap event = Arguments.createMap();
             WritableArray levelsArray = Arguments.createArray();
@@ -1728,9 +1753,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             indoorBuilding.putInt("activeLevelIndex", 0);
             indoorBuilding.putBoolean("underground", false);
 
-            event.putMap("IndoorBuilding", indoorBuilding);
-            // todo: use Fabric events
-            // manager.pushEvent(context, this, "onIndoorBuildingFocused", event);
+            event.putMap("indoorBuilding", indoorBuilding);
+            dispatchEvent(event, OnIndoorBuildingFocusedEvent::new);
         }
     }
 
@@ -1752,9 +1776,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         indoorlevel.putString("name", level.getName());
         indoorlevel.putString("shortName", level.getShortName());
 
-        event.putMap("IndoorLevel", indoorlevel);
-        // todo: use Fabric events
-        // manager.pushEvent(context, this, "onIndoorLevelActivated", event);
+        event.putMap("indoorLevel", indoorlevel);
+        dispatchEvent(event, OnIndoorLevelActivatedEvent::new);
     }
 
     public void setIndoorActiveLevelIndex(int activeLevelIndex) {

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -1193,7 +1193,7 @@ id regionAsJSON(MKCoordinateRegion region) {
         return;
     }
     self.onIndoorBuildingFocused(@{
-        @"IndoorBuilding": @{
+        @"indoorBuilding": @{
                 @"activeLevelIndex": @(building.defaultLevelIndex),
                 @"underground": @(building.underground),
                 @"levels": arrayLevels
@@ -1213,7 +1213,7 @@ id regionAsJSON(MKCoordinateRegion region) {
         i++;
     }
     self.onIndoorLevelActivated(@{
-        @"IndoorLevel": @{
+        @"indoorLevel": @{
                 @"activeLevelIndex": @(i),
                 @"name": level.name,
                 @"shortName": level.shortName

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -86,6 +86,16 @@ using namespace facebook::react;
 
     [_view fitToCoordinates:coordinatesArray withEdgePadding:edgePadding animated:animated];
 }
+- (void) setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex
+{
+    if (!_view.indoorDisplay) {
+      return;
+    }
+    if ( activeLevelIndex < [_view.indoorDisplay.activeBuilding.levels count]) {
+        _view.indoorDisplay.activeLevel = _view.indoorDisplay.activeBuilding.levels[activeLevelIndex];
+    }
+    
+}
 
 #pragma mark - Native commands
 
@@ -184,6 +194,40 @@ using namespace facebook::react;
               mapViewEventEmitter->onMapReady(data);
           }
       };
+    
+    _view.onIndoorLevelActivated = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
+
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorLevelActivatedIndoorLevel level = {
+                .activeLevelIndex= (int) [dictionary[@"activeLevelIndex"] integerValue],
+                .name = [dictionary[@"name"] UTF8String],
+                .shortName = [dictionary[@"shortName"] UTF8String],
+            };
+            
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorLevelActivated data = {
+                .indoorLevel = level,
+            };
+            mapViewEventEmitter->onIndoorLevelActivated(data);
+        }
+    };
+    
+    _view.onIndoorBuildingFocused = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
+
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorBuildingFocused building = {
+                .activeLevelIndex= (int) [dictionary[@"activeLevelIndex"] integerValue],
+                .name = [dictionary[@"name"] UTF8String],
+                .shortName = [dictionary[@"shortName"] UTF8String],
+            };
+            
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorBuildingFocused data = {
+                .indoorLevel = level,
+            };
+            mapViewEventEmitter->onIndoorLevelActivated(data);
+        }
+    };
 
     _view.onMapLoaded = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {

package/ios/AirMaps/RNMapsMapView.mm

@@ -92,6 +92,11 @@ using namespace facebook::react;
 
 }
 
+- (void) setIndoorActiveLevelIndex:(NSInteger) activeLevelIndex
+{
+    // do nothing (google only)
+}
+
 #pragma mark - Native commands
 
 - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args

package/ios/generated/RNMapsSpecs/EventEmitters.cpp

@@ -39,10 +39,10 @@ void RNMapsGoogleMapViewEventEmitter::onIndoorBuildingFocused(OnIndoorBuildingFo
   dispatchEvent("indoorBuildingFocused", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     {
-  auto IndoorBuilding = jsi::Object(runtime);
-  IndoorBuilding.setProperty(runtime, "underground", $event.IndoorBuilding.underground);
-  IndoorBuilding.setProperty(runtime, "activeLevelIndex", $event.IndoorBuilding.activeLevelIndex);
-  $payload.setProperty(runtime, "IndoorBuilding", IndoorBuilding);
+  auto indoorBuilding = jsi::Object(runtime);
+  indoorBuilding.setProperty(runtime, "underground", $event.indoorBuilding.underground);
+  indoorBuilding.setProperty(runtime, "activeLevelIndex", $event.indoorBuilding.activeLevelIndex);
+  $payload.setProperty(runtime, "indoorBuilding", indoorBuilding);
 }
     return $payload;
   });
@@ -53,11 +53,11 @@ void RNMapsGoogleMapViewEventEmitter::onIndoorLevelActivated(OnIndoorLevelActiva
   dispatchEvent("indoorLevelActivated", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     {
-  auto IndoorLevel = jsi::Object(runtime);
-  IndoorLevel.setProperty(runtime, "activeLevelIndex", $event.IndoorLevel.activeLevelIndex);
-  IndoorLevel.setProperty(runtime, "name", $event.IndoorLevel.name);
-  IndoorLevel.setProperty(runtime, "shortName", $event.IndoorLevel.shortName);
-  $payload.setProperty(runtime, "IndoorLevel", IndoorLevel);
+  auto indoorLevel = jsi::Object(runtime);
+  indoorLevel.setProperty(runtime, "activeLevelIndex", $event.indoorLevel.activeLevelIndex);
+  indoorLevel.setProperty(runtime, "name", $event.indoorLevel.name);
+  indoorLevel.setProperty(runtime, "shortName", $event.indoorLevel.shortName);
+  $payload.setProperty(runtime, "indoorLevel", indoorLevel);
 }
     return $payload;
   });

package/ios/generated/RNMapsSpecs/EventEmitters.h

@@ -45,7 +45,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
     };
 
   struct OnIndoorBuildingFocused {
-      OnIndoorBuildingFocusedIndoorBuilding IndoorBuilding;
+      OnIndoorBuildingFocusedIndoorBuilding indoorBuilding;
     };
 
   struct OnIndoorLevelActivatedIndoorLevel {
@@ -55,7 +55,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
     };
 
   struct OnIndoorLevelActivated {
-      OnIndoorLevelActivatedIndoorLevel IndoorLevel;
+      OnIndoorLevelActivatedIndoorLevel indoorLevel;
     };
 
   struct OnKmlReady {

package/ios/generated/RNMapsSpecs/Props.cpp

@@ -125,6 +125,7 @@ RNMapsMapViewProps::RNMapsMapViewProps(
     userLocationUpdateInterval(convertRawProp(context, rawProps, "userLocationUpdateInterval", sourceProps.userLocationUpdateInterval, {5000})),
     zoomControlEnabled(convertRawProp(context, rawProps, "zoomControlEnabled", sourceProps.zoomControlEnabled, {true})),
     zoomEnabled(convertRawProp(context, rawProps, "zoomEnabled", sourceProps.zoomEnabled, {true})),
+    showsTraffic(convertRawProp(context, rawProps, "showsTraffic", sourceProps.showsTraffic, {false})),
     zoomTapEnabled(convertRawProp(context, rawProps, "zoomTapEnabled", sourceProps.zoomTapEnabled, {true})),
     cameraZoomRange(convertRawProp(context, rawProps, "cameraZoomRange", sourceProps.cameraZoomRange, {}))
       {}

package/ios/generated/RNMapsSpecs/Props.h

@@ -888,6 +888,7 @@ class RNMapsMapViewProps final : public ViewProps {
   int userLocationUpdateInterval{5000};
   bool zoomControlEnabled{true};
   bool zoomEnabled{true};
+  bool showsTraffic{false};
   bool zoomTapEnabled{true};
   RNMapsMapViewCameraZoomRangeStruct cameraZoomRange{};
 };

package/ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h

@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)fitToElements:(NSString *)edgePaddingJSON animated:(BOOL)animated;
 - (void)fitToSuppliedMarkers:(NSString *)markersJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated;
 - (void)fitToCoordinates:(NSString *)coordinatesJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated;
+- (void)setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex;
 @end
 
 RCT_EXTERN inline void RCTRNMapsGoogleMapViewHandleCommand(
@@ -203,6 +204,26 @@ NSObject *arg2 = args[2];
   return;
 }
 
+if ([commandName isEqualToString:@"setIndoorActiveLevelIndex"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMapView", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"number", @"RNMapsGoogleMapView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  NSInteger activeLevelIndex = [(NSNumber *)arg0 intValue];
+
+  [componentView setIndoorActiveLevelIndex:activeLevelIndex];
+  return;
+}
+
 #if RCT_DEBUG
   RCTLogError(@"%@ received command %@, which is not a supported command.", @"RNMapsGoogleMapView", commandName);
 #endif
@@ -219,6 +240,7 @@ NSObject *arg2 = args[2];
 - (void)fitToElements:(NSString *)edgePaddingJSON animated:(BOOL)animated;
 - (void)fitToSuppliedMarkers:(NSString *)markersJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated;
 - (void)fitToCoordinates:(NSString *)coordinatesJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated;
+- (void)setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex;
 @end
 
 RCT_EXTERN inline void RCTRNMapsMapViewHandleCommand(
@@ -402,6 +424,26 @@ NSObject *arg2 = args[2];
   return;
 }
 
+if ([commandName isEqualToString:@"setIndoorActiveLevelIndex"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsMapView", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"number", @"RNMapsMapView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  NSInteger activeLevelIndex = [(NSNumber *)arg0 intValue];
+
+  [componentView setIndoorActiveLevelIndex:activeLevelIndex];
+  return;
+}
+
 #if RCT_DEBUG
   RCTLogError(@"%@ received command %@, which is not a supported command.", @"RNMapsMapView", commandName);
 #endif

package/lib/MapView.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Animated as RNAnimated, Animated, NativeSyntheticEvent, ViewProps } from 'react-native';
 import { CalloutPressEvent, ClickEvent, Frame, LatLng, MarkerDeselectEvent, MarkerDragEvent, MarkerDragStartEndEvent, MarkerPressEvent, MarkerSelectEvent, Point, Provider, Region } from './sharedTypes';
-import { Address, BoundingBox, Camera, CameraZoomRange, ChangeEvent, Details, EdgePadding, FitToOptions, IndoorBuildingEvent, IndoorLevelActivatedEvent, KmlMapEvent, LongPressEvent, MapPressEvent, MapStyleElement, MapType, MapTypes, PanDragEvent, PoiClickEvent, SnapshotOptions, UserLocationChangeEvent } from './MapView.types';
+import { ActiveIndoorLevel, Address, BoundingBox, Camera, CameraZoomRange, ChangeEvent, Details, EdgePadding, FitToOptions, IndoorBuilding, KmlMapEvent, LongPressEvent, MapPressEvent, MapStyleElement, MapType, MapTypes, PanDragEvent, PoiClickEvent, SnapshotOptions, UserLocationChangeEvent } from './MapView.types';
 import { Modify } from './sharedTypesInternal';
 import { MapViewNativeComponentType } from './MapViewNativeComponent';
 import AnimatedRegion from './AnimatedRegion';
@@ -217,14 +217,14 @@ export type MapViewProps = ViewProps & {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    onIndoorBuildingFocused?: (event: IndoorBuildingEvent) => void;
+    onIndoorBuildingFocused?: (indoorBuilding: IndoorBuilding) => void;
     /**
      * Callback that is called when a level on indoor building is activated
      *
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    onIndoorLevelActivated?: (event: IndoorLevelActivatedEvent) => void;
+    onIndoorLevelActivated?: (indoorLevel: ActiveIndoorLevel) => void;
     /**
      * Callback that is called once the kml is fully loaded.
      *
@@ -619,7 +619,7 @@ declare class MapView extends React.Component<MapViewProps, State> {
      */
     getMapBoundaries(): Promise<BoundingBox>;
     setMapBoundaries(northEast: LatLng, southWest: LatLng): void;
-    setIndoorActiveLevelIndex(activeLevelIndex: number): void;
+    setIndoorActiveLevelIndex(activeLevelIndex: number): void | Promise<never>;
     /**
      * Takes a snapshot of the map and saves it to a picture
      * file or returns the image as a base64 encoded string.
@@ -693,6 +693,8 @@ declare class MapView extends React.Component<MapViewProps, State> {
     private handleMarkerDeselect;
     private handleRegionChange;
     private handleRegionChangeStarted;
+    private handleIndoorBuildingFocused;
+    private handleIndoorLevelActivated;
     private handleRegionChangeComplete;
     render(): React.JSX.Element;
 }

package/lib/MapView.js

@@ -167,9 +167,10 @@ class MapView extends React.Component {
         }
     }
     setIndoorActiveLevelIndex(activeLevelIndex) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setIndoorActiveLevelIndex(this.map.current, activeLevelIndex);
+        if (this.fabricMap.current) {
+            return this.fabricMap.current.setIndoorActiveLevelIndex(activeLevelIndex);
         }
+        return Promise.reject('getMapBoundaries not supported on this platform');
     }
     /**
      * Takes a snapshot of the map and saves it to a picture
@@ -340,6 +341,16 @@ class MapView extends React.Component {
             this.props.onRegionChangeStart(event);
         }
     };
+    handleIndoorBuildingFocused = (event) => {
+        if (this.props.onIndoorBuildingFocused) {
+            this.props.onIndoorBuildingFocused(event);
+        }
+    };
+    handleIndoorLevelActivated = (event) => {
+        if (this.props.onIndoorLevelActivated) {
+            this.props.onIndoorLevelActivated(event);
+        }
+    };
     handleRegionChangeComplete = (event) => {
         const isGesture = event.nativeEvent.isGesture;
         const details = { isGesture };
@@ -368,6 +379,9 @@ class MapView extends React.Component {
             onRegionChange: this.handleRegionChange,
             onRegionChangeStart: this.handleRegionChangeStarted,
             onRegionChangeComplete: this.handleRegionChangeComplete,
+            onIndoorBuildingFocused: this.handleIndoorBuildingFocused,
+            // @ts-ignore
+            onIndoorLevelActivated: this.handleIndoorLevelActivated,
             ...restProps,
         };
         if (this.props.region) {

package/lib/MapView.types.d.ts

@@ -46,7 +46,7 @@ export type ActiveIndoorLevel = {
     shortName: string;
 };
 export type IndoorLevelActivatedEvent = NativeSyntheticEvent<{
-    IndoorLevel: ActiveIndoorLevel;
+    indoorLevel: ActiveIndoorLevel;
 }>;
 export type IndoorBuilding = {
     underground: boolean;

package/lib/createFabricMap.d.ts

@@ -18,6 +18,7 @@ export interface FabricMapHandle {
     getAddressFromCoordinates: (coordinate: LatLng) => Promise<Address>;
     getPointForCoordinate: (coordinate: LatLng) => Promise<Point>;
     getCoordinateForPoint: (point: Point) => Promise<LatLng>;
+    setIndoorActiveLevelIndex: (activeLevelIndex: number) => void;
 }
 declare const createFabricMap: (ViewComponent: React.ComponentType, Commands: any) => React.ForwardRefExoticComponent<MapFabricNativeProps & React.RefAttributes<FabricMapHandle>>;
 export default createFabricMap;

package/lib/createFabricMap.js

@@ -154,6 +154,19 @@ const createFabricMap = (ViewComponent, Commands) => {
                     throw new Error('fitToCoordinates is only supported on iOS with Fabric.');
                 }
             },
+            setIndoorActiveLevelIndex(activeLevelIndex) {
+                if (fabricRef.current) {
+                    try {
+                        Commands.setIndoorActiveLevelIndex(fabricRef.current, activeLevelIndex);
+                    }
+                    catch (error) {
+                        console.error('Failed to set camera:', error);
+                    }
+                }
+                else {
+                    console.warn('setIndoorActiveLevelIndex is not supported.');
+                }
+            },
             setCamera(camera) {
                 if (fabricRef.current) {
                     try {
@@ -164,7 +177,7 @@ const createFabricMap = (ViewComponent, Commands) => {
                     }
                 }
                 else {
-                    console.warn('setCamera is only supported on iOS with Fabric.');
+                    console.warn('setCamera is not supported');
                 }
             },
         }));

package/lib/specs/NativeComponentGoogleMapView.d.ts

@@ -133,7 +133,7 @@ export type IndoorLevel = Readonly<{
     shortName: string;
 }>;
 export type IndoorLevelActivatedEventHandler = DirectEventHandler<Readonly<{
-    IndoorLevel: {
+    indoorLevel: {
         activeLevelIndex: Int32;
         name: string;
         shortName: string;
@@ -145,7 +145,7 @@ export type IndoorBuilding = Readonly<{
     levels: ReadonlyArray<IndoorLevel>;
 }>;
 export type IndoorBuildingEventHandler = DirectEventHandler<Readonly<{
-    IndoorBuilding: {
+    indoorBuilding: {
         underground: boolean;
         activeLevelIndex: Int32;
     };
@@ -609,7 +609,6 @@ export interface MapFabricNativeProps extends ViewProps {
     showsScale?: boolean;
     /**
      * A Boolean value indicating whether the map displays traffic information.
-     * TODO: Look into android support
      *
      * @default false
      * @platform iOS: Supported
@@ -707,6 +706,7 @@ export interface NativeCommands {
     fitToElements: (viewRef: React.ElementRef<React.ComponentType>, edgePaddingJSON: string, animated: boolean) => void;
     fitToSuppliedMarkers: (viewRef: React.ElementRef<React.ComponentType>, markersJSON: string, edgePaddingJSON: string, animated: boolean) => void;
     fitToCoordinates: (viewRef: React.ElementRef<React.ComponentType>, coordinatesJSON: string, edgePaddingJSON: string, animated: boolean) => void;
+    setIndoorActiveLevelIndex: (viewRef: React.ElementRef<React.ComponentType>, activeLevelIndex: Int32) => void;
 }
 export declare const Commands: NativeCommands;
 declare const _default: HostComponent<MapFabricNativeProps>;

package/lib/specs/NativeComponentGoogleMapView.js

@@ -14,6 +14,7 @@ exports.Commands = (0, codegenNativeCommands_1.default)({
         'fitToElements',
         'fitToSuppliedMarkers',
         'fitToCoordinates',
+        'setIndoorActiveLevelIndex',
     ],
 });
 exports.default = (0, codegenNativeComponent_1.default)('RNMapsGoogleMapView', {

package/lib/specs/NativeComponentMapView.d.ts

@@ -806,6 +806,14 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform Android: Supported
      */
     zoomEnabled?: WithDefault<boolean, true>;
+    /**
+     * A Boolean value indicating whether the map displays traffic information.
+     *
+     * @default false
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    showsTraffic?: boolean;
     /**
      * If `false` the user won't be able to double tap to zoom the map.
      * **Note:** But it will greatly decrease delay of tap gesture recognition.
@@ -832,6 +840,7 @@ export interface NativeCommands {
     fitToElements: (viewRef: React.ElementRef<React.ComponentType>, edgePaddingJSON: string, animated: boolean) => void;
     fitToSuppliedMarkers: (viewRef: React.ElementRef<React.ComponentType>, markersJSON: string, edgePaddingJSON: string, animated: boolean) => void;
     fitToCoordinates: (viewRef: React.ElementRef<React.ComponentType>, coordinatesJSON: string, edgePaddingJSON: string, animated: boolean) => void;
+    setIndoorActiveLevelIndex: (viewRef: React.ElementRef<React.ComponentType>, activeLevelIndex: Int32) => void;
 }
 export declare const Commands: NativeCommands;
 declare const _default: HostComponent<MapFabricNativeProps>;

package/lib/specs/NativeComponentMapView.js

@@ -14,6 +14,7 @@ exports.Commands = (0, codegenNativeCommands_1.default)({
         'fitToElements',
         'fitToSuppliedMarkers',
         'fitToCoordinates',
+        'setIndoorActiveLevelIndex',
     ],
 });
 exports.default = (0, codegenNativeComponent_1.default)('RNMapsMapView', {});

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.73",
+  "version": "1.21.0-alpha.75",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",