Version 4.1.2

system/GeoLocation/Maps/Google.php

@@ -42,11 +42,12 @@ class _Google
 	/**
 	 * Render
 	 *
-	 * @param	int	$width	Width
-	 * @param	int	$heigth	Height
+	 * @param	int			$width	Width
+	 * @param	int			$height	Height
+	 * @param	float|NULL	$zoom	The zoom amount (a value between 0 being totally zoomed out view of the world, and 1 being as fully zoomed in as possible) or NULL to zoom automatically based on how much data is available
 	 * @return	string
 	 */
-	public function render( $width, $height, $zoom=5 )
+	public function render( $width, $height, $zoom=NULL )
 	{
 		if ( $this->geolocation->lat and $this->geolocation->long )
 		{
@@ -54,13 +55,11 @@ class _Google
 		}
 		else
 		{
-			$zoom = 1;
 			$location = array();
 			foreach ( array( 'country', 'region', 'city', 'addressLines' ) as $k )
 			{
 				if ( $this->geolocation->$k )
 				{
-					$zoom++;
 					if ( is_array( $this->geolocation->$k ) )
 					{
 						foreach ( array_reverse( $this->geolocation->$k ) as $v )
@@ -78,10 +77,10 @@ class _Google
 		}
 		
 		$linkUrl = \IPS\Http\Url::external( '//maps.google.com/' )->setQueryString( 'q', $location );
-		
+				
 		$imageUrl = \IPS\Http\Url::external( '//maps.googleapis.com/maps/api/staticmap' )->setQueryString( array(
 			'center'	=> $location,
-			'zoom'		=> $zoom,
+			'zoom'		=> $zoom === NULL ? NULL : ceil( $zoom * 8 ),
 			'size'		=> "{$width}x{$height}",
 			'sensor'	=> 'false',
 			'markers'	=> $location