react-native-maps 1.8.3 → 1.9.0

package/android/build.gradle

@@ -49,9 +49,9 @@ repositories {
 
 dependencies {
   implementation 'com.facebook.react:react-native:+'
-  implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.1.0')}"
-  implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.0.2')}"
+  implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.2.0')}"
+  implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.2.0')}"
   implementation "com.google.android.gms:play-services-location:21.0.1"
-  implementation 'com.google.maps.android:android-maps-utils:3.4.0'
+  implementation 'com.google.maps.android:android-maps-utils:3.8.2'
   implementation "androidx.work:work-runtime:2.7.1"
 }

package/android/src/main/java/com/rnmaps/maps/MapManager.java

@@ -13,6 +13,8 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -67,9 +69,21 @@ public class MapManager extends ViewGroupManager<MapView> {
   }
 
   @Override
-  protected MapView createViewInstance(ThemedReactContext context) {
+  protected MapView createViewInstance(@NonNull ThemedReactContext context) {
     return new MapView(context, this.appContext, this, googleMapOptions);
   }
+  @Override
+  protected MapView createViewInstance(int reactTag, @NonNull ThemedReactContext reactContext, @Nullable ReactStylesDiffMap initialProps, @Nullable StateWrapper stateWrapper) {
+    if (initialProps != null){
+      if (initialProps.getString("googleMapId") != null) {
+        googleMapOptions.mapId(initialProps.getString("googleMapId"));
+      }
+      if (initialProps.hasKey("liteMode")) {
+        googleMapOptions.liteMode(initialProps.getBoolean("liteMode", false));
+      }
+    }
+    return super.createViewInstance(reactTag, reactContext, initialProps, stateWrapper);
+  }
 
   private void emitMapError(ThemedReactContext context, String message, String type) {
     WritableMap error = Arguments.createMap();
@@ -86,6 +100,18 @@ public class MapManager extends ViewGroupManager<MapView> {
     view.setRegion(region);
   }
 
+  @ReactProp(name = "liteMode", defaultBoolean = false)
+  public void setLiteMode(MapView view, boolean liteMode) {
+      googleMapOptions.liteMode(liteMode);
+  }
+
+  @ReactProp(name = "googleMapId")
+  public void setGoogleMapId(MapView view, @Nullable String googleMapId) {
+    if (googleMapId != null) {
+      googleMapOptions.mapId(googleMapId);
+    }
+  }
+
   @ReactProp(name = "initialRegion")
   public void setInitialRegion(MapView view, ReadableMap initialRegion) {
     view.setInitialRegion(initialRegion);

package/android/src/main/java/com/rnmaps/maps/MapsPackage.java

@@ -34,7 +34,6 @@ public class MapsPackage implements ReactPackage {
     viewManagers.add(new MapGradientPolylineManager(reactContext));
     viewManagers.add(new MapPolygonManager(reactContext));
     viewManagers.add(new MapCircleManager(reactContext));
-    viewManagers.add(new MapLiteManager(reactContext));
     viewManagers.add(new MapUrlTileManager(reactContext));
     viewManagers.add(new MapWMSTileManager(reactContext));
     viewManagers.add(new MapLocalTileManager(reactContext));

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -79,6 +79,7 @@
 + (GMSCameraPosition*)makeGMSCameraPositionFromMap:(GMSMapView *)map andMKCoordinateRegion:(MKCoordinateRegion)region;
 
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
+- (instancetype) initWithMapId:(NSString *) mapId;
 
 @end
 

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -68,11 +68,21 @@ id regionAsJSON(MKCoordinateRegion region) {
   BOOL _didPrepareMap;
   BOOL _didCallOnMapReady;
   BOOL _zoomTapEnabled;
+  NSString* _googleMapId;
 }
 
-- (instancetype)init
+- (instancetype)initWithMapId:(NSString *)mapId
 {
-  if ((self = [super init])) {
+    if (mapId){
+        GMSMapID *mapID = [GMSMapID mapIDWithIdentifier:mapId];
+        GMSCameraPosition *camera = [GMSCameraPosition cameraWithLatitude:47.0169
+                                                                longitude:-122.336471
+                                                                     zoom:12];
+        self = [super initWithFrame:CGRectZero mapID:mapID camera:camera];
+    } else {
+        self = [super init];
+    }
+    if (self) {
     _reactSubviews = [NSMutableArray new];
     _markers = [NSMutableArray array];
     _polygons = [NSMutableArray array];
@@ -105,6 +115,10 @@ id regionAsJSON(MKCoordinateRegion region) {
   return self;
 }
 
+- (instancetype) init {
+  return [self initWithMapId:nil];
+}
+
 - (void)dealloc {
   [self removeObserver:self
             forKeyPath:@"myLocation"
@@ -292,6 +306,10 @@ id regionAsJSON(MKCoordinateRegion region) {
   }
 }
 
+- (void) setGoogleMapId:(NSString *) googleMapId {
+    _googleMapId = googleMapId;
+}
+
 - (void)setCameraProp:(GMSCameraPosition*)camera {
     _initialCamera = camera;
     self.camera = camera;
@@ -815,7 +833,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                     @"latitude": @(location.coordinate.latitude),
                     @"longitude": @(location.coordinate.longitude),
                     @"altitude": @(location.altitude),
-                    @"timestamp": @(location.timestamp.timeIntervalSinceReferenceDate * 1000),
+                    @"timestamp": @(location.timestamp.timeIntervalSince1970 * 1000),
                     @"accuracy": @(location.horizontalAccuracy),
                     @"altitudeAccuracy": @(location.verticalAccuracy),
                     @"speed": @(location.speed),

package/ios/AirGoogleMaps/AIRGoogleMapManager.h

@@ -10,6 +10,9 @@
 #import <React/RCTViewManager.h>
 
 @interface AIRGoogleMapManager : RCTViewManager
+
+@property (nonatomic, strong) NSDictionary *initialProps;
+
 @property (nonatomic) BOOL isGesture;
 
 @end

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -46,8 +46,11 @@ RCT_EXPORT_MODULE()
 - (UIView *)view
 {
   [GMSServices setMetalRendererEnabled:YES];
-  
-  AIRGoogleMap *map = [AIRGoogleMap new];
+  NSString* googleMapId  = nil;
+  if (self.initialProps && self.initialProps[@"googleMapId"]){
+    googleMapId  = self.initialProps[@"googleMapId"];
+  }
+  AIRGoogleMap *map = [[AIRGoogleMap alloc] initWithMapId:googleMapId];
   map.bridge = self.bridge;
   map.delegate = self;
   map.isAccessibilityElement = NO;
@@ -67,6 +70,7 @@ RCT_EXPORT_MODULE()
 
 RCT_EXPORT_VIEW_PROPERTY(isAccessibilityElement, BOOL)
 RCT_REMAP_VIEW_PROPERTY(testID, accessibilityIdentifier, NSString)
+RCT_EXPORT_VIEW_PROPERTY(googleMapId, NSString)
 RCT_EXPORT_VIEW_PROPERTY(initialCamera, GMSCameraPosition)
 RCT_REMAP_VIEW_PROPERTY(camera, cameraProp, GMSCameraPosition)
 RCT_EXPORT_VIEW_PROPERTY(initialRegion, MKCoordinateRegion)

package/ios/AirMaps/AIRMapCircle.m

@@ -114,56 +114,4 @@
     return NO;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@end
+@end

package/ios/AirMaps/AIRMapCoordinate.m

@@ -6,7 +6,5 @@
 #import "AIRMapCoordinate.h"
 
 
-@implementation AIRMapCoordinate {
-
-}
-@end
+@implementation AIRMapCoordinate
+@end

package/ios/AirMaps/AIRMapManager.m

@@ -915,7 +915,7 @@ static int kDragCenterContext;
                          @"latitude": @(location.coordinate.latitude),
                          @"longitude": @(location.coordinate.longitude),
                          @"altitude": @(location.location.altitude),
-                         @"timestamp": @(location.location.timestamp.timeIntervalSinceReferenceDate * 1000),
+                         @"timestamp": @(location.location.timestamp.timeIntervalSince1970 * 1000),
                          @"accuracy": @(location.location.horizontalAccuracy),
                          @"altitudeAccuracy": @(location.location.verticalAccuracy),
                          @"speed": @(location.location.speed),

package/ios/AirMaps/AIRMapPolygon.m

@@ -123,56 +123,4 @@
     return NO;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 @end

package/ios/AirMaps/RCTComponentData+Maps.h

@@ -0,0 +1,13 @@
+//
+//  RCTComponentData+Maps.h
+//  AirMaps
+//
+//  Created by Salah Ghanim on 24.12.23.
+//  Copyright © 2023 Christopher. All rights reserved.
+//
+
+#import <React/RCTComponentData.h>
+
+@interface RCTComponentData (Maps)
+
+@end

package/ios/AirMaps/RCTComponentData+Maps.m

@@ -0,0 +1,55 @@
+//
+//  RCTComponentData+Maps.m
+//  AirMaps
+//
+//  Created by Salah Ghanim on 24.12.23.
+//  Copyright © 2023 Christopher. All rights reserved.
+//
+
+#import "RCTComponentData+Maps.h"
+#import <objc/runtime.h>
+#import <Foundation/NSObjCRuntime.h>
+
+@implementation RCTComponentData (Maps)
+
+
+- (void) myCustom_setProps:(NSDictionary<NSString *, id> *)props forShadowView:(RCTShadowView *)shadowView{
+    // Pass initialProps to any manager that supports initialProps
+    id manager = [self manager];
+     if ([manager respondsToSelector:@selector(setInitialProps:)]) {
+         [manager performSelector:@selector(setInitialProps:) withObject:props];
+     }
+
+    // Call the original method
+    [self myCustom_setProps:props forShadowView:shadowView];
+}
+
++ (void)load {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        Class class = [RCTComponentData class]; // Or the class where the method is defined
+
+        SEL originalSelector = @selector(setProps:forShadowView:);
+        SEL swizzledSelector = @selector(myCustom_setProps:forShadowView:);
+
+        Method originalMethod = class_getInstanceMethod(class, originalSelector);
+        Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
+
+        BOOL didAddMethod = class_addMethod(class,
+                                            originalSelector,
+                                            method_getImplementation(swizzledMethod),
+                                            method_getTypeEncoding(swizzledMethod));
+
+        if (didAddMethod) {
+            class_replaceMethod(class,
+                                swizzledSelector,
+                                method_getImplementation(originalMethod),
+                                method_getTypeEncoding(originalMethod));
+        } else {
+            method_exchangeImplementations(originalMethod, swizzledMethod);
+        }
+    });
+}
+
+
+@end

package/ios/AirMaps.xcodeproj/project.pbxproj

@@ -25,6 +25,7 @@
 		2163AA501FEAEDD100BBEC95 /* AIRMapPolylineRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2163AA4F1FEAEDD100BBEC95 /* AIRMapPolylineRenderer.m */; };
 		4C99C9DE2226CF2800A8693E /* AIRWeakTimerReference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C99C9DD2226CF2800A8693E /* AIRWeakTimerReference.m */; };
 		4C99C9E12226D8C400A8693E /* AIRWeakMapReference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C99C9E02226D8C400A8693E /* AIRWeakMapReference.m */; };
+		4E0CFBDE2B388F2B0017E126 /* RCTComponentData+Maps.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */; };
 		53D31636202E723B00B55447 /* AIRMapOverlayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D31635202E723B00B55447 /* AIRMapOverlayManager.m */; };
 		53D3163A202E72FC00B55447 /* AIRMapOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D31639202E72FC00B55447 /* AIRMapOverlay.m */; };
 		53D3163D202E734F00B55447 /* AIRMapOverlayRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D3163C202E734F00B55447 /* AIRMapOverlayRenderer.m */; };
@@ -112,6 +113,8 @@
 		4C99C9DD2226CF2800A8693E /* AIRWeakTimerReference.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AIRWeakTimerReference.m; sourceTree = "<group>"; };
 		4C99C9DF2226D8C400A8693E /* AIRWeakMapReference.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AIRWeakMapReference.h; sourceTree = "<group>"; };
 		4C99C9E02226D8C400A8693E /* AIRWeakMapReference.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AIRWeakMapReference.m; sourceTree = "<group>"; };
+		4E0CFBDC2B388F2B0017E126 /* RCTComponentData+Maps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTComponentData+Maps.h"; sourceTree = "<group>"; };
+		4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTComponentData+Maps.m"; sourceTree = "<group>"; };
 		53D31635202E723B00B55447 /* AIRMapOverlayManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AIRMapOverlayManager.m; sourceTree = "<group>"; };
 		53D31637202E725E00B55447 /* AIRMapOverlayManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AIRMapOverlayManager.h; sourceTree = "<group>"; };
 		53D31638202E72D500B55447 /* AIRMapOverlay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AIRMapOverlay.h; sourceTree = "<group>"; };
@@ -217,6 +220,8 @@
 		11FA5C531C4A1296003AC2EE /* AirMaps */ = {
 			isa = PBXGroup;
 			children = (
+				4E0CFBDC2B388F2B0017E126 /* RCTComponentData+Maps.h */,
+				4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */,
 				BE2E4EC72621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.h */,
 				BE2E4EC82621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m */,
 				1125B2BD1C4AD3DA007D0023 /* AIRMap.h */,
@@ -399,6 +404,7 @@
 				A8494E28218891020092506D /* AIRMapWMSTileManager.m in Sources */,
 				1125B2DB1C4AD3DA007D0023 /* AIRMapCallout.m in Sources */,
 				53D31636202E723B00B55447 /* AIRMapOverlayManager.m in Sources */,
+				4E0CFBDE2B388F2B0017E126 /* RCTComponentData+Maps.m in Sources */,
 				1125B2E01C4AD3DA007D0023 /* AIRMapManager.m in Sources */,
 				1125B2E61C4AD3DA007D0023 /* AIRMapPolylineManager.m in Sources */,
 				9B9498DA2017EFB800158761 /* AIRGoogleMapPolygon.m in Sources */,

package/lib/MapView.d.ts

@@ -95,6 +95,11 @@ export type MapViewProps = ViewProps & {
      * @platform Android: Supported
      */
     liteMode?: boolean;
+    /**
+     * https://developers.google.com/maps/documentation/get-map-id
+     * google cloud mapId to enable cloud styling and more
+     */
+    googleMapId?: string;
     /**
      * Sets loading background color.
      *

package/lib/MapView.js

@@ -309,6 +309,8 @@ class MapView extends React.Component {
                 initialRegion: null,
                 onChange: this._onChange,
                 onMapReady: this._onMapReady,
+                liteMode: this.props.liteMode,
+                googleMapId: this.props.googleMapId,
                 ref: this.map,
                 customMapStyleString: this.props.customMapStyle
                     ? JSON.stringify(this.props.customMapStyle)
@@ -329,6 +331,8 @@ class MapView extends React.Component {
             props = {
                 style: this.props.style,
                 region: null,
+                liteMode: this.props.liteMode,
+                googleMapId: this.props.googleMapId,
                 initialRegion: this.props.initialRegion || null,
                 initialCamera: this.props.initialCamera,
                 ref: this.map,
@@ -340,11 +344,6 @@ class MapView extends React.Component {
                     : undefined,
             };
         }
-        if (react_native_1.Platform.OS === 'android' && this.props.liteMode) {
-            return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
-          <AIRMapLite {...props}/>
-        </decorateMapComponent_1.ProviderContext.Provider>);
-        }
         const AIRMap = getNativeMapComponent(this.props.provider);
         return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
         <AIRMap {...props}/>
@@ -364,9 +363,6 @@ else {
         : (0, decorateMapComponent_1.createNotSupportedComponent)('react-native-maps: AirGoogleMaps 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')
-    : () => null;
 exports.AnimatedMapView = react_native_1.Animated.createAnimatedComponent(MapView);
 const enableLatestRenderer = () => {
     if (react_native_1.Platform.OS !== 'android') {

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": "1.8.3",
+  "version": "1.9.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/android/src/main/java/com/rnmaps/maps/MapLiteManager.java

@@ -1,20 +0,0 @@
-package com.rnmaps.maps;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.google.android.gms.maps.GoogleMapOptions;
-
-public class MapLiteManager extends MapManager {
-
-  private static final String REACT_CLASS = "AIRMapLite";
-
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
-  public MapLiteManager(ReactApplicationContext context) {
-    super(context);
-    this.googleMapOptions = new GoogleMapOptions().liteMode(true);
-  }
-
-}