Bump up to v2.5.3

README.md

@@ -1,4 +1,4 @@
-# Cordova GoogleMaps plugin for Android, iOS and Browser v2.5.2
+# Cordova GoogleMaps plugin for Android, iOS and Browser v2.5.3
 
 | Download | Build test (master branch)|
 |----------|---------------------------|
@@ -197,6 +197,10 @@
 ---------------------------------------------------------------------------------------------------------
 
 ## Release Notes
+  - **v2.5.3**
+    - Fix: (iOS) touch problem
+    - Fix: (iOS) `toDataURL()` bug
+
   - **v2.5.2**
     - Fix: (Android/iOS/Browser) MarkerCluster.remove() causes null pointer error.
     - Fix: (iOS) touch problem

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-googlemaps",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "Google Maps native SDK for Android and iOS, and Google Maps JavaScript API v3 for browser.",
   "cordova": {
     "id": "cordova-plugin-googlemaps",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-googlemaps" version="2.5.2" 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.5.3" 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="Promise" src="www/Promise.js" />
   <asset src="www/promise-7.0.4.min.js.map" target="promise-7.0.4.min.js.map" />

src/browser/PluginGeocoder.js

@@ -110,9 +110,6 @@ QUEUE.on('next', function() {
         if (!result.postalCode && addrComp.types.indexOf('postal_code') > -1) {
           result.postalCode = addrComp.long_name;
         }
-        if (!result.postalCode && addrComp.types.indexOf('postal_code') > -1) {
-          result.postalCode = addrComp.long_name;
-        }
         if (!result.thoroughfare && addrComp.types.indexOf('street_address') > -1) {
           result.thoroughfare = addrComp.long_name;
         }

src/ios/GoogleMaps/MyPluginLayer.m

@@ -55,7 +55,10 @@ - (id)initWithWebView:(UIView *)webView {
     [self.pluginScrollView setContentSize:self.webView.scrollView.frame.size ];
 
     [self addSubview:self.pluginScrollView];
+
     [self addSubview:self.webView];
+
+
 //    dispatch_queue_t q_background = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0);
 //
 //    dispatch_async(q_background, ^{
@@ -344,7 +347,7 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
   NSArray *subviews = [self.webView.superview subviews];
   //CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
   //CGPoint subviewPoint = CGPointMake(browserClickPoint.x, browserClickPoint.y - statusBarFrame.size.height);
-  CGPoint subviewPoint = CGPointMake(browserClickPoint.x, browserClickPoint.y );
+  CGPoint subviewPoint = CGPointMake(browserClickPoint.x, browserClickPoint.y + self.webView.frame.origin.y);
   for (int i = ((int)[subviews count] - 1); i >= 0; i--) {
     subview = [subviews objectAtIndex: i];
     //NSLog(@"--->subview[%d] = %@", i, subview);

src/ios/GoogleMaps/PluginMap.m

@@ -693,8 +693,9 @@ - (void)toDataURL:(CDVInvokedUrlCommand *)command {
     [self.mapCtrl.executeQueue addOperationWithBlock:^{
       NSData *imageData = UIImagePNGRepresentation(image);
       NSString* base64Encoded = [imageData base64EncodedStringWithOptions:0];
-
-      CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64Encoded];
+      NSString* base64EncodedWithData = [@"data:image/png;base64," stringByAppendingString:base64Encoded];
+
+      CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64EncodedWithData];
       [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
     }];
   }];