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

package/lib/Geojson.d.ts

@@ -136,7 +136,7 @@ export type GeojsonProps = {
      * This is the default value for all point markers in your geojson data. It can be overriden
      * on a per point basis by adding a `trackViewChanges` property to the `properties` object on the point.
      *
-     * @default true
+     * @default false
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */

package/lib/MapCallout.js

@@ -33,8 +33,8 @@ class MapCallout extends React.Component {
     getUIManagerCommand;
     render() {
         const { tooltip = false, alphaHitTest = false } = this.props;
-        const AIRMapCallout = this.getNativeComponent();
-        return (<AIRMapCallout {...this.props} tooltip={tooltip} alphaHitTest={alphaHitTest} style={[styles.callout, this.props.style]}/>);
+        const RNMMapCallout = this.getNativeComponent();
+        return (<RNMMapCallout {...this.props} tooltip={tooltip} alphaHitTest={alphaHitTest} style={[styles.callout, this.props.style]}/>);
     }
 }
 exports.MapCallout = MapCallout;

package/lib/MapCalloutSubview.js

@@ -32,8 +32,8 @@ class MapCalloutSubview extends React.Component {
     getMapManagerCommand;
     getUIManagerCommand;
     render() {
-        const AIRMapCalloutSubview = this.getNativeComponent();
-        return (<AIRMapCalloutSubview {...this.props} style={[styles.calloutSubview, this.props.style]}/>);
+        const RNMMapCalloutSubview = this.getNativeComponent();
+        return (<RNMMapCalloutSubview {...this.props} style={[styles.calloutSubview, this.props.style]}/>);
     }
 }
 exports.MapCalloutSubview = MapCalloutSubview;

package/lib/MapCircle.js

@@ -40,8 +40,8 @@ class MapCircle extends React.Component {
     }
     render() {
         const { strokeColor = '#000', strokeWidth = 1 } = this.props;
-        const AIRMapCircle = this.getNativeComponent();
-        return (<AIRMapCircle {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} ref={this.circle}/>);
+        const RNMMapCircle = this.getNativeComponent();
+        return (<RNMMapCircle {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} ref={this.circle}/>);
     }
 }
 exports.MapCircle = MapCircle;

package/lib/MapHeatmap.js

@@ -40,14 +40,14 @@ class MapHeatmap extends React.Component {
         this.heatmap.current?.setNativeProps(props);
     }
     render() {
-        const AIRMapHeatmap = this.getNativeComponent();
+        const RNMMapHeatmap = this.getNativeComponent();
         const propGradient = this.props.gradient;
         let gradient;
         if (propGradient) {
             const colors = propGradient.colors.map(c => (0, react_native_1.processColor)(c));
             gradient = { ...propGradient, colors };
         }
-        return (<AIRMapHeatmap {...this.props} gradient={gradient} ref={this.heatmap}/>);
+        return (<RNMMapHeatmap {...this.props} gradient={gradient} ref={this.heatmap}/>);
     }
 }
 exports.MapHeatmap = MapHeatmap;

package/lib/MapLocalTile.js

@@ -31,8 +31,8 @@ class MapLocalTile extends React.Component {
     getMapManagerCommand;
     getUIManagerCommand;
     render() {
-        const AIRMapLocalTile = this.getNativeComponent();
-        return <AIRMapLocalTile {...this.props}/>;
+        const RNMMapLocalTile = this.getNativeComponent();
+        return <RNMMapLocalTile {...this.props}/>;
     }
 }
 exports.MapLocalTile = MapLocalTile;

package/lib/MapMarker.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Animated, ViewProps, ImageURISource, ImageRequireSource } from 'react-native';
+import { ViewProps, ImageURISource, ImageRequireSource } from 'react-native';
 import { MapManagerCommand, NativeComponent, ProviderContext, UIManagerCommand } from './decorateMapComponent';
 import { MapMarkerNativeComponentType } from './MapMarkerNativeComponent';
 import { CalloutPressEvent, LatLng, MarkerDeselectEvent, MarkerDragEvent, MarkerDragStartEndEvent, MarkerPressEvent, MarkerSelectEvent, Point } from './sharedTypes';
@@ -246,7 +246,7 @@ export type MapMarkerProps = ViewProps & {
      * Sets whether this marker should track view changes.
      * It's recommended to turn it off whenever it's possible to improve custom marker performance.
      *
-     * @default true
+     * @default false
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
@@ -273,7 +273,6 @@ export declare class MapMarker extends React.Component<MapMarkerProps> {
     getNativeComponent: () => NativeComponent<NativeProps>;
     getMapManagerCommand: (name: string) => MapManagerCommand;
     getUIManagerCommand: (name: string) => UIManagerCommand;
-    static Animated: Animated.AnimatedComponent<typeof MapMarker>;
     private marker;
     constructor(props: MapMarkerProps);
     /**

package/lib/MapMarker.js

@@ -32,7 +32,6 @@ class MapMarker extends React.Component {
     getNativeComponent;
     getMapManagerCommand;
     getUIManagerCommand;
-    static Animated;
     marker;
     constructor(props) {
         super(props);
@@ -88,8 +87,8 @@ class MapMarker extends React.Component {
             icon = react_native_1.Image.resolveAssetSource(this.props.icon) || {};
             icon = icon.uri;
         }
-        const AIRMapMarker = this.getNativeComponent();
-        return (<AIRMapMarker {...this.props} ref={this.marker} image={image} icon={icon} style={[styles.marker, this.props.style]} onPress={event => {
+        const RNMMapMarker = this.getNativeComponent();
+        return (<RNMMapMarker {...this.props} ref={this.marker} image={image} icon={icon} style={[styles.marker, this.props.style]} onPress={event => {
                 if (stopPropagation) {
                     event.stopPropagation();
                 }
@@ -106,7 +105,6 @@ const styles = react_native_1.StyleSheet.create({
         backgroundColor: 'transparent',
     },
 });
-MapMarker.Animated = react_native_1.Animated.createAnimatedComponent(MapMarker);
 exports.default = (0, decorateMapComponent_1.default)(MapMarker, 'Marker', {
     google: {
         ios: decorateMapComponent_1.SUPPORTED,

package/lib/MapOverlay.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Animated, ViewProps, ImageURISource, ImageRequireSource, NativeSyntheticEvent } from 'react-native';
+import { ViewProps, ImageURISource, ImageRequireSource, NativeSyntheticEvent } from 'react-native';
 import { MapManagerCommand, NativeComponent, ProviderContext, UIManagerCommand } from './decorateMapComponent';
 import { LatLng, Point } from './sharedTypes';
 import { Modify } from './sharedTypesInternal';
@@ -59,7 +59,6 @@ export declare class MapOverlay extends React.Component<MapOverlayProps> {
     getNativeComponent: () => NativeComponent<NativeProps>;
     getMapManagerCommand: (name: string) => MapManagerCommand;
     getUIManagerCommand: (name: string) => UIManagerCommand;
-    static Animated: Animated.AnimatedComponent<typeof MapOverlay>;
     render(): JSX.Element;
 }
 type Coordinate = [number, number];

package/lib/MapOverlay.js

@@ -31,7 +31,6 @@ class MapOverlay extends React.Component {
     getNativeComponent;
     getMapManagerCommand;
     getUIManagerCommand;
-    static Animated;
     render() {
         const { opacity = 1.0 } = this.props;
         let image;
@@ -43,8 +42,8 @@ class MapOverlay extends React.Component {
             const sourceAsset = react_native_1.Image.resolveAssetSource(this.props.image) || {};
             image = sourceAsset.uri;
         }
-        const AIRMapOverlay = this.getNativeComponent();
-        return (<AIRMapOverlay {...this.props} opacity={opacity} image={image} style={[styles.overlay, this.props.style]}/>);
+        const RNMMapOverlay = this.getNativeComponent();
+        return (<RNMMapOverlay {...this.props} opacity={opacity} image={image} style={[styles.overlay, this.props.style]}/>);
     }
 }
 exports.MapOverlay = MapOverlay;
@@ -54,7 +53,6 @@ const styles = react_native_1.StyleSheet.create({
         backgroundColor: 'transparent',
     },
 });
-MapOverlay.Animated = react_native_1.Animated.createAnimatedComponent(MapOverlay);
 exports.default = (0, decorateMapComponent_1.default)(MapOverlay, 'Overlay', {
     google: {
         ios: decorateMapComponent_1.SUPPORTED,

package/lib/MapPolygon.js

@@ -40,8 +40,8 @@ class MapPolygon extends React.Component {
     }
     render() {
         const { strokeColor = '#000', strokeWidth = 1 } = this.props;
-        const AIRMapPolygon = this.getNativeComponent();
-        return (<AIRMapPolygon {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} ref={this.polygon}/>);
+        const RNMMapPolygon = this.getNativeComponent();
+        return (<RNMMapPolygon {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} ref={this.polygon}/>);
     }
 }
 exports.MapPolygon = MapPolygon;

package/lib/MapPolyline.js

@@ -40,8 +40,8 @@ class MapPolyline extends React.Component {
     }
     render() {
         const { strokeColor = '#000', strokeWidth = 1, lineJoin = 'round', lineCap = 'round', } = this.props;
-        const AIRMapPolyline = this.getNativeComponent();
-        return (<AIRMapPolyline {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} lineJoin={lineJoin} lineCap={lineCap} ref={this.polyline}/>);
+        const RNMMapPolyline = this.getNativeComponent();
+        return (<RNMMapPolyline {...this.props} strokeColor={strokeColor} strokeWidth={strokeWidth} lineJoin={lineJoin} lineCap={lineCap} ref={this.polyline}/>);
     }
 }
 exports.MapPolyline = MapPolyline;

package/lib/MapUrlTile.js

@@ -31,8 +31,8 @@ class MapUrlTile extends React.Component {
     getMapManagerCommand;
     getUIManagerCommand;
     render() {
-        const AIRMapUrlTile = this.getNativeComponent();
-        return <AIRMapUrlTile {...this.props}/>;
+        const RNMMapUrlTile = this.getNativeComponent();
+        return <RNMMapUrlTile {...this.props}/>;
     }
 }
 exports.MapUrlTile = MapUrlTile;

package/lib/MapView.d.ts

@@ -1,11 +1,17 @@
 import * as React from 'react';
-import { Animated as RNAnimated, Animated, NativeSyntheticEvent, ViewProps } from 'react-native';
+import { NativeSyntheticEvent, ViewProps } from 'react-native';
 import { CalloutPressEvent, ClickEvent, Frame, LatLng, MarkerDeselectEvent, MarkerDragEvent, MarkerDragStartEndEvent, MarkerPressEvent, MarkerSelectEvent, Point, Provider, Region } from './sharedTypes';
 import { Address, BoundingBox, Camera, ChangeEvent, Details, EdgePadding, FitToOptions, IndoorBuildingEvent, IndoorLevelActivatedEvent, KmlMapEvent, LongPressEvent, MapPressEvent, MapStyleElement, MapType, MapTypes, PanDragEvent, PoiClickEvent, SnapshotOptions, UserLocationChangeEvent } from './MapView.types';
 import { Modify } from './sharedTypesInternal';
 import { MapViewNativeComponentType } from './MapViewNativeComponent';
 export declare const MAP_TYPES: MapTypes;
 export type MapViewProps = ViewProps & {
+    /**
+     * A boundary of an area within which the map’s center needs to remain.
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    boundary?: BoundingBox;
     /**
      * If `true` map will be cached and displayed as an image instead of being interactable, for performance usage.
      *
@@ -47,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.
@@ -570,7 +583,6 @@ type State = {
     isReady: boolean;
 };
 declare class MapView extends React.Component<MapViewProps, State> {
-    static Animated: Animated.AnimatedComponent<typeof MapView>;
     private map;
     constructor(props: MapViewProps);
     /**
@@ -581,22 +593,17 @@ declare class MapView extends React.Component<MapViewProps, State> {
     private _onMapReady;
     private _onChange;
     getCamera(): Promise<Camera>;
-    setCamera(camera: Partial<Camera>): void;
-    animateCamera(camera: Partial<Camera>, opts?: {
-        duration?: number;
-    }): void;
-    animateToRegion(region: Region, duration?: number): void;
-    fitToElements(options?: FitToOptions): void;
-    fitToSuppliedMarkers(markers: string[], options?: FitToOptions): void;
-    fitToCoordinates(coordinates?: LatLng[], options?: FitToOptions): void;
+    animateCamera(camera: Partial<Camera>, duration?: number): Promise<void>;
+    animateToRegion(region: Region, duration?: number): Promise<void>;
+    fitToElements(options?: FitToOptions): Promise<void>;
+    fitToSuppliedMarkers(markers: string[], options?: FitToOptions): Promise<void>;
+    fitToCoordinates(coordinates?: LatLng[], options?: FitToOptions): Promise<void>;
     /**
      * Get visible boudaries
      *
      * @return Promise Promise with the bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
      */
     getMapBoundaries(): Promise<BoundingBox>;
-    setMapBoundaries(northEast: LatLng, southWest: LatLng): void;
-    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.
@@ -663,11 +670,9 @@ declare class MapView extends React.Component<MapViewProps, State> {
      * @return Object Object bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
      */
     boundingBoxForRegion(region: Region): BoundingBox;
-    private _mapManagerCommand;
     private _getHandle;
-    private _runCommand;
+    private _gogleMapsOniOS;
     render(): JSX.Element;
 }
-export declare const AnimatedMapView: RNAnimated.AnimatedComponent<typeof MapView>;
-export declare const enableLatestRenderer: () => any;
+export declare const enableLatestRenderer: () => Promise<string> | undefined;
 export default MapView;

package/lib/MapView.js

@@ -22,13 +22,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableLatestRenderer = exports.AnimatedMapView = exports.MAP_TYPES = void 0;
+exports.enableLatestRenderer = exports.MAP_TYPES = void 0;
 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 = {
     STANDARD: 'standard',
     SATELLITE: 'satellite',
@@ -39,7 +43,6 @@ exports.MAP_TYPES = {
 };
 const GOOGLE_MAPS_ONLY_TYPES = [exports.MAP_TYPES.TERRAIN, exports.MAP_TYPES.NONE];
 class MapView extends React.Component {
-    static Animated;
     map;
     constructor(props) {
         super(props);
@@ -80,46 +83,43 @@ class MapView extends React.Component {
         }
     }
     getCamera() {
-        if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.getCamera(this._getHandle());
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return this._runCommand('getCamera', []);
-        }
-        return Promise.reject('getCamera not supported on this platform');
-    }
-    setCamera(camera) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setCamera(this.map.current, camera);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('getCamera')(this._getHandle());
         }
+        return mapViewModuleMethod('getCamera')(this._getHandle());
     }
-    animateCamera(camera, opts) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.animateCamera(this.map.current, camera, opts?.duration ? opts.duration : 500);
+    animateCamera(camera, duration = 500) {
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('animateCamera')(this._getHandle(), camera, duration);
         }
+        return mapViewModuleMethod('animateCamera')(this._getHandle(), camera, duration);
     }
     animateToRegion(region, duration = 500) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.animateToRegion(this.map.current, region, duration);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('animateToRegion')(this._getHandle(), region, duration);
         }
+        return mapViewModuleMethod('animateToRegion')(this._getHandle(), region, duration);
     }
     fitToElements(options = {}) {
-        if (this.map.current) {
-            const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, animated = true, } = options;
-            MapViewNativeComponent_1.Commands.fitToElements(this.map.current, edgePadding, animated);
+        const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, duration = 0 } = options;
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('fitToElements')(this._getHandle(), edgePadding, duration);
         }
+        return mapViewModuleMethod('fitToElements')(this._getHandle(), edgePadding, duration);
     }
     fitToSuppliedMarkers(markers, options = {}) {
-        if (this.map.current) {
-            const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, animated = true, } = options;
-            MapViewNativeComponent_1.Commands.fitToSuppliedMarkers(this.map.current, markers, edgePadding, animated);
+        const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, duration = 0 } = options;
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('fitToSuppliedMarkers')(this._getHandle(), markers, edgePadding, duration);
         }
+        return mapViewModuleMethod('fitToSuppliedMarkers')(this._getHandle(), markers, edgePadding, duration);
     }
     fitToCoordinates(coordinates = [], options = {}) {
-        if (this.map.current) {
-            const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, animated = true, } = options;
-            MapViewNativeComponent_1.Commands.fitToCoordinates(this.map.current, coordinates, edgePadding, animated);
+        const { edgePadding = { top: 0, right: 0, bottom: 0, left: 0 }, duration = 0 } = options;
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('fitToCoordinates')(this._getHandle(), coordinates, edgePadding, duration);
         }
+        return mapViewModuleMethod('fitToCoordinates')(this._getHandle(), coordinates, edgePadding, duration);
     }
     /**
      * Get visible boudaries
@@ -127,23 +127,10 @@ class MapView extends React.Component {
      * @return Promise Promise with the bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
      */
     async getMapBoundaries() {
-        if (react_native_1.Platform.OS === 'android') {
-            return await react_native_1.NativeModules.AirMapModule.getMapBoundaries(this._getHandle());
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return await this._runCommand('getMapBoundaries', []);
-        }
-        return Promise.reject('getMapBoundaries not supported on this platform');
-    }
-    setMapBoundaries(northEast, southWest) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setMapBoundaries(this.map.current, northEast, southWest);
-        }
-    }
-    setIndoorActiveLevelIndex(activeLevelIndex) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setIndoorActiveLevelIndex(this.map.current, activeLevelIndex);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('getMapBoundaries')(this._getHandle());
         }
+        return mapViewModuleMethod('getMapBoundaries')(this._getHandle());
     }
     /**
      * Takes a snapshot of the map and saves it to a picture
@@ -164,7 +151,7 @@ class MapView extends React.Component {
         const config = {
             width: args.width || 0,
             height: args.height || 0,
-            region: args.region || {},
+            region: args.region,
             format: args.format || 'png',
             quality: args.quality || 1.0,
             result: args.result || 'file',
@@ -175,31 +162,10 @@ class MapView extends React.Component {
         if (config.result !== 'file' && config.result !== 'base64') {
             throw new Error('Invalid result specified');
         }
-        // Call native function
-        if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.takeSnapshot(this._getHandle(), config);
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return new Promise((resolve, reject) => {
-                this._runCommand('takeSnapshot', [
-                    config.width,
-                    config.height,
-                    config.region,
-                    config.format,
-                    config.quality,
-                    config.result,
-                    (err, snapshot) => {
-                        if (err) {
-                            reject(err);
-                        }
-                        else {
-                            resolve(snapshot);
-                        }
-                    },
-                ]);
-            });
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('takeSnapshot')(this._getHandle(), config);
         }
-        return Promise.reject('takeSnapshot not supported on this platform');
+        return mapViewModuleMethod('takeSnapshot')(this._getHandle(), config);
     }
     /**
      * Convert a coordinate to address by using default Geocoder
@@ -211,13 +177,10 @@ class MapView extends React.Component {
      * @return Promise with return type Address
      */
     addressForCoordinate(coordinate) {
-        if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.getAddressFromCoordinates(this._getHandle(), coordinate);
+        if (this._gogleMapsOniOS()) {
+            throw new Error('addressForCoordinate not supported on Google Maps iOS');
         }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return this._runCommand('getAddressFromCoordinates', [coordinate]);
-        }
-        return Promise.reject('getAddress not supported on this platform');
+        return mapViewModuleMethod('getAddressFromCoordinates')(this._getHandle(), coordinate);
     }
     /**
      * Convert a map coordinate to user-space point
@@ -229,13 +192,10 @@ class MapView extends React.Component {
      * @return Promise Promise with the point ({ x: Number, y: Number })
      */
     pointForCoordinate(coordinate) {
-        if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.pointForCoordinate(this._getHandle(), coordinate);
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return this._runCommand('pointForCoordinate', [coordinate]);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('pointForCoordinate')(this._getHandle(), coordinate);
         }
-        return Promise.reject('pointForCoordinate not supported on this platform');
+        return mapViewModuleMethod('pointForCoordinate')(this._getHandle(), coordinate);
     }
     /**
      * Convert a user-space point to a map coordinate
@@ -247,13 +207,10 @@ class MapView extends React.Component {
      * @return Promise Promise with the coordinate ({ latitude: Number, longitude: Number })
      */
     coordinateForPoint(point) {
-        if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.coordinateForPoint(this._getHandle(), point);
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return this._runCommand('coordinateForPoint', [point]);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('coordinateForPoint')(this._getHandle(), point);
         }
-        return Promise.reject('coordinateForPoint not supported on this platform');
+        return mapViewModuleMethod('coordinateForPoint')(this._getHandle(), point);
     }
     /**
      * Get markers' centers and frames in user-space coordinates
@@ -263,10 +220,13 @@ class MapView extends React.Component {
      * @return Promise Promise with { <identifier>: { point: Point, frame: Frame } }
      */
     getMarkersFrames(onlyVisible = false) {
-        if (react_native_1.Platform.OS === 'ios') {
-            return this._runCommand('getMarkersFrames', [onlyVisible]);
+        if (react_native_1.Platform.OS !== 'ios') {
+            throw new Error('getMarkersFrames only supported on iOS');
         }
-        return Promise.reject('getMarkersFrames not supported on this platform');
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('getMarkersFrames')(this._getHandle(), onlyVisible);
+        }
+        return mapViewModuleMethod('getMarkersFrames')(this._getHandle(), onlyVisible);
     }
     /**
      * Get bounding box from region
@@ -287,19 +247,15 @@ class MapView extends React.Component {
             },
         };
     }
-    _mapManagerCommand(name) {
-        return react_native_1.NativeModules[`${(0, decorateMapComponent_1.getNativeMapName)(this.props.provider)}Manager`][name];
-    }
     _getHandle() {
-        return (0, react_native_1.findNodeHandle)(this.map.current);
-    }
-    _runCommand(name, args) {
-        if (react_native_1.Platform.OS === 'ios') {
-            return this._mapManagerCommand(name)(this._getHandle(), ...args);
-        }
-        else {
-            return Promise.reject(`Invalid platform was passed: ${react_native_1.Platform.OS}`);
+        const handle = (0, react_native_1.findNodeHandle)(this.map.current);
+        if (!handle) {
+            throw new Error('Cannot find node handle');
         }
+        return handle;
+    }
+    _gogleMapsOniOS() {
+        return react_native_1.Platform.OS === 'ios' && this.props.provider === 'google';
     }
     render() {
         let props;
@@ -338,42 +294,60 @@ class MapView extends React.Component {
                 customMapStyleString: this.props.customMapStyle
                     ? JSON.stringify(this.props.customMapStyle)
                     : undefined,
+                boundary: this.props.boundary,
             };
         }
         if (react_native_1.Platform.OS === 'android' && this.props.liteMode) {
             return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
-          <AIRMapLite {...props}/>
+          <RNMMapLite {...props}/>
         </decorateMapComponent_1.ProviderContext.Provider>);
         }
-        const AIRMap = getNativeMapComponent(this.props.provider);
+        const RNMMap = getNativeMapComponent(this.props.provider);
         return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
-        <AIRMap {...props}/>
+        <RNMMap {...props}/>
       </decorateMapComponent_1.ProviderContext.Provider>);
     }
 }
-const airMaps = {
-    default: (0, react_native_1.requireNativeComponent)('AIRMap'),
+const rnmMaps = {
+    default: (0, react_native_1.requireNativeComponent)('RNMMap'),
     google: () => null,
 };
 if (react_native_1.Platform.OS === 'android') {
-    airMaps.google = airMaps.default;
+    rnmMaps.google = rnmMaps.default;
 }
 else {
-    airMaps.google = decorateMapComponent_1.googleMapIsInstalled
-        ? (0, react_native_1.requireNativeComponent)('AIRGoogleMap')
-        : (0, decorateMapComponent_1.createNotSupportedComponent)('react-native-maps: AirGoogleMaps dir must be added to your xCode project to support GoogleMaps on iOS.');
+    rnmMaps.google = decorateMapComponent_1.googleMapIsInstalled
+        ? (0, react_native_1.requireNativeComponent)('RNMGoogleMap')
+        : (0, decorateMapComponent_1.createNotSupportedComponent)('react-native-maps: RNMGoogleMaps dir must be added to your xCode project to support GoogleMaps on iOS.');
 }
-const getNativeMapComponent = (provider) => airMaps[provider || 'default'];
-const AIRMapLite = react_native_1.UIManager.getViewManagerConfig('AIRMapLite')
-    ? (0, react_native_1.requireNativeComponent)('AIRMapLite')
+const getNativeMapComponent = (provider) => rnmMaps[provider || 'default'];
+const RNMMapLite = react_native_1.UIManager.getViewManagerConfig('RNMMapLite')
+    ? (0, react_native_1.requireNativeComponent)('RNMMapLite')
     : () => null;
-exports.AnimatedMapView = react_native_1.Animated.createAnimatedComponent(MapView);
 const enableLatestRenderer = () => {
-    if (react_native_1.Platform.OS !== 'android') {
-        return;
+    if (react_native_1.Platform.OS === 'android') {
+        return mapViewModuleMethod('enableLatestRenderer')();
     }
-    return react_native_1.NativeModules.AirMapModule.enableLatestRenderer();
 };
 exports.enableLatestRenderer = enableLatestRenderer;
-MapView.Animated = exports.AnimatedMapView;
+function mapViewModuleMethod(name) {
+    if (!NativeMapViewModule_1.default) {
+        throw new Error('MapViewModule is null');
+    }
+    const method = NativeMapViewModule_1.default[name];
+    if (!method) {
+        throw new Error(`Method ${name} is not defined`);
+    }
+    return NativeMapViewModule_1.default[name];
+}
+function googleMapViewModuleMethod(name) {
+    if (!NativeGoogleMapViewModule_1.default) {
+        throw new Error('GoogleMapViewModule is null');
+    }
+    const method = NativeGoogleMapViewModule_1.default[name];
+    if (!method) {
+        throw new Error(`Method ${name} is not defined`);
+    }
+    return NativeGoogleMapViewModule_1.default[name];
+}
 exports.default = MapView;