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

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.4",
+  "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

package/ios/AirMaps/AIRWeakMapReference.h

@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import <Foundation/Foundation.h>
-#import "AIRMap.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface AIRWeakMapReference : NSObject
-
-@property (nonatomic, weak) AIRMap *mapView;
-
-- (instancetype)initWithMapView:(AIRMap *)mapView;
-
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/AirMaps/AIRWeakMapReference.m

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import "AIRWeakMapReference.h"
-
-@implementation AIRWeakMapReference
-
-
-- (instancetype)initWithMapView:(AIRMap *)mapView {
-    self = [super init];
-    if (self) {
-        _mapView = mapView;
-    }
-    return self;
-}
-
-@end

package/ios/AirMaps/AIRWeakTimerReference.h

@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface AIRWeakTimerReference : NSObject
-
-- (instancetype)initWithTarget:(id)target andSelector:(SEL)selector;
-- (void)timerDidFire:(NSTimer *)timer;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/AirMaps/AIRWeakTimerReference.m

@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import "AIRWeakTimerReference.h"
-
-@implementation AIRWeakTimerReference
-{
-    __weak NSObject *_target;
-    SEL _selector;
-}
-
-
-- (instancetype)initWithTarget:(id)target andSelector:(SEL)selector {
-        self = [super init];
-        if (self) {
-            _target = target;
-            _selector = selector;
-        }
-        return self;
-}
-
-
-- (void)timerDidFire:(NSTimer *)timer
-{
-    if(_target)
-    {
-        [_target performSelector:_selector withObject:timer];
-    }
-    else
-    {
-        [timer invalidate];
-    }
-}
-
-
-@end