react-native-maps 2.0.0-beta.10 → 2.0.0-beta.11

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

@@ -279,26 +279,9 @@ public class MapManager extends ViewGroupManager<MapView> {
     view.setBoundary(boundary);
   }
 
-  @Override
-  public void receiveCommand(@NonNull MapView view, String commandId, @Nullable ReadableArray args) {
-    ReadableMap camera;
-
-    switch (commandId) {
-      case "setCamera":
-        if(args == null) {
-          break;
-        }
-        camera = args.getMap(0);
-        view.animateToCamera(camera, 0);
-        break;
-
-      case "setIndoorActiveLevelIndex":
-        if(args == null) {
-          break;
-        }
-        view.setIndoorActiveLevelIndex(args.getInt(0));
-        break;
-    }
+  @ReactProp(name = "indoorActiveLevelIndex")
+  public void setIndoorActiveLevelIndex(MapView view, int index) {
+    view.setIndoorActiveLevelIndex(index);
   }
 
   @Override

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

@@ -886,19 +886,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     return CameraUpdateFactory.newCameraPosition(builder.build());
   }
 
-  public void animateToCamera(ReadableMap camera, int duration) {
-    if (map == null) return;
-
-    CameraUpdate update = buildCameraUpdate(camera);
-
-    if (duration <= 0) {
-      map.moveCamera(update);
-    }
-    else {
-      map.animateCamera(update, duration, null);
-    }
-  }
-
   public int baseLeftMapPadding;
   public int baseRightMapPadding;
   public int baseTopMapPadding;

package/ios/GoogleMaps/RNMGoogleMap.m

@@ -309,6 +309,15 @@ id regionAsJSON(MKCoordinateRegion region) {
     self.cameraTargetBounds = boundary;
 }
 
+- (void)setIndoorActiveLevelIndex:(NSInteger)index {
+  if (!self.indoorDisplay) {
+    return;
+  }
+  if ( index < [self.indoorDisplay.activeBuilding.levels count]) {
+    self.indoorDisplay.activeLevel = self.indoorDisplay.activeBuilding.levels[index];
+  }
+}
+
 - (void)didPrepareMap {
   UIView* mapView = [self valueForKey:@"mapView"]; //GMSVectorMapView
   [self overrideGestureRecognizersForView:mapView];

package/ios/GoogleMaps/RNMGoogleMapManager.m

@@ -67,6 +67,7 @@ RCT_EXPORT_MODULE(RNMGoogleMap)
 
 RCT_EXPORT_VIEW_PROPERTY(boundary, GMSCoordinateBounds*)
 RCT_EXPORT_VIEW_PROPERTY(customMapStyleString, NSString)
+RCT_EXPORT_VIEW_PROPERTY(indoorActiveLevelIndex, NSInteger)
 RCT_EXPORT_VIEW_PROPERTY(initialCamera, GMSCameraPosition)
 RCT_EXPORT_VIEW_PROPERTY(initialRegion, MKCoordinateRegion)
 RCT_EXPORT_VIEW_PROPERTY(isAccessibilityElement, BOOL)
@@ -107,40 +108,6 @@ RCT_REMAP_VIEW_PROPERTY(camera, cameraProp, GMSCameraPosition)
 RCT_REMAP_VIEW_PROPERTY(paddingAdjustmentBehavior, paddingAdjustmentBehaviorString, NSString)
 RCT_REMAP_VIEW_PROPERTY(testID, accessibilityIdentifier, NSString)
 
-RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
-                  camera:(id)json)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RNMGoogleMap class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
-        } else {
-            RNMGoogleMap *mapView = (RNMGoogleMap *)view;
-            GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
-            [mapView setCamera:camera];
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(setIndoorActiveLevelIndex:(nonnull NSNumber *)reactTag
-                  levelIndex:(NSInteger) levelIndex)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RNMGoogleMap class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RNMGoogleMap, got: %@", view);
-    } else {
-      RNMGoogleMap *mapView = (RNMGoogleMap *)view;
-      if (!mapView.indoorDisplay) {
-        return;
-      }
-      if ( levelIndex < [mapView.indoorDisplay.activeBuilding.levels count]) {
-        mapView.indoorDisplay.activeLevel = mapView.indoorDisplay.activeBuilding.levels[levelIndex];
-      }
-    }
-  }];
- }
-
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }

package/ios/GoogleMaps/RNMGoogleMapViewModule.m

@@ -224,13 +224,18 @@ RCT_EXPORT_METHOD(animateCamera:(nonnull NSNumber *)reactTag
             RNMGoogleMap *mapView = (RNMGoogleMap *)view;
             GMSCameraPosition *camera = [RCTConvert GMSCameraPositionWithDefaults:json existingCamera:[mapView camera]];
 
-            [CATransaction begin];
-            [CATransaction setCompletionBlock:^{
-                resolve(nil);
-            }];
-            [CATransaction setAnimationDuration:duration/1000];
-            [mapView animateToCameraPosition:camera];
-            [CATransaction commit];
+            if(duration > 0.0f) {
+              [CATransaction begin];
+              [CATransaction setCompletionBlock:^{
+                  resolve(nil);
+              }];
+              [CATransaction setAnimationDuration:duration/1000];
+              [mapView animateToCameraPosition:camera];
+              [CATransaction commit];
+            } else {
+              [mapView moveCamera:camera];
+              resolve(nil);
+            }
         }
     }];
 }

package/ios/Maps/RNMMapManager.m

@@ -170,30 +170,6 @@ RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RNMMap)
     view.ignoreRegionChanges = originalIgnore;
 }
 
-#pragma mark exported MapView methods
-
-RCT_EXPORT_METHOD(setCamera:(nonnull NSNumber *)reactTag
-                  camera:(id)json)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RNMMap class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RNMMap, got: %@", view);
-        } else {
-            RNMMap *mapView = (RNMMap *)view;
-
-            // Merge the changes given with the current camera
-            MKMapCamera *camera = [RCTConvert MKMapCameraWithDefaults:json existingCamera:[mapView camera]];
-
-            // don't emit region change events when we are setting the camera
-            BOOL originalIgnore = mapView.ignoreRegionChanges;
-            mapView.ignoreRegionChanges = YES;
-            [mapView setCamera:camera animated:NO];
-            mapView.ignoreRegionChanges = originalIgnore;
-        }
-    }];
-}
-
 #pragma mark Gesture Recognizer Handlers
 
 #define MAX_DISTANCE_PX 10.0f

package/ios/Maps/RNMMapViewModule.m

@@ -259,12 +259,18 @@ RCT_EXPORT_METHOD(animateCamera:(nonnull NSNumber *)reactTag
             // don't emit region change events when we are setting the camera
             BOOL originalIgnore = mapView.ignoreRegionChanges;
             mapView.ignoreRegionChanges = YES;
-            [RNMMap animateWithDuration:duration/1000 animations:^{
-                [mapView setCamera:camera animated:YES];
-            } completion:^(BOOL finished){
+            if(duration > 0.0f) {
+                [RNMMap animateWithDuration:duration/1000 animations:^{
+                    [mapView setCamera:camera animated:YES];
+                } completion:^(BOOL finished){
+                    mapView.ignoreRegionChanges = originalIgnore;
+                    resolve(nil);
+                }];
+            } else {
+                [mapView setCamera:camera animated:NO];
                 mapView.ignoreRegionChanges = originalIgnore;
                 resolve(nil);
-            }];
+            }
         }
     }];
 }

package/lib/MapView.d.ts

@@ -53,6 +53,13 @@ export type MapViewProps = ViewProps & {
      * @platform Android: Not supported
      */
     followsUserLocation?: boolean;
+    /**
+     * Set to control what indoor building level to display.
+     *
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    indoorActiveLevelIndex?: number;
     /**
      * The initial camera view the map should use.  Use this prop instead of `camera`
      * only if you don't want to control the camera of the map besides the initial view.
@@ -586,7 +593,6 @@ declare class MapView extends React.Component<MapViewProps, State> {
     private _onMapReady;
     private _onChange;
     getCamera(): Promise<Camera>;
-    setCamera(camera: Partial<Camera>): void;
     animateCamera(camera: Partial<Camera>, duration?: number): Promise<void>;
     animateToRegion(region: Region, duration?: number): Promise<void>;
     fitToElements(options?: FitToOptions): Promise<void>;
@@ -598,7 +604,6 @@ declare class MapView extends React.Component<MapViewProps, State> {
      * @return Promise Promise with the bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
      */
     getMapBoundaries(): Promise<BoundingBox>;
-    setIndoorActiveLevelIndex(activeLevelIndex: number): void;
     /**
      * Takes a snapshot of the map and saves it to a picture
      * file or returns the image as a base64 encoded string.

package/lib/MapView.js

@@ -31,7 +31,6 @@ const React = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const decorateMapComponent_1 = require("./decorateMapComponent");
 const ProviderConstants = __importStar(require("./ProviderConstants"));
-const MapViewNativeComponent_1 = require("./MapViewNativeComponent");
 const NativeMapViewModule_1 = __importDefault(require("./NativeMapViewModule"));
 const NativeGoogleMapViewModule_1 = __importDefault(require("./NativeGoogleMapViewModule"));
 exports.MAP_TYPES = {
@@ -89,11 +88,6 @@ class MapView extends React.Component {
         }
         return mapViewModuleMethod('getCamera')(this._getHandle());
     }
-    setCamera(camera) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setCamera(this.map.current, camera);
-        }
-    }
     animateCamera(camera, duration = 500) {
         if (this._gogleMapsOniOS()) {
             return googleMapViewModuleMethod('animateCamera')(this._getHandle(), camera, duration);
@@ -138,11 +132,6 @@ class MapView extends React.Component {
         }
         return mapViewModuleMethod('getMapBoundaries')(this._getHandle());
     }
-    setIndoorActiveLevelIndex(activeLevelIndex) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setIndoorActiveLevelIndex(this.map.current, activeLevelIndex);
-        }
-    }
     /**
      * Takes a snapshot of the map and saves it to a picture
      * file or returns the image as a base64 encoded string.

package/lib/MapViewNativeComponent.d.ts

@@ -1,11 +1,3 @@
-/// <reference types="react" />
 import type { HostComponent } from 'react-native';
 import { NativeProps } from './MapView';
-import { Camera } from './MapView.types';
 export type MapViewNativeComponentType = HostComponent<NativeProps>;
-interface NativeCommands {
-    setCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>) => void;
-    setIndoorActiveLevelIndex: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, activeLevelIndex: number) => void;
-}
-export declare const Commands: NativeCommands;
-export {};

package/lib/MapViewNativeComponent.js

@@ -1,10 +1,2 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Commands = void 0;
-const codegenNativeCommands_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeCommands"));
-exports.Commands = (0, codegenNativeCommands_1.default)({
-    supportedCommands: ['setCamera', 'setIndoorActiveLevelIndex'],
-});

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": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",