* Update Google static map to use optional scale, as well as make hei…

…ght and width optional.

* Added Google API key to static map
* Removed depreciated sensor parameter

code/Addressable.php

@@ -199,15 +199,18 @@ public function getFullAddressHTML() {
 	/**
 	 * Returns a static google map of the address, linking out to the address.
 	 *
-	 * @param int $width
-	 * @param int $height
+	 * @param int $width (optional)
+	 * @param int $height (optional)
+	 * @param int $scale (optional)
 	 * @return string
 	 */
-	public function AddressMap($width, $height) {
+	public function AddressMap($width = 320, $height = 240, $scale = 1) {
 		$data = $this->owner->customise(array(
 			'Width'    => $width,
 			'Height'   => $height,
-			'Address' => rawurlencode($this->getFullAddress())
+			'Scale'    => $scale,
+			'Address'  => rawurlencode($this->getFullAddress()),
+			'Key'      => Config::inst()->get('GoogleGeocoding', 'google_api_key')
 		));
 		return $data->renderWith('AddressMap');
 	}

templates/AddressMap.ss

@@ -1,5 +1,5 @@
 <div class="addressMap">
 	<a href="//maps.google.com/?q=$Address">
-		<img src="//maps.googleapis.com/maps/api/staticmap?size={$Width}x{$Height}&markers=$Address&sensor=false" alt="$FullAddress.ATT" />
+		<img src="//maps.googleapis.com/maps/api/staticmap?size={$Width}x{$Height}&scale={$Scale}&maptype={$MapType}&markers=$Address&key=$Key" alt="$FullAddress.ATT" />
 	</a>
-</div>
+</div>