Merge branch 'develop'

README.md

@@ -1,5 +1,8 @@
 # [Pronamic Google Maps](http://www.happywp.com/plugins/pronamic-google-maps/)
 
+> [!IMPORTANT]  
+> The "Pronamic Google Maps" plugin is no longer being maintained and developed. An alternative is the Google Map field in the Advanced Custom Fields plugin.
+
 This plugin makes it easy to add Google Maps to your WordPress post, pages or other custom post types.
 
 ## Shortcode `googlemaps` `googlemapsmashup`

classes/Pronamic/Google/Maps/ApiClient.php

@@ -20,17 +20,20 @@ public function __construct() {
 
 	}
 
-	public function geocode_address( $address, $sensor = false ) {
+	public function geocode_address( $address, $deprecated = false ) {
 		$result = null;
 
+		$key = get_option( 'pronamic_google_maps_key' );
+		$key = empty( $key ) ? false : $key;
+
 		// URL
 		$url = sprintf(
 			self::API_END_POINT . '%s/%s?%s',
 			'geocode',
 			self::OUTPUT_JSON,
 			_http_build_query( array(
 				'address' => $address,
-				'sensor'  => $sensor ? 'true' : 'false',
+				'key'     => $key,
 			) )
 		);
 

classes/Pronamic/Google/Maps/Maps.php

@@ -189,8 +189,7 @@ public static function register_scripts() {
 			'google-maps',
 			add_query_arg(
 				array(
-					'sensor' => 'false',
-					'key'    => $key,
+					'key' => $key,
 				),
 				'https://maps.googleapis.com/maps/api/js'
 			),
@@ -312,6 +311,8 @@ public static function get_meta_data( $post_id = null ) {
 	public static function get_static_map_url( Pronamic_Google_Maps_Info $info ) {
 		$url = 'https://maps.google.com/maps/api/staticmap?';
 
+		$key = get_option( 'pronamic_google_maps_key' );
+
 		$width  = Pronamic_Google_Maps_Size::parse( $info->width );
 		$height = Pronamic_Google_Maps_Size::parse( $info->height );
 
@@ -320,7 +321,6 @@ public static function get_static_map_url( Pronamic_Google_Maps_Info $info ) {
 		$parameters['zoom']    = $info->mapOptions->zoom;
 		$parameters['size']    = $width->get_pixels( self::$defaultWidth ) . 'x' . $height->get_pixels( self::$defaultHeight );
 		$parameters['maptype'] = $info->mapOptions->mapTypeId;
-		$parameters['sensor']  = 'false';
 
 		$markers = '';
 		if ( null !== $info->color ) {
@@ -339,6 +339,10 @@ public static function get_static_map_url( Pronamic_Google_Maps_Info $info ) {
 
 		$parameters['markers'] = $markers;
 
+		if ( ! empty( $key ) ) {
+			$parameters['key'] = $key;
+		}
+
 		$url .= http_build_query( $parameters, '', '&' );
 
 		return $url;

classes/Pronamic/Google/Maps/Site.php

@@ -46,7 +46,6 @@ public static function bootstrap() {
 
 		// Settings
 		$other_params_array = array(
-			'sensor' => 'false',
 		);
 
 		$other_params_array  = apply_filters( 'pronamic_google_maps_load_other_params_array', $other_params_array );