react-native-maps 1.21.0-alpha.6 → 1.21.0-alpha.7

package/lib/FabricMapView.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { MapBoundaries } from './specs/NativeAirMapsModule';
 import type { MapFabricNativeProps, Camera, Point } from './specs/NativeComponentMapView';
-import { LatLng, Region } from './sharedTypes';
+import { LatLng, Provider, Region } from './sharedTypes';
 import { Address, EdgePadding, SnapshotOptions } from './MapView.types';
 export interface FabricMapHandle {
     getCamera: () => Promise<Camera>;
@@ -18,5 +18,10 @@ export interface FabricMapHandle {
     getPointForCoordinate: (coordinate: LatLng) => Promise<Point>;
     getCoordinateForPoint: (point: Point) => Promise<LatLng>;
 }
-export declare const FabricMap: React.ForwardRefExoticComponent<MapFabricNativeProps & React.RefAttributes<FabricMapHandle>>;
+export type FabricMapViewProps = MapFabricNativeProps & {
+    provider?: Provider;
+};
+export declare const FabricMap: React.ForwardRefExoticComponent<MapFabricNativeProps & {
+    provider?: Provider;
+} & React.RefAttributes<FabricMapHandle>>;
 export default FabricMap;

package/lib/FabricMapView.js

@@ -30,6 +30,7 @@ exports.FabricMap = void 0;
 const react_1 = __importStar(require("react"));
 const NativeAirMapsModule_1 = __importDefault(require("./specs/NativeAirMapsModule"));
 const NativeComponentMapView_1 = __importStar(require("./specs/NativeComponentMapView"));
+const NativeComponentGoogleMapView_1 = __importDefault(require("./specs/NativeComponentGoogleMapView"));
 const react_native_1 = require("react-native");
 exports.FabricMap = (0, react_1.forwardRef)((props, ref) => {
     const fabricRef = (0, react_1.useRef)(null);
@@ -170,6 +171,11 @@ exports.FabricMap = (0, react_1.forwardRef)((props, ref) => {
             }
         },
     }));
-    return <NativeComponentMapView_1.default {...props} ref={fabricRef}/>;
+    if (props.provider === 'google') {
+        return <NativeComponentGoogleMapView_1.default {...props} ref={fabricRef}/>;
+    }
+    else {
+        return <NativeComponentMapView_1.default {...props} ref={fabricRef}/>;
+    }
 });
 exports.default = exports.FabricMap;

package/lib/MapOverlay.d.ts

@@ -70,7 +70,7 @@ type OverlayPressEvent = NativeSyntheticEvent<{
      */
     action: 'overlay-press' | 'image-overlay-press';
     /**
-     * @platform iOS: Apple maps
+     * @platform iOS: Apple Maps
      */
     name?: string;
     /**

package/lib/MapView.d.ts

@@ -11,7 +11,7 @@ export type MapViewProps = ViewProps & {
      * If `true` map will be cached and displayed as an image instead of being interactable, for performance usage.
      *
      * @default false
-     * @platform iOS: Apple maps only
+     * @platform iOS: Apple Maps only
      * @platform Android: Supported
      */
     cacheEnabled?: boolean;
@@ -92,7 +92,7 @@ export type MapViewProps = ViewProps & {
      */
     kmlSrc?: string;
     /**
-     * If set, changes the position of the "Legal" label link in Apple maps.
+     * If set, changes the position of the "Legal" label link in Apple Maps.
      *
      * @platform iOS: Apple Maps only
      * @platform Android: Not supported

package/lib/MapView.js

@@ -30,7 +30,6 @@ exports.AnimatedMapView = 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 FabricMapView_1 = __importDefault(require("./FabricMapView"));
 exports.MAP_TYPES = {
@@ -43,7 +42,6 @@ exports.MAP_TYPES = {
     SATELLITE_FLYOVER: 'satelliteFlyover',
     HYBRID_FLYOVER: 'hybridFlyover',
 };
-const GOOGLE_MAPS_ONLY_TYPES = [exports.MAP_TYPES.TERRAIN, exports.MAP_TYPES.NONE];
 class MapView extends React.Component {
     static Animated;
     map;
@@ -343,12 +341,11 @@ class MapView extends React.Component {
         }
     };
     render() {
-        if (react_native_1.Platform.OS === 'ios' &&
-            this.props.provider === ProviderConstants.PROVIDER_DEFAULT) {
+        if (react_native_1.Platform.OS === 'ios') {
             const AIRMap = FabricMapView_1.default;
             // Define props specifically for MapFabricNativeProps
             /* eslint-disable @typescript-eslint/no-unused-vars */
-            const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, region, ...restProps } = this.props;
+            const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, minZoomLevel, maxZoomLevel, region, ...restProps } = this.props;
             /* eslint-enable @typescript-eslint/no-unused-vars */
             const userInterfaceStyle = this.props.userInterfaceStyle || 'system';
             const props = {
@@ -361,6 +358,8 @@ class MapView extends React.Component {
                 onMarkerSelect: this.handleMarkerSelect,
                 onMarkerDeselect: this.handleMarkerDeselect,
                 userInterfaceStyle: userInterfaceStyle,
+                minZoom: minZoomLevel,
+                maxZoom: maxZoomLevel,
                 onRegionChange: this.handleRegionChange,
                 ...restProps,
             };
@@ -372,13 +371,7 @@ class MapView extends React.Component {
                     longitudeDelta: this.props.region.longitudeDelta,
                 };
             }
-            if (this.state.isReady) {
-                if (props.mapType && GOOGLE_MAPS_ONLY_TYPES.includes(props.mapType)) {
-                    props.mapType = exports.MAP_TYPES.STANDARD;
-                    console.log('ready');
-                }
-            }
-            else {
+            if (!this.state.isReady) {
                 props.style = this.props.style;
                 props.initialCamera = this.props.initialCamera;
                 props.onLayout = this.props.onLayout;