Bug fix: Markers Sometimes Missing #1689

mapsplugin · Sep 1, 2017 · 2e726f5 · 2e726f5
1 parent 4a0b433
commit 2e726f5
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-googlemaps" version="2.0.0-beta3-20170901-1415" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cordova-plugin-googlemaps" version="2.0.0-beta3-20170901-1541" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>cordova-plugin-googlemaps</name>
     <js-module name="BaseClass" src="www/BaseClass.js">
       <runs />

diff --git a/src/ios/GoogleMaps/PluginCircle.m b/src/ios/GoogleMaps/PluginCircle.m
@@ -77,7 +77,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
         }
 
         BOOL isVisible = NO;
-        if ([[json valueForKey:@"visible"] boolValue]) {
+        if (json[@"visible"]) {
             circle.map = self.mapCtrl.map;
             isVisible = YES;
         }

diff --git a/src/ios/GoogleMaps/PluginGroundOverlay.m b/src/ios/GoogleMaps/PluginGroundOverlay.m
@@ -93,7 +93,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
         }
 
         BOOL isVisible = NO;
-        if ([[json valueForKey:@"visible"] boolValue]) {
+        if (json[@"visible"]) {
             groundOverlay.map = self.mapCtrl.map;
             isVisible = YES;
         }

diff --git a/src/ios/GoogleMaps/PluginMarker.m b/src/ios/GoogleMaps/PluginMarker.m
@@ -166,8 +166,8 @@ - (void)_create:(NSString *)markerId markerOptions:(NSDictionary *)json callback
   }
 
   // Visible property
-  if ([json valueForKey:@"visible"]) {
-    [iconProperty setObject:[json valueForKey:@"visible"] forKey:@"visible"];
+  if (json[@"visible"]) {
+    [iconProperty setObject:json[@"visible"] forKey:@"visible"];
   } else {
     [iconProperty setObject:[NSNumber numberWithBool:true] forKey:@"visible"];
   }
@@ -188,7 +188,7 @@ - (void)_create:(NSString *)markerId markerOptions:(NSDictionary *)json callback
     // Load icon in asynchronise
     [self setIcon_:marker iconProperty:iconProperty callbackBlock:callbackBlock];
   } else {
-    if ([[json valueForKey:@"visible"] boolValue]) {
+    if (json[@"visible"]) {
       marker.map = self.mapCtrl.map;
     }
 
@@ -1108,7 +1108,7 @@ -(void)setIcon_:(GMSMarker *)marker iconProperty:(NSDictionary *)iconProperty ca
 
 
       // The `visible` property
-      if ([iconProperty[@"visible"] boolValue]) {
+      if (iconProperty[@"visible"]) {
         marker.map = self.mapCtrl.map;
       }
 
@@ -1147,7 +1147,7 @@ -(void)setIcon_:(GMSMarker *)marker iconProperty:(NSDictionary *)iconProperty ca
       if (!succeeded) {
         NSLog(@"[fail] url = %@", url);
         // The `visible` property
-        if ([[iconProperty valueForKey:@"visible"] boolValue]) {
+        if (iconProperty[@"visible"]) {
           marker.map = self.mapCtrl.map;
         }
         if ([[UIImageCache sharedInstance].iconCacheKeys objectForKey:iconCacheKey]) {
@@ -1200,7 +1200,7 @@ -(void)setIcon_:(GMSMarker *)marker iconProperty:(NSDictionary *)iconProperty ca
         }
 
         // The `visible` property
-        if ([[iconProperty valueForKey:@"visible"] boolValue]) {
+        if (iconProperty[@"visible"]) {
           marker.map = self.mapCtrl.map;
         }
 

diff --git a/src/ios/GoogleMaps/PluginMarkerCluster.m b/src/ios/GoogleMaps/PluginMarkerCluster.m
@@ -203,7 +203,7 @@ - (void)redrawClusters:(CDVInvokedUrlCommand*)command {
       if ([clusterData objectForKey:@"title"]) {
         [properties setObject:[clusterData objectForKey:@"title"] forKey:@"title"];
       }
-      if ([clusterData objectForKey:@"visible"]) {
+      if (clusterData[@"visible"]) {
         [properties setObject:[clusterData objectForKey:@"visible"] forKey:@"visible"];
       } else {
         [properties setObject:[NSNumber numberWithBool:true] forKey:@"visible"];

diff --git a/src/ios/GoogleMaps/PluginPolygon.m b/src/ios/GoogleMaps/PluginPolygon.m
@@ -95,7 +95,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
       }
 
       BOOL isVisible = NO;
-      if ([[json valueForKey:@"visible"] boolValue]) {
+      if (json[@"visible"]) {
         polygon.map = self.mapCtrl.map;
         isVisible = YES;
       }

diff --git a/src/ios/GoogleMaps/PluginPolyline.m b/src/ios/GoogleMaps/PluginPolyline.m
@@ -75,7 +75,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
       GMSPolyline *polyline = [GMSPolyline polylineWithPath:mutablePath];
 
       BOOL isVisible = NO;
-      if ([[json valueForKey:@"visible"] boolValue]) {
+      if (json[@"visible"]) {
         polyline.map = self.mapCtrl.map;
         isVisible = YES;
       }

diff --git a/src/ios/GoogleMaps/PluginTileOverlay.m b/src/ios/GoogleMaps/PluginTileOverlay.m
@@ -117,7 +117,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
 
 
 
-      if ([[json valueForKey:@"visible"] boolValue]) {
+      if (json[@"visible"]) {
         layer.map = self.mapCtrl.map;
       }
       if ([json valueForKey:@"zIndex"]) {