Bug fix: Info window closed after click on marker and camera move whe…

…n using marker cluster on iOS #1697
mapsplugin · Sep 1, 2017 · 5692f3d · 5692f3d
1 parent 2e726f5
commit 5692f3d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 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-1541" 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-1651" 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/GoogleMapsViewController.m b/src/ios/GoogleMaps/GoogleMapsViewController.m
@@ -413,8 +413,8 @@ - (BOOL)mapView:(GMSMapView *)mapView didTapMarker:(GMSMarker *)marker {
           [self triggerMarkerEvent:@"info_close" marker:self.activeMarker];
         }
       }
+      [self triggerClusterEvent:@"cluster_click" marker:marker];
     }
-    [self triggerClusterEvent:@"cluster_click" marker:marker];
   } else {
     [self execJS:@"javascript:if(window.cordova){cordova.fireDocumentEvent('plugin_touch', {});}"];
     [self triggerMarkerEvent:@"marker_click" marker:marker];

diff --git a/src/ios/GoogleMaps/PluginMarkerCluster.m b/src/ios/GoogleMaps/PluginMarkerCluster.m
@@ -274,7 +274,7 @@ - (void)redrawClusters:(CDVInvokedUrlCommand*)command {
     // mapping markers on the map
     //---------------------------
     [[NSOperationQueue mainQueue] addOperationWithBlock: ^{
-      self.mapCtrl.map.selectedMarker = nil;
+      //self.mapCtrl.map.selectedMarker = nil;
       NSString *clusterId_markerId;
       NSMutableDictionary *markerProperties;
       GMSMarker *marker;