Fix #124: Cannot detect GMSCircle when tapping the circle.

mapsplugin · Jul 12, 2014 · c1a6743 · c1a6743
1 parent b141bbf
commit c1a6743
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 29 deletions.
diff --git a/src/ios/GoogleMaps/Circle.m b/src/ios/GoogleMaps/Circle.m
@@ -41,7 +41,7 @@ -(void)createCircle:(CDVInvokedUrlCommand *)command
 
   NSString *id = [NSString stringWithFormat:@"circle_%lu", (unsigned long)circle.hash];
   [self.mapCtrl.overlayManager setObject:circle forKey: id];
-
+  circle.title = id;
 
   NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
   [result setObject:id forKey:@"id"];

diff --git a/src/ios/GoogleMaps/GoogleMaps.h b/src/ios/GoogleMaps/GoogleMaps.h
@@ -29,4 +29,5 @@
 - (void)resizeMap:(CDVInvokedUrlCommand *)command;
 - (void)setDiv:(CDVInvokedUrlCommand *)command;
 - (void)isAvailable:(CDVInvokedUrlCommand *)command;
+- (void)clear:(CDVInvokedUrlCommand*)command;
 @end
diff --git a/src/ios/GoogleMaps/GoogleMaps.m b/src/ios/GoogleMaps/GoogleMaps.m
@@ -428,4 +428,16 @@ -(void)isAvailable:(CDVInvokedUrlCommand *)command
   CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
+
+/**
+ * Clear all markups
+ */
+- (void)clear:(CDVInvokedUrlCommand *)command {
+  [self.mapCtrl.overlayManager removeAllObjects];
+  [self.mapCtrl.map clear];
+
+  CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+  [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 @end
diff --git a/src/ios/GoogleMaps/GoogleMapsViewController.m b/src/ios/GoogleMaps/GoogleMapsViewController.m
@@ -273,17 +273,12 @@ - (BOOL)mapView:(GMSMapView *)mapView didTapMarker:(GMSMarker *)marker {
 
 - (void)mapView:(GMSMapView *)mapView didTapOverlay:(GMSOverlay *)overlay {
   NSString *overlayClass = NSStringFromClass([overlay class]);
-  if([overlayClass isEqualToString:@"GMSPolygon"]) {
-    [self triggerOverlayEvent:@"overlay_click" type:@"polygon" overlay:overlay];
-  }
-  if([overlayClass isEqualToString:@"GMSPolyline"]) {
-    [self triggerOverlayEvent:@"overlay_click" type:@"polyline" overlay:overlay];
-  }
-  if([overlayClass isEqualToString:@"GMSCircle"]) {
-    [self triggerOverlayEvent:@"overlay_click" type:@"circle" overlay:overlay];
-  }
-  if([overlayClass isEqualToString:@"GMSGroundOverlay"]) {
-    [self triggerOverlayEvent:@"overlay_click" type:@"groundOverlay" overlay:overlay];
+  NSLog(@"clicked = %@", overlay.title);
+  if ([overlayClass isEqualToString:@"GMSPolygon"] ||
+      [overlayClass isEqualToString:@"GMSPolyline"] ||
+      [overlayClass isEqualToString:@"GMSCircle"] ||
+      [overlayClass isEqualToString:@"GMSGroundOverlay"]) {
+    [self triggerOverlayEvent:@"overlay_click" id:overlay.title];
   }
 }
 
@@ -332,10 +327,10 @@ - (void)triggerMarkerEvent: (NSString *)eventName marker:(GMSMarker *)marker
 /**
  * Involve App._onOverlayEvent
  */
-- (void)triggerOverlayEvent: (NSString *)eventName type:(NSString *) type overlay:(GMSOverlay *)overlay
+- (void)triggerOverlayEvent: (NSString *)eventName id:(NSString *) id
 {
-  NSString* jsString = [NSString stringWithFormat:@"plugin.google.maps.Map._onOverlayEvent('%@', '%@_%lu');",
-                                      eventName, type, (unsigned long)overlay.hash];
+  NSString* jsString = [NSString stringWithFormat:@"plugin.google.maps.Map._onOverlayEvent('%@', '%@');",
+                                      eventName, id];
   [self.webView stringByEvaluatingJavaScriptFromString:jsString];
 }
 

diff --git a/src/ios/GoogleMaps/GroundOverlay.m b/src/ios/GoogleMaps/GroundOverlay.m
@@ -61,6 +61,7 @@ -(void)createGroundOverlay:(CDVInvokedUrlCommand *)command
 
   NSString *id = [NSString stringWithFormat:@"groundOverlay_%lu", (unsigned long)layer.hash];
   [self.mapCtrl.overlayManager setObject:layer forKey: id];
+  layer.title = id;
 
   NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
   [result setObject:id forKey:@"id"];

diff --git a/src/ios/GoogleMaps/Map.h b/src/ios/GoogleMaps/Map.h
@@ -11,7 +11,6 @@
 
 @interface Map : CDVPlugin<MyPlgunProtocol>
 @property (nonatomic, strong) GoogleMapsViewController* mapCtrl;
-- (void)clear:(CDVInvokedUrlCommand*)command;
 - (void)setTilt:(CDVInvokedUrlCommand*)command;
 - (void)setCenter:(CDVInvokedUrlCommand*)command;
 - (void)setZoom:(CDVInvokedUrlCommand*)command;

diff --git a/src/ios/GoogleMaps/Map.m b/src/ios/GoogleMaps/Map.m
@@ -16,17 +16,6 @@ -(void)setGoogleMapsViewController:(GoogleMapsViewController *)viewCtrl
   self.mapCtrl = viewCtrl;
 }
 
-/**
- * Clear all markups
- */
-- (void)clear:(CDVInvokedUrlCommand *)command {
-  [self.mapCtrl.map clear];
-
-  CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-  [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-}
-
-
 /**
  * Move the center of the map
  */

diff --git a/src/ios/GoogleMaps/Polygon.m b/src/ios/GoogleMaps/Polygon.m
@@ -31,6 +31,7 @@ -(void)createPolygon:(CDVInvokedUrlCommand *)command
 
   // Create the polygon, and assign it to the map.
   GMSPolygon *polygon = [GMSPolygon polygonWithPath:path];
+  polygon.title = @"polygon";
 
   if ([[json valueForKey:@"visible"] boolValue]) {
     polygon.map = self.mapCtrl.map;
@@ -51,7 +52,7 @@ -(void)createPolygon:(CDVInvokedUrlCommand *)command
 
   NSString *id = [NSString stringWithFormat:@"polygon_%lu", (unsigned long)polygon.hash];
   [self.mapCtrl.overlayManager setObject:polygon forKey: id];
-
+  polygon.title = id;
 
 
   NSMutableDictionary *result = [[NSMutableDictionary alloc] init];

diff --git a/src/ios/GoogleMaps/Polyline.m b/src/ios/GoogleMaps/Polyline.m
@@ -47,7 +47,7 @@ -(void)createPolyline:(CDVInvokedUrlCommand *)command
 
   NSString *id = [NSString stringWithFormat:@"polyline_%lu", (unsigned long)polyline.hash];
   [self.mapCtrl.overlayManager setObject:polyline forKey: id];
-
+  polyline.title = id;
 
   NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
   [result setObject:id forKey:@"id"];