issue #647 Add target property, deprecate latLng for mapOptions. (iOS)

The `target` property accepts Array<LatLng>

Author: wf9a5m75

plugin.xml

@@ -174,6 +174,8 @@
         <header-file src="src/ios/GoogleMaps/NSData-Base64/NSData+Base64.h" />
         <header-file src="src/ios/GoogleMaps/NSData-Base64/NSData+Base64.podspec" />
         <source-file src="src/ios/GoogleMaps/NSData-Base64/NSData+Base64.m" />
+        <header-file src="src/ios/GoogleMaps/MFGoogleMapAdditions/GMSCoordinateBounds+Geometry.h" />
+        <source-file src="src/ios/GoogleMaps/MFGoogleMapAdditions/GMSCoordinateBounds+Geometry.m" />
         <header-file src="src/ios/GoogleMaps/MyPluginLayer.h" />
         <source-file src="src/ios/GoogleMaps/MyPluginLayer.m" />
         <header-file src="src/ios/GoogleMaps/MyReachability.h" />

src/ios/GoogleMaps/GoogleMapsViewController.m

@@ -82,7 +82,7 @@ - (void)viewDidLoad
     float latitude;
     float longitude;
     GMSCameraPosition *camera;
-    GMSCameraPosition *initCamera;
+    GMSCoordinateBounds *initBounds = nil;
 
     if ([cameraOpts objectForKey:@"target"]) {
       NSString *targetClsName = [[cameraOpts objectForKey:@"target"] className];
@@ -92,7 +92,6 @@ - (void)viewDidLoad
         GMSMutablePath *path = [GMSMutablePath path];
         for (i = 0; i < [latLngList count]; i++) {
           latLng = [latLngList objectAtIndex:i];
-    NSLog(@"---->latLng=%@", latLng);
           latitude = [[latLng valueForKey:@"lat"] floatValue];
           longitude = [[latLng valueForKey:@"lng"] floatValue];
           [path addLatitude:latitude longitude:longitude];
@@ -103,12 +102,15 @@ - (void)viewDidLoad
         }
         [[UIScreen mainScreen] scale];
 
-        GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithPath:path];
+        initBounds = [[GMSCoordinateBounds alloc] initWithPath:path];
 
-    NSLog(@"---->bounds=%f,%f - ,%f,%f", bounds.southWest.latitude,bounds.southWest.longitude, bounds.northEast.latitude, bounds.northEast.longitude);
-        
-        initCamera = [self.map cameraForBounds:bounds insets:UIEdgeInsetsMake(10 * scale, 10* scale, 10* scale, 10* scale)];
+        CLLocationCoordinate2D center = initBounds.center;
 
+        camera = [GMSCameraPosition cameraWithLatitude:center.latitude
+                                            longitude:center.longitude
+                                            zoom:[[cameraOpts valueForKey:@"zoom"] floatValue]
+                                            bearing:[[cameraOpts objectForKey:@"bearing"] doubleValue]
+                                            viewingAngle:[[cameraOpts objectForKey:@"tilt"] doubleValue]];
 
       } else {
         latLng = [cameraOpts objectForKey:@"target"];
@@ -220,6 +222,17 @@ - (void)viewDidLoad
     }
 
     [self.view addSubview: self.map];
+  
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if (initBounds != nil) {
+        float scale = 1;
+        if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) {
+          scale = [[UIScreen mainScreen] scale];
+        }
+        [[UIScreen mainScreen] scale];
+        [self.map moveCamera:[GMSCameraUpdate fitBounds:initBounds withPadding:10 * scale]];
+      }
+    });
 }
 
 

src/ios/GoogleMaps/MFGoogleMapAdditions/GMSCoordinateBounds+Geometry.h

@@ -0,0 +1,31 @@
+//
+//  GMSCoordinateBounds+Geometry.h
+//
+//  Created by Marius Feldmann on 8/12/14.
+//  Copyright (c) 2014 Marius Feldmann. All rights reserved.
+//
+
+#import <GoogleMaps/GoogleMaps.h>
+
+@interface GMSCoordinateBounds (MFAdditions)
+
+/** The North-West corner of these bounds. */
+- (CLLocationCoordinate2D)southEast;
+
+/** The South-East corner of these bounds. */
+- (CLLocationCoordinate2D)northWest;
+
+/** The center coordinate of these bounds. */
+- (CLLocationCoordinate2D)center;
+
+/** Return the path of the rect. */
+- (GMSPath *)path;
+
+/**
+ * Returns an NSArray of GMSCoordinateBounds
+ * Divides the current rectangular bounding box
+ * into |numberOfRects| smaller boxes.
+ */
+- (NSArray *)divideIntoNumberOfBoxes:(NSInteger)numberOfBoxesl;
+
+@end

src/ios/GoogleMaps/MFGoogleMapAdditions/GMSCoordinateBounds+Geometry.m

@@ -0,0 +1,106 @@
+//
+//  GMSCoordinateBounds+Geometry.m
+//
+//  Created by Marius Feldmann on 8/12/14.
+//  Copyright (c) 2014 Marius Feldmann. All rights reserved.
+//
+
+#import "GMSCoordinateBounds+Geometry.h"
+
+#define RADIANS_TO_DEGREES(radians) ((radians) * (180.0 / M_PI))
+
+@implementation GMSCoordinateBounds (MFAdditions)
+
+- (CLLocationCoordinate2D)southEast {
+	CLLocationDegrees southEastLat = self.southWest.latitude;
+	CLLocationDegrees southEastLng = self.northEast.longitude;
+	CLLocationCoordinate2D southEast = CLLocationCoordinate2DMake(southEastLat, southEastLng);
+	
+	return southEast;
+}
+
+
+- (CLLocationCoordinate2D)northWest {
+	CLLocationDegrees northWestLat = self.northEast.latitude;
+	CLLocationDegrees northWestLng = self.southWest.longitude;
+	CLLocationCoordinate2D northWest = CLLocationCoordinate2DMake(northWestLat, northWestLng);
+	
+	return northWest;
+}
+
+
+- (CLLocationCoordinate2D)center {
+	double fraction = 0.5;
+	CLLocationCoordinate2D center = GMSGeometryInterpolate(self.northEast, self.southWest, fraction);
+	
+	return center;
+}
+
+
+- (GMSPath *)path {
+	GMSMutablePath *path = [[GMSMutablePath alloc] init];
+	[path addCoordinate:self.northWest];
+	[path addCoordinate:self.northEast];
+	[path addCoordinate:self.southEast];
+	[path addCoordinate:self.southWest];
+	
+	return path;
+}
+
+
+- (NSArray *)divideIntoNumberOfBoxes:(NSInteger)numberOfBoxes {
+	NSMutableArray *rectArray = [[NSMutableArray alloc] init];
+	
+	NSInteger columns = ceil(sqrt(numberOfBoxes));
+	NSInteger fullRows = numberOfBoxes / columns;
+	NSInteger orphans = numberOfBoxes % columns;
+	
+	double width = GMSGeometryDistance(self.northWest, self.northEast);
+	double boxWidth = width / columns;
+	
+	double height = GMSGeometryDistance(self.northEast, self.southEast);
+	double boxHeight = height / (orphans == 0 ? fullRows : (fullRows+1));
+	
+	for (int y=0; y<fullRows; y++) {
+		for (int x=0; x<columns; x++) {
+			// Calculate the diagonal of the rect
+			double diagonal = sqrt(pow(boxWidth, 2) + pow(boxHeight, 2));
+			
+			// Get the angle of the diagonal
+			double angle = 180 + RADIANS_TO_DEGREES(atan2(boxWidth, boxHeight));
+			
+			// Get the northEast Coord by moving the northEast Coord to the right
+			CLLocationCoordinate2D northEastCoord = GMSGeometryOffset(self.northWest, boxWidth*(x+1), 90);
+
+			// Make sure we are in the right row
+			northEastCoord = GMSGeometryOffset(northEastCoord, boxHeight*y, 180);
+			
+			// Get the southWest Coord by following the diagonal line from the northEast Coord
+			CLLocationCoordinate2D southWestCoord = GMSGeometryOffset(northEastCoord, diagonal, angle);
+			
+			// Create the new rect
+			GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:southWestCoord coordinate:northEastCoord];
+			[rectArray addObject:bounds];
+		}
+	}
+	
+	if (orphans > 0) {
+		NSInteger orphanWidth = width / orphans;
+		
+		for (int x=0; x<orphans; x++) {
+			double diagonal = sqrt(pow(orphanWidth, 2) + pow(boxHeight, 2));
+			double angle = 180 + RADIANS_TO_DEGREES(atan2(orphanWidth, boxHeight));
+			
+			CLLocationCoordinate2D northEastCoord = GMSGeometryOffset(self.northWest, orphanWidth*(x+1), 90);
+			northEastCoord = GMSGeometryOffset(northEastCoord, boxHeight*fullRows+1, 180);
+			CLLocationCoordinate2D southWestCoord = GMSGeometryOffset(northEastCoord, diagonal, angle);
+			
+			GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithCoordinate:southWestCoord coordinate:northEastCoord];
+			[rectArray addObject:bounds];
+		}
+	}
+	
+	return rectArray;
+}
+
+@end

src/ios/GoogleMaps/MFGoogleMapAdditions/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) {{{year}}} {{{fullname}}}
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/ios/GoogleMaps/MFGoogleMapAdditions/README.md

@@ -0,0 +1,11 @@
+# MFGoogleMapAdditions
+
+A couple of helpful categories for the Google Maps SDK.
+
+
+## Installation
+
+Simply add the `GMSCoordinateBounds+Geometry.h` to your project
+
+
+Enjoy.

src/ios/GoogleMaps/PluginUtil.h

@@ -14,6 +14,7 @@
 #import "MainViewController.h"
 #import <QuartzCore/QuartzCore.h>
 #import <objc/runtime.h>
+#import "MFGoogleMapAdditions/GMSCoordinateBounds+Geometry.h"
 
 typedef void (^MYCompletionHandler)(NSError *error);
 

src/ios/GoogleMaps/PluginUtil.m

@@ -141,7 +141,6 @@ - (void)webViewDidFinishLoad:(UIWebView*)theWebView
 }
 #endif
 @end
-
 @implementation PluginUtil
 + (BOOL)isIOS7_OR_OVER
 {
@@ -214,6 +213,7 @@ + (NSString *)getAbsolutePathFromCDVFilePath:(UIView*)webView cdvFilePath:(NSStr
 
   return filePath;
 }
+
 @end