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

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 = {
     /**
@@ -119,7 +119,7 @@ export type ChangeEvent = NativeSyntheticEvent<{
 }>;
 export type FitToOptions = {
     edgePadding?: EdgePadding;
-    animated?: boolean;
+    duration?: number;
 };
 export type BoundingBox = {
     northEast: LatLng;
@@ -150,4 +150,9 @@ export type Address = {
     subLocality: string;
     thoroughfare: string;
 };
-export type NativeCommandName = 'animateCamera' | 'animateToRegion' | 'coordinateForPoint' | 'fitToCoordinates' | 'fitToElements' | 'fitToSuppliedMarkers' | 'getAddressFromCoordinates' | 'getCamera' | 'getMapBoundaries' | 'getMarkersFrames' | 'pointForCoordinate' | 'setCamera' | 'setIndoorActiveLevelIndex' | 'setMapBoundaries' | 'takeSnapshot';
+export interface MarkersFrames {
+    [key: string]: {
+        point: Point;
+        frame: Frame;
+    };
+}

package/lib/MapViewNativeComponent.d.ts

@@ -1,18 +1,3 @@
-/// <reference types="react" />
 import type { HostComponent } from 'react-native';
 import { NativeProps } from './MapView';
-import { Camera, EdgePadding } from './MapView.types';
-import { LatLng, Region } from './sharedTypes';
 export type MapViewNativeComponentType = HostComponent<NativeProps>;
-interface NativeCommands {
-    animateToRegion: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, region: Region, duration: number) => void;
-    setCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>) => void;
-    animateCamera: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, camera: Partial<Camera>, duration: number) => void;
-    fitToElements: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, edgePadding: EdgePadding, animated: boolean) => void;
-    fitToSuppliedMarkers: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, markers: string[], edgePadding: EdgePadding, animated: boolean) => void;
-    fitToCoordinates: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, coordinates: LatLng[], edgePadding: EdgePadding, animated: boolean) => void;
-    setMapBoundaries: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, northEast: LatLng, southWest: LatLng) => void;
-    setIndoorActiveLevelIndex: (viewRef: NonNullable<React.RefObject<MapViewNativeComponentType>['current']>, activeLevelIndex: number) => void;
-}
-export declare const Commands: NativeCommands;
-export {};

package/lib/MapViewNativeComponent.js

@@ -1,19 +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: [
-        'animateToRegion',
-        'setCamera',
-        'animateCamera',
-        'fitToElements',
-        'fitToSuppliedMarkers',
-        'fitToCoordinates',
-        'setMapBoundaries',
-        'setIndoorActiveLevelIndex',
-    ],
-});

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,25 @@
+import type { TurboModule } from 'react-native';
+import { BoundingBox, Camera, EdgePadding, MarkersFrames } from './MapView.types';
+import { LatLng, Point, Region } from './sharedTypes';
+export interface Spec extends TurboModule {
+    animateCamera: (viewTag: number, camera: Partial<Camera>, duration: number) => Promise<void>;
+    animateToRegion: (viewTag: number, region: Region, duration: number) => Promise<void>;
+    coordinateForPoint: (viewTag: number, point: Point) => Promise<LatLng>;
+    fitToCoordinates: (viewTag: number, coordinates: LatLng[], edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToElements: (viewTag: number, edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToSuppliedMarkers: (viewTag: number, markers: string[], edgePadding: EdgePadding, duration: number) => Promise<void>;
+    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,29 @@
+import type { TurboModule } from 'react-native';
+import { Address, BoundingBox, Camera, EdgePadding, MarkersFrames } from './MapView.types';
+import { LatLng, Point, Region } from './sharedTypes';
+export interface Spec extends TurboModule {
+    animateCamera: (viewTag: number, camera: Partial<Camera>, duration: number) => Promise<void>;
+    animateToRegion: (viewTag: number, region: Region, duration: number) => Promise<void>;
+    coordinateForPoint: (viewTag: number, point: Point) => Promise<LatLng>;
+    /** android only */
+    enableLatestRenderer: () => Promise<string>;
+    fitToCoordinates: (viewTag: number, coordinates: LatLng[], edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToElements: (viewTag: number, edgePadding: EdgePadding, duration: number) => Promise<void>;
+    fitToSuppliedMarkers: (viewTag: number, markers: string[], edgePadding: EdgePadding, duration: number) => Promise<void>;
+    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/lib/index.d.ts

@@ -1,38 +1,31 @@
-import MapView, { AnimatedMapView as Animated, MAP_TYPES, enableLatestRenderer, MapViewProps } from './MapView';
-import Marker from './MapMarker';
-export { MapMarker } from './MapMarker';
+export { default, enableLatestRenderer, MAP_TYPES } from './MapView';
+export type { MapViewProps } from './MapView';
+export { default as Marker } from './MapMarker';
 export type { MapMarkerProps } from './MapMarker';
-import Overlay from './MapOverlay';
-export { MapOverlay } from './MapOverlay';
+export { default as Overlay } from './MapOverlay';
 export type { MapOverlayProps } from './MapOverlay';
-export { default as Polyline, MapPolyline } from './MapPolyline';
+export { default as Polyline } from './MapPolyline';
 export type { MapPolylineProps } from './MapPolyline';
-export { default as Heatmap, MapHeatmap } from './MapHeatmap';
+export { default as Heatmap } from './MapHeatmap';
 export type { MapHeatmapProps } from './MapHeatmap';
-export { default as Polygon, MapPolygon } from './MapPolygon';
+export { default as Polygon } from './MapPolygon';
 export type { MapPolygonProps } from './MapPolygon';
-export { default as Circle, MapCircle } from './MapCircle';
+export { default as Circle } from './MapCircle';
 export type { MapCircleProps } from './MapCircle';
-export { default as UrlTile, MapUrlTile } from './MapUrlTile';
+export { default as UrlTile } from './MapUrlTile';
 export type { MapUrlTileProps } from './MapUrlTile';
-export { default as WMSTile, MapWMSTile } from './MapWMSTile';
+export { default as WMSTile } from './MapWMSTile';
 export type { MapWMSTileProps } from './MapWMSTile';
-export { default as LocalTile, MapLocalTile } from './MapLocalTile';
+export { default as LocalTile } from './MapLocalTile';
 export type { MapLocalTileProps } from './MapLocalTile';
-export { default as Callout, MapCallout } from './MapCallout';
+export { default as Callout } from './MapCallout';
 export type { MapCalloutProps } from './MapCallout';
-export { default as CalloutSubview, MapCalloutSubview, } from './MapCalloutSubview';
+export { default as CalloutSubview } from './MapCalloutSubview';
 export type { MapCalloutSubviewProps } from './MapCalloutSubview';
-export { default as AnimatedRegion } from './AnimatedRegion';
 export { default as Geojson } from './Geojson';
 export type { GeojsonProps } from './Geojson';
-export { Marker, Overlay };
-export type { MapViewProps };
-export { Animated, MAP_TYPES, enableLatestRenderer };
+export { default as AnimatedRegion } from './AnimatedRegion';
 export * from './ProviderConstants';
 export * from './MapView.types';
 export * from './MapPolygon.types';
 export * from './sharedTypes';
-export declare const MarkerAnimated: import("react-native").Animated.AnimatedComponent<typeof import("./MapMarker").MapMarker>;
-export declare const OverlayAnimated: import("react-native").Animated.AnimatedComponent<typeof import("./MapOverlay").MapOverlay>;
-export default MapView;

package/lib/index.js

@@ -10,18 +10,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -29,54 +17,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OverlayAnimated = exports.MarkerAnimated = exports.enableLatestRenderer = exports.MAP_TYPES = exports.Animated = exports.Overlay = exports.Marker = exports.Geojson = exports.AnimatedRegion = exports.MapCalloutSubview = exports.CalloutSubview = exports.MapCallout = exports.Callout = exports.MapLocalTile = exports.LocalTile = exports.MapWMSTile = exports.WMSTile = exports.MapUrlTile = exports.UrlTile = exports.MapCircle = exports.Circle = exports.MapPolygon = exports.Polygon = exports.MapHeatmap = exports.Heatmap = exports.MapPolyline = exports.Polyline = exports.MapOverlay = exports.MapMarker = void 0;
-const MapView_1 = __importStar(require("./MapView"));
-Object.defineProperty(exports, "Animated", { enumerable: true, get: function () { return MapView_1.AnimatedMapView; } });
-Object.defineProperty(exports, "MAP_TYPES", { enumerable: true, get: function () { return MapView_1.MAP_TYPES; } });
+exports.AnimatedRegion = exports.Geojson = exports.CalloutSubview = exports.Callout = exports.LocalTile = exports.WMSTile = exports.UrlTile = exports.Circle = exports.Polygon = exports.Heatmap = exports.Polyline = exports.Overlay = exports.Marker = exports.MAP_TYPES = exports.enableLatestRenderer = exports.default = void 0;
+var MapView_1 = require("./MapView");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(MapView_1).default; } });
 Object.defineProperty(exports, "enableLatestRenderer", { enumerable: true, get: function () { return MapView_1.enableLatestRenderer; } });
-const MapMarker_1 = __importDefault(require("./MapMarker"));
-exports.Marker = MapMarker_1.default;
-var MapMarker_2 = require("./MapMarker");
-Object.defineProperty(exports, "MapMarker", { enumerable: true, get: function () { return MapMarker_2.MapMarker; } });
-const MapOverlay_1 = __importDefault(require("./MapOverlay"));
-exports.Overlay = MapOverlay_1.default;
-var MapOverlay_2 = require("./MapOverlay");
-Object.defineProperty(exports, "MapOverlay", { enumerable: true, get: function () { return MapOverlay_2.MapOverlay; } });
+Object.defineProperty(exports, "MAP_TYPES", { enumerable: true, get: function () { return MapView_1.MAP_TYPES; } });
+var MapMarker_1 = require("./MapMarker");
+Object.defineProperty(exports, "Marker", { enumerable: true, get: function () { return __importDefault(MapMarker_1).default; } });
+var MapOverlay_1 = require("./MapOverlay");
+Object.defineProperty(exports, "Overlay", { enumerable: true, get: function () { return __importDefault(MapOverlay_1).default; } });
 var MapPolyline_1 = require("./MapPolyline");
 Object.defineProperty(exports, "Polyline", { enumerable: true, get: function () { return __importDefault(MapPolyline_1).default; } });
-Object.defineProperty(exports, "MapPolyline", { enumerable: true, get: function () { return MapPolyline_1.MapPolyline; } });
 var MapHeatmap_1 = require("./MapHeatmap");
 Object.defineProperty(exports, "Heatmap", { enumerable: true, get: function () { return __importDefault(MapHeatmap_1).default; } });
-Object.defineProperty(exports, "MapHeatmap", { enumerable: true, get: function () { return MapHeatmap_1.MapHeatmap; } });
 var MapPolygon_1 = require("./MapPolygon");
 Object.defineProperty(exports, "Polygon", { enumerable: true, get: function () { return __importDefault(MapPolygon_1).default; } });
-Object.defineProperty(exports, "MapPolygon", { enumerable: true, get: function () { return MapPolygon_1.MapPolygon; } });
 var MapCircle_1 = require("./MapCircle");
 Object.defineProperty(exports, "Circle", { enumerable: true, get: function () { return __importDefault(MapCircle_1).default; } });
-Object.defineProperty(exports, "MapCircle", { enumerable: true, get: function () { return MapCircle_1.MapCircle; } });
 var MapUrlTile_1 = require("./MapUrlTile");
 Object.defineProperty(exports, "UrlTile", { enumerable: true, get: function () { return __importDefault(MapUrlTile_1).default; } });
-Object.defineProperty(exports, "MapUrlTile", { enumerable: true, get: function () { return MapUrlTile_1.MapUrlTile; } });
 var MapWMSTile_1 = require("./MapWMSTile");
 Object.defineProperty(exports, "WMSTile", { enumerable: true, get: function () { return __importDefault(MapWMSTile_1).default; } });
-Object.defineProperty(exports, "MapWMSTile", { enumerable: true, get: function () { return MapWMSTile_1.MapWMSTile; } });
 var MapLocalTile_1 = require("./MapLocalTile");
 Object.defineProperty(exports, "LocalTile", { enumerable: true, get: function () { return __importDefault(MapLocalTile_1).default; } });
-Object.defineProperty(exports, "MapLocalTile", { enumerable: true, get: function () { return MapLocalTile_1.MapLocalTile; } });
 var MapCallout_1 = require("./MapCallout");
 Object.defineProperty(exports, "Callout", { enumerable: true, get: function () { return __importDefault(MapCallout_1).default; } });
-Object.defineProperty(exports, "MapCallout", { enumerable: true, get: function () { return MapCallout_1.MapCallout; } });
 var MapCalloutSubview_1 = require("./MapCalloutSubview");
 Object.defineProperty(exports, "CalloutSubview", { enumerable: true, get: function () { return __importDefault(MapCalloutSubview_1).default; } });
-Object.defineProperty(exports, "MapCalloutSubview", { enumerable: true, get: function () { return MapCalloutSubview_1.MapCalloutSubview; } });
-var AnimatedRegion_1 = require("./AnimatedRegion");
-Object.defineProperty(exports, "AnimatedRegion", { enumerable: true, get: function () { return __importDefault(AnimatedRegion_1).default; } });
 var Geojson_1 = require("./Geojson");
 Object.defineProperty(exports, "Geojson", { enumerable: true, get: function () { return __importDefault(Geojson_1).default; } });
+var AnimatedRegion_1 = require("./AnimatedRegion");
+Object.defineProperty(exports, "AnimatedRegion", { enumerable: true, get: function () { return __importDefault(AnimatedRegion_1).default; } });
 __exportStar(require("./ProviderConstants"), exports);
 __exportStar(require("./MapView.types"), exports);
 __exportStar(require("./MapPolygon.types"), exports);
 __exportStar(require("./sharedTypes"), exports);
-exports.MarkerAnimated = MapMarker_1.default.Animated;
-exports.OverlayAnimated = MapOverlay_1.default.Animated;
-exports.default = MapView_1.default;

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.1",
+  "version": "2.0.0-beta.11",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -45,8 +45,8 @@
     "mapkit"
   ],
   "peerDependencies": {
-    "react": ">= 17.0.1",
-    "react-native": ">= 0.64.3",
+    "react": ">= 18.0.0",
+    "react-native": ">= 0.69.0",
     "react-native-web": ">= 0.11"
   },
   "peerDependenciesMeta": {
@@ -64,13 +64,13 @@
     "@types/react-native": "0.70.13",
     "babel-jest": "29.5.0",
     "detox": "20.7.0",
-    "eslint": "8.38.0",
+    "eslint": "8.39.0",
     "husky": "8.0.3",
     "jest": "29.5.0",
-    "prettier": "2.8.7",
+    "prettier": "2.8.8",
     "react": "18.1.0",
     "react-native": "0.70.9",
-    "semantic-release": "21.0.1",
+    "semantic-release": "21.0.2",
     "typescript": "5.0.4"
   },
   "dependencies": {

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

@@ -9,10 +9,10 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
   s.homepage     = package["homepage"]
   s.license      = package["license"]
-  s.platform     = :ios, "11.0"
+  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/AirMaps/**/*.{h,m}"
+  s.source_files  = "ios/Maps/**/*.{h,m}"
 
   s.dependency 'React-Core'
 end