Merge pull request BetterBrief#14 from jedateach/master

New google maps endpoint, optional API key, allow frontend usage, make search box optional, add installer name

Author: willmorgan

code/GoogleMapField.php

@@ -14,6 +14,8 @@ class GoogleMapField extends FormField {
 				'lat' => 'Lat',
 				'lng' => 'Lng',
 			),
+			'showSearchBox' => true,
+			'apikey' => null,
 		),
 		$js_inserted = false;
 
@@ -46,8 +48,9 @@ public function __construct(DataObject $data, $title, $options = array()) {
 	}
 
 	public function Field($properties = array()) {
+		$key = $this->options['apikey'] ? "&key=".$this->options['apikey'] : "";
 		Requirements::javascript(GOOGLEMAPFIELD_BASE .'/javascript/GoogleMapField.js');
-		Requirements::javascript('//google.com/maps/api/js?sensor=false&callback=googlemapfieldInit');
+		Requirements::javascript("//maps.googleapis.com/maps/api/js?callback=googlemapfieldInit".$key);
 		Requirements::css(GOOGLEMAPFIELD_BASE .'/css/GoogleMapField.css');
 		$jsOptions = array(
 			'coords' => array($this->getLatData(), $this->getLngData()),
@@ -56,9 +59,12 @@ public function Field($properties = array()) {
 				'mapTypeId' => 'ROADMAP',
 			),
 		);
-
+		if(!$this->options['showSearchBox']){
+			$this->children->removeByName("Search");
+		}
 		$jsOptions = array_replace_recursive($jsOptions, $this->options);
 		$this->setAttribute('data-settings', Convert::array2json($jsOptions));
+
 		return parent::Field($properties);
 	}
 

composer.json

@@ -13,6 +13,10 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.3.0",
+        "composer/installers": "~1.0"
+    },
+    "extra" : {
+        "installer-name": "googlemapfield"
     }
 }

javascript/GoogleMapField.js

@@ -107,14 +107,16 @@
 	}
 
 	// Set the init method to re-run if the page is saved or pjaxed
-	$.entwine('ss', function($) {
-		$('.googlemapfield').entwine({
-			onmatch: function() {
-				if(gmapsAPILoaded) {
-					init();
+	if($.entwine){
+		$.entwine('ss', function($) {
+			$('.googlemapfield').entwine({
+				onmatch: function() {
+					if(gmapsAPILoaded) {
+						init();
+					}
 				}
-			}
+			});
 		});
-	});
+	}
 
 }(jQuery));