re-added google geocoder; fixed links in shortcode helper page;

habi · Dec 24, 2018 · ca52b19 · ca52b19
1 parent 4bf81a9
commit ca52b19
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 42 deletions.
diff --git a/class.geocoder.php b/class.geocoder.php
@@ -120,20 +120,23 @@ private function get_url( $url ) {
 	* @return varies object from API or null (failed)
 	*/
 
-	private function google_geocode ( $address ) {	    
-	    $geocode_url = 'https://maps.googleapis.com/maps/api/geocode/json?address=';
-	    $geocode_url .= $address;
-	    $json = $this->get_url($geocode_url);
+	private function google_geocode ( $address ) {
+		// Leaflet_Map_Plugin_Settings
+        $settings = Leaflet_Map_Plugin_Settings::init();
+		$key = $settings->get('google_appkey');
+
+	    $geocode_url = 'https://maps.googleapis.com/maps/api/geocode/json?address=%s&key=%s';
+		$geocode_url = sprintf($geocode_url, $address, $key);
+
+		$json = $this->get_url($geocode_url);
+		$json = json_decode($json);
 
-	    if ($json) {
-	        $json = json_decode($json);
-	        /* found location */
-	        if ($json->{'status'} == 'OK') {
-
-	            $location = $json->{'results'}[0]->{'geometry'}->{'location'};
+		/* found location */
+		if ($json->status == 'OK') {
+
+			$location = $json->results[0]->geometry->location;
 
-	            return (Object) $location;
-	        }
+			return (Object) $location;
 		}
 
 		throw new Exception('No Address Found');
@@ -152,17 +155,10 @@ private function osm_geocode ( $address ) {
 	    $json = $this->get_url($geocode_url);
 		$json = json_decode($json);
 
-        if (is_array($json) && 
-            is_object($json[0]) &&
-            $json[0]->lat) {
-            // found location
-            return (Object) array(
-                'lat' => $json[0]->lat,
-                'lng' => $json[0]->lon,
-            );
-        }
-
-	    throw new Exception('No Address Found');
+		return (Object) array(
+			'lat' => $json[0]->lat,
+			'lng' => $json[0]->lon,
+		);
 	}
 
 	/**
@@ -179,18 +175,10 @@ private function dawa_geocode ( $address ) {
 	    $json = $this->get_url($geocode_url);
 	    $json = json_decode($json);
 
-	    if (is_array($json) && 
-	        is_object($json[0]) &&
-	        $json[0]->status == 1) {
-	        /* found location */
-	        $location = (Object) array(
-	            'lat' => $json[0]->adgangsadresse->adgangspunkt->koordinater[1],
-	            'lng' => $json[0]->adgangsadresse->adgangspunkt->koordinater[0]
-            );
-
-	        return $location;
-	    } 
-
-	    throw new Exception('No Address Found');
+		/* found location */
+		return (Object) array(
+			'lat' => $json[0]->adgangsadresse->adgangspunkt->koordinater[1],
+			'lng' => $json[0]->adgangsadresse->adgangspunkt->koordinater[0]
+		);
 	}
 }
diff --git a/class.plugin-option.php b/class.plugin-option.php
@@ -69,7 +69,7 @@ function __construct($details = array())
                 'filter' => FILTER_SANITIZE_STRING,
                 'flags'  => FILTER_FORCE_ARRAY
             ),
-            'helptext'         =>     FILTER_SANITIZE_STRING
+            'helptext'         =>     null
         );
 
         // get matching keys only

diff --git a/class.plugin-settings.php b/class.plugin-settings.php
@@ -199,7 +199,7 @@ private function __construct()
                 'helptext' => __('Choose a tiling service or provide your own.', 'leaflet-map')
             ),
             'mapquest_appkey' => array(
-                'display_name'=>__('MapQuest App Key', 'leaflet-map'),
+                'display_name'=>__('MapQuest App Key (optional)', 'leaflet-map'),
                 'default' => __('Supply an app key if you choose MapQuest', 'leaflet-map'),
                 'type' => 'text',
                 'noreset' => true,
@@ -267,7 +267,20 @@ private function __construct()
                     'dawa' => __('Denmark Addresses', 'leaflet-map')
                 ),
                 'helptext' => __('Select the Geocoding provider to use to retrieve addresses defined in shortcode.', 'leaflet-map')
-            )
+            ),
+            'google_appkey' => array(
+                'display_name'=>__('Google API Key (optional)', 'leaflet-map'),
+                'default' => __('Supply a Google API Key', 'leaflet-map'),
+                'type' => 'text',
+                'noreset' => true,
+                'helptext' => sprintf(
+                    '%1$s: <a href="https://cloud.google.com/maps-platform/?apis=places" target="_blank">%2$s</a>.  %3$s %4$s',
+                    __('The Google Geocoder requires an API key with the Places product enabled', 'leaflet-map'),
+                    __('here', 'leaflet-map'),
+                    __('You must create a project and set up a billing account, then you will be given an API key.', 'leaflet-map'),
+                    __('You are unlikely to ever be charged for geocoding.', 'leaflet-map')
+                ),
+            ),
         );
 
         foreach ($this->options as $name => $details) {
@@ -324,7 +337,12 @@ public function delete($key)
     public function reset()
     {
         foreach ($this->options as $name => $option) {
-            $this->delete($name);
+            if (
+                !array_key_exists('noreset', $options) ||
+                $options['noreset'] != true
+            ) {
+                $this->delete($name);
+            }
         }
         return $this;
     }

diff --git a/templates/settings.php b/templates/settings.php
@@ -28,7 +28,9 @@
             $form[$name] = isset($_POST[ $name ]) ? 1 : 0;
         }
 
-        $settings->set($name, stripslashes( $form[$name]));
+        $value = trim( stripslashes( $form[$name]) );
+
+        $settings->set($name, $value);
     }
 ?>
 <div class="notice notice-success is-dismissible">

diff --git a/templates/shortcode-helper.php b/templates/shortcode-helper.php
@@ -61,7 +61,7 @@
                     ),
                 __("SVG Marker Icon", 'leaflet-map') => array(
                     '[leaflet-map address="twilight lane, nova scotia" scrollwheel]',
-                    '[leaflet-marker svg background="#654" iconClass="dashicons dashicons-star-filled" color="gold"]My Favorite Place in the World[/leaflet-marker]'
+                    '[leaflet-marker svg background="#777" iconClass="dashicons dashicons-star-filled" color="gold"]My Favorite Place in the World[/leaflet-marker]'
                     ),
                 __("Zoom Buttons", 'leaflet-map') => array(
                     '[leaflet-map zoom=9 lat=48.855 lng=2.35 zoomcontrol]',