react-native-maps 2.0.0-beta.5 → 2.0.0-beta.6

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.js

@@ -87,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();
                 }

package/lib/MapOverlay.js

@@ -42,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;

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

@@ -660,10 +660,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 enableLatestRenderer: () => any;
+export declare const enableLatestRenderer: () => Promise<string> | undefined;
 export default MapView;

package/lib/MapView.js

@@ -22,6 +22,9 @@ 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.MAP_TYPES = void 0;
 const React = __importStar(require("react"));
@@ -29,6 +32,8 @@ 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',
@@ -79,13 +84,10 @@ 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', []);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('getCamera')(this._getHandle());
         }
-        return Promise.reject('getCamera not supported on this platform');
+        return mapViewModuleMethod('getCamera')(this._getHandle());
     }
     setCamera(camera) {
         if (this.map.current) {
@@ -126,13 +128,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', []);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('getMapBoundaries')(this._getHandle());
         }
-        return Promise.reject('getMapBoundaries not supported on this platform');
+        return mapViewModuleMethod('getMapBoundaries')(this._getHandle());
     }
     setMapBoundaries(northEast, southWest) {
         if (this.map.current) {
@@ -163,7 +162,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',
@@ -174,31 +173,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);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('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);
-                        }
-                    },
-                ]);
-            });
-        }
-        return Promise.reject('takeSnapshot not supported on this platform');
+        return mapViewModuleMethod('takeSnapshot')(this._getHandle(), config);
     }
     /**
      * Convert a coordinate to address by using default Geocoder
@@ -210,13 +188,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);
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return this._runCommand('getAddressFromCoordinates', [coordinate]);
+        if (this._gogleMapsOniOS()) {
+            throw new Error('addressForCoordinate not supported on Google Maps iOS');
         }
-        return Promise.reject('getAddress not supported on this platform');
+        return mapViewModuleMethod('getAddressFromCoordinates')(this._getHandle(), coordinate);
     }
     /**
      * Convert a map coordinate to user-space point
@@ -228,13 +203,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);
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('pointForCoordinate')(this._getHandle(), coordinate);
         }
-        else if (react_native_1.Platform.OS === 'ios') {
-            return this._runCommand('pointForCoordinate', [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
@@ -246,13 +218,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
@@ -262,10 +231,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');
+        }
+        if (this._gogleMapsOniOS()) {
+            return googleMapViewModuleMethod('getMarkersFrames')(this._getHandle(), onlyVisible);
         }
-        return Promise.reject('getMarkersFrames not supported on this platform');
+        return mapViewModuleMethod('getMarkersFrames')(this._getHandle(), onlyVisible);
     }
     /**
      * Get bounding box from region
@@ -286,19 +258,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;
@@ -341,36 +309,55 @@ class MapView extends React.Component {
         }
         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;
 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;
+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;

package/lib/MapView.types.d.ts

@@ -1,4 +1,4 @@
-import { ClickEvent, LatLng, Point, Region } from './sharedTypes';
+import { ClickEvent, Frame, LatLng, Point, Region } from './sharedTypes';
 import { NativeSyntheticEvent } from 'react-native';
 export type Camera = {
     /**
@@ -150,4 +150,10 @@ export type Address = {
     subLocality: string;
     thoroughfare: string;
 };
+export interface MarkersFrames {
+    [key: string]: {
+        point: Point;
+        frame: Frame;
+    };
+}
 export type NativeCommandName = 'animateCamera' | 'animateToRegion' | 'coordinateForPoint' | 'fitToCoordinates' | 'fitToElements' | 'fitToSuppliedMarkers' | 'getAddressFromCoordinates' | 'getCamera' | 'getMapBoundaries' | 'getMarkersFrames' | 'pointForCoordinate' | 'setCamera' | 'setIndoorActiveLevelIndex' | 'setMapBoundaries' | 'takeSnapshot';

package/lib/MapWMSTile.js

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

package/lib/NativeGoogleMapViewModule.d.ts

@@ -0,0 +1,20 @@
+import type { TurboModule } from 'react-native';
+import { BoundingBox, Camera, MarkersFrames } from './MapView.types';
+import { LatLng, Point, Region } from './sharedTypes';
+export interface Spec extends TurboModule {
+    coordinateForPoint: (viewTag: number, point: Point) => Promise<LatLng>;
+    getCamera: (viewTag: number) => Promise<Camera>;
+    getMapBoundaries: (viewTag: number) => Promise<BoundingBox>;
+    getMarkersFrames: (viewTag: number, onlyVisible: boolean) => Promise<MarkersFrames>;
+    pointForCoordinate: (viewTag: number, coordinate: LatLng) => Promise<Point>;
+    takeSnapshot: (viewTag: number, config: {
+        width: number;
+        height: number;
+        region?: Region;
+        format: string;
+        quality: number;
+        result: string;
+    }) => Promise<string>;
+}
+declare const _default: Spec | null;
+export default _default;

package/lib/NativeGoogleMapViewModule.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_native_1 = require("react-native");
+exports.default = react_native_1.TurboModuleRegistry.get('RNMGoogleMapViewModule');

package/lib/NativeMapViewModule.d.ts

@@ -0,0 +1,24 @@
+import type { TurboModule } from 'react-native';
+import { Address, BoundingBox, Camera, MarkersFrames } from './MapView.types';
+import { LatLng, Point, Region } from './sharedTypes';
+export interface Spec extends TurboModule {
+    coordinateForPoint: (viewTag: number, point: Point) => Promise<LatLng>;
+    /** android only */
+    enableLatestRenderer: () => Promise<string>;
+    getAddressFromCoordinates: (viewTag: number, coordinate: LatLng) => Promise<Address>;
+    getCamera: (viewTag: number) => Promise<Camera>;
+    getMapBoundaries: (viewTag: number) => Promise<BoundingBox>;
+    /** ios only */
+    getMarkersFrames: (viewTag: number, onlyVisible: boolean) => Promise<MarkersFrames>;
+    pointForCoordinate: (viewTag: number, coordinate: LatLng) => Promise<Point>;
+    takeSnapshot: (viewTag: number, config: {
+        width: number;
+        height: number;
+        region?: Region;
+        format: string;
+        quality: number;
+        result: string;
+    }) => Promise<string>;
+}
+declare const _default: Spec | null;
+export default _default;

package/lib/NativeMapViewModule.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_native_1 = require("react-native");
+exports.default = react_native_1.TurboModuleRegistry.get('RNMMapViewModule');

package/lib/decorateMapComponent.d.ts

@@ -16,7 +16,7 @@ export declare const SUPPORTED: ImplementationStatus;
 export declare const USES_DEFAULT_IMPLEMENTATION: ImplementationStatus;
 export declare const NOT_SUPPORTED: ImplementationStatus;
 export declare const ProviderContext: import("react").Context<Provider>;
-export declare function getNativeMapName(provider: Provider): "AIRMap" | "AIRGoogleMap";
+export declare function getNativeMapName(provider: Provider): "RNMMap" | "RNMGoogleMap";
 export declare const createNotSupportedComponent: (message: string) => () => null;
 export declare const googleMapIsInstalled = true;
 export default function decorateMapComponent<Type extends Component>(Component: Type, componentName: ComponentName, providers: Providers): Type;

package/lib/decorateMapComponent.js

@@ -10,12 +10,12 @@ exports.NOT_SUPPORTED = 'NOT_SUPPORTED';
 exports.ProviderContext = (0, react_1.createContext)(undefined);
 function getNativeMapName(provider) {
     if (react_native_1.Platform.OS === 'android') {
-        return 'AIRMap';
+        return 'RNMMap';
     }
     if (provider === ProviderConstants_1.PROVIDER_GOOGLE) {
-        return 'AIRGoogleMap';
+        return 'RNMGoogleMap';
     }
-    return 'AIRMap';
+    return 'RNMMap';
 }
 exports.getNativeMapName = getNativeMapName;
 function getNativeComponentName(provider, component) {

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

package/react-native-google-maps.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "13.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
-  s.source_files  = "ios/AirGoogleMaps/**/*.{h,m}"
+  s.source_files  = "ios/GoogleMaps/**/*.{h,m}"
   s.compiler_flags = '-DHAVE_GOOGLE_MAPS=1', '-DHAVE_GOOGLE_MAPS_UTILS=1'
   s.pod_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '"${PODS_CONFIGURATION_BUILD_DIR}/react-native-maps"' }
 

package/react-native-maps.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "11.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
-  s.source_files  = "ios/AirMaps/**/*.{h,m}"
+  s.source_files  = "ios/Maps/**/*.{h,m}"
 
   s.dependency 'React-Core'
 end

package/ios/AirGoogleMaps/AIRGoogleMapCalloutSubviewManager.m

@@ -1,28 +0,0 @@
-//
-//  AIRGoogleMapCalloutSubviewManager.m
-//  AirMaps
-//
-//  Created by Denis Oblogin on 10/8/18.
-//
-//
-
-#ifdef HAVE_GOOGLE_MAPS
-
-#import "AIRGoogleMapCalloutSubviewManager.h"
-#import "AIRGoogleMapCalloutSubview.h"
-#import <React/RCTView.h>
-
-@implementation AIRGoogleMapCalloutSubviewManager
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  AIRGoogleMapCalloutSubview *calloutSubview = [AIRGoogleMapCalloutSubview new];
-  return calloutSubview;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-
-@end
-
-#endif

package/ios/AirGoogleMaps/AIRGoogleMapHeatmapManager.h

@@ -1,11 +0,0 @@
-//
-//  AIRGoogleMapHeatmapManager.h
-//
-//  Created by David Cako on 29 April 2018.
-//
-
-#import <React/RCTViewManager.h>
-
-@interface AIRGoogleMapHeatmapManager : RCTViewManager
-
-@end

package/ios/AirMaps/AIRMapCalloutSubviewManager.h

@@ -1,14 +0,0 @@
-//
-//  AIRMapCalloutSubviewManager.h
-//  AirMaps
-//
-//  Created by Denis Oblogin on 10/8/18.
-//
-//
-
-#import <React/RCTViewManager.h>
-
-@interface AIRMapCalloutSubviewManager : RCTViewManager
-
-@end
-

package/ios/AirMaps/AIRMapCalloutSubviewManager.m

@@ -1,24 +0,0 @@
-//
-//  AIRMapCalloutSubviewManager.m
-//  AirMaps
-//
-//  Created by Denis Oblogin on 10/8/18.
-//
-//
-
-#import "AIRMapCalloutSubviewManager.h"
-#import "AIRMapCalloutSubview.h"
-#import <React/RCTView.h>
-
-@implementation AIRMapCalloutSubviewManager
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  AIRMapCalloutSubview *calloutSubview = [AIRMapCalloutSubview new];
-  return calloutSubview;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-
-@end

package/ios/AirMaps/AIRMapOverlayManager.h

@@ -1,5 +0,0 @@
-#import <React/RCTViewManager.h>
-
-@interface AIRMapOverlayManager : RCTViewManager
-
-@end