react-native-maps 1.21.0-alpha.42 → 1.21.0-alpha.44

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -1087,6 +1087,51 @@ id regionAsJSON(MKCoordinateRegion region) {
   return _kmlSrc;
 }
 
+- (void) setKMLData:(NSData *) urlData {
+    GMUKMLParser *parser = [[GMUKMLParser alloc] initWithData:urlData];
+    [parser parse];
+
+    NSUInteger index = 0;
+    NSMutableArray *markers = [[NSMutableArray alloc]init];
+
+    for (GMUPlacemark *place in parser.placemarks) {
+
+      CLLocationCoordinate2D location =((GMUPoint *) place.geometry).coordinate;
+
+      AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)[[AIRGoogleMapMarkerManager alloc] view];
+      if (!marker.bridge) {
+        marker.bridge = _bridge;
+      }
+      marker.identifier = place.title;
+      marker.coordinate = location;
+      marker.title = place.title;
+      marker.subtitle = place.snippet;
+      marker.pinColor = place.style.fillColor;
+      marker.imageSrc = [AIRGoogleMap GetIconUrl:place parser:parser];
+      marker.layer.backgroundColor = [UIColor clearColor].CGColor;
+      marker.layer.position = CGPointZero;
+
+      [self insertReactSubview:(UIView *) marker atIndex:index];
+
+      [markers addObject:@{@"id": marker.identifier,
+                           @"title": marker.title,
+                           @"description": marker.subtitle,
+                           @"coordinate": @{
+                               @"latitude": @(location.latitude),
+                               @"longitude": @(location.longitude)
+                               }
+                           }];
+
+      index++;
+    }
+
+    id event = @{@"markers": markers};
+    if (self.onKmlReady) self.onKmlReady(event);
+  #else
+      REQUIRES_GOOGLE_MAPS_UTILS();
+  #endif
+}
+
 - (void)setKmlSrc:(NSString *)kmlUrl {
 #ifdef HAVE_GOOGLE_MAPS_UTILS
 
@@ -1096,53 +1141,28 @@ id regionAsJSON(MKCoordinateRegion region) {
   NSData *urlData = nil;
 
   if ([url isFileURL]) {
-    urlData = [NSData dataWithContentsOfURL:url];
+      [self setKMLData:[NSData dataWithContentsOfURL:url]];
   } else {
-    urlData = [[NSFileManager defaultManager] contentsAtPath:kmlUrl];
+      __weak AIRGoogleMap *weakSelf = self;
+ 
+      NSURLSession *session = [NSURLSession sharedSession];
+      NSURLSessionDataTask *dataTask = [session dataTaskWithURL:url
+                                              completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+          if (error) {
+              NSLog(@"Error fetching data: %@", error.localizedDescription);
+              return;
+          } else {
+              dispatch_async(dispatch_get_main_queue(), ^{
+                  AIRGoogleMap *strongSelf = weakSelf;
+                  [strongSelf setKMLData:data];
+              });
+
+          }
+      }];
+      [dataTask resume];
   }
 
-  GMUKMLParser *parser = [[GMUKMLParser alloc] initWithData:urlData];
-  [parser parse];
-
-  NSUInteger index = 0;
-  NSMutableArray *markers = [[NSMutableArray alloc]init];
-
-  for (GMUPlacemark *place in parser.placemarks) {
-
-    CLLocationCoordinate2D location =((GMUPoint *) place.geometry).coordinate;
-
-    AIRGoogleMapMarker *marker = (AIRGoogleMapMarker *)[[AIRGoogleMapMarkerManager alloc] view];
-    if (!marker.bridge) {
-      marker.bridge = _bridge;
-    }
-    marker.identifier = place.title;
-    marker.coordinate = location;
-    marker.title = place.title;
-    marker.subtitle = place.snippet;
-    marker.pinColor = place.style.fillColor;
-    marker.imageSrc = [AIRGoogleMap GetIconUrl:place parser:parser];
-    marker.layer.backgroundColor = [UIColor clearColor].CGColor;
-    marker.layer.position = CGPointZero;
-
-    [self insertReactSubview:(UIView *) marker atIndex:index];
-
-    [markers addObject:@{@"id": marker.identifier,
-                         @"title": marker.title,
-                         @"description": marker.subtitle,
-                         @"coordinate": @{
-                             @"latitude": @(location.latitude),
-                             @"longitude": @(location.longitude)
-                             }
-                         }];
-
-    index++;
-  }
-
-  id event = @{@"markers": markers};
-  if (self.onKmlReady) self.onKmlReady(event);
-#else
-    REQUIRES_GOOGLE_MAPS_UTILS();
-#endif
+  
 }
 
 

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -520,6 +520,7 @@ using namespace facebook::react;
     REMAP_MAPVIEW_PROP(zoomTapEnabled)
     REMAP_MAPVIEW_PROP(scrollEnabled)
 
+    REMAP_MAPVIEW_STRING_PROP(kmlSrc)
 
     if (newViewProps.minZoom != oldViewProps.minZoom || newViewProps.maxZoom != oldViewProps.maxZoom){
         [_view setMinZoom:newViewProps.minZoom maxZoom:newViewProps.maxZoom];

package/ios/AirMaps/AIRMap.m

@@ -49,6 +49,8 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 {
     UIView *_legalLabel;
     BOOL _initialRegionSet;
+    BOOL _initialRegionProvided;
+    BOOL _initialCameraProvided;
     BOOL _initialCameraSet;
     BOOL _initialized;
     BOOL _loadingStarted;
@@ -586,6 +588,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         return;
     }
     _initialRegion = initialRegion;
+    _initialRegionProvided = YES;
     if (!_initialRegionSet && _loadingStarted) {
         _initialRegionSet = YES;
         [self setRegion:initialRegion animated:NO];
@@ -600,6 +603,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (void)setInitialCamera:(MKMapCamera*)initialCamera {
     _initialCamera = initialCamera;
+    _initialCameraProvided = YES;
     if (initialCamera){
         if (!_initialCameraSet && _loadingStarted) {
             _initialCameraSet = YES;
@@ -824,8 +828,12 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     }
     _loadingStarted = YES;
     // display initialRegion/Camera
-    [self setInitialRegion:_initialRegion];
-    [self setInitialCamera:_initialCamera];
+    if (_initialRegionProvided){
+        [self setInitialRegion:_initialRegion];
+    }
+    if (_initialCameraProvided){
+        [self setInitialCamera:_initialCamera];
+    }
 }
 
 - (void)finishLoading {

package/ios/AirMaps/RNMapsMapView.mm

@@ -436,17 +436,24 @@ _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
 }
 
 #define REMAP_MAPVIEW_REGION_PROP(name)                                      \
-if (newViewProps.name.latitude != oldViewProps.name.latitude ||          \
-newViewProps.name.longitude != oldViewProps.name.longitude ||        \
-newViewProps.name.latitudeDelta != oldViewProps.name.latitudeDelta ||\
-newViewProps.name.longitudeDelta != oldViewProps.name.longitudeDelta) { \
-MKCoordinateSpan span = MKCoordinateSpanMake(newViewProps.name.latitudeDelta, \
-newViewProps.name.longitudeDelta); \
-MKCoordinateRegion region = MKCoordinateRegionMake(CLLocationCoordinate2DMake( \
-newViewProps.name.latitude, newViewProps.name.longitude), span); \
-_view.name = region;                                                 \
+if (!(newViewProps.name.latitude == 0 &&                                    \
+      newViewProps.name.longitude == 0 &&                                   \
+      newViewProps.name.latitudeDelta == 0 &&                               \
+      newViewProps.name.longitudeDelta == 0)) {                             \
+    if (newViewProps.name.latitude != oldViewProps.name.latitude ||         \
+        newViewProps.name.longitude != oldViewProps.name.longitude ||       \
+        newViewProps.name.latitudeDelta != oldViewProps.name.latitudeDelta ||\
+        newViewProps.name.longitudeDelta != oldViewProps.name.longitudeDelta) { \
+        MKCoordinateSpan span = MKCoordinateSpanMake(newViewProps.name.latitudeDelta, \
+                                                     newViewProps.name.longitudeDelta); \
+        MKCoordinateRegion region = MKCoordinateRegionMake(CLLocationCoordinate2DMake( \
+                                                           newViewProps.name.latitude, \
+                                                           newViewProps.name.longitude), span); \
+        _view.name = region;                                                 \
+    }                                                                        \
 }
 
+
 #define REMAP_MAPVIEW_CAMERA_PROP(name)                                    \
 if (newViewProps.name.center.latitude != oldViewProps.name.center.latitude || \
 newViewProps.name.center.longitude != oldViewProps.name.center.longitude || \

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.21.0-alpha.42",
+  "version": "1.21.0-alpha.44",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",