Merge pull request #18 from patman15/PW3

Raw Data Storage

Author: madebymats

FieldtypeLeafletMapMarker.module

@@ -23,7 +23,7 @@ class FieldtypeLeafletMapMarker extends Fieldtype {
     public static function getModuleInfo() {
         return array(
             'title' => 'Leaflet Map Marker',
-            'version' => '3.0.2',
+            'version' => '3.0.3',
             'summary' => 'Field that stores an address with latitude and longitude coordinates and has built-in geocoding capability with Leaflet Maps API.',
             'installs' => 'InputfieldLeafletMapMarker',
             'icon' => 'map-marker',
@@ -103,6 +103,7 @@ class FieldtypeLeafletMapMarker extends Fieldtype {
         $marker->lng = $value['lng'];
         $marker->status = $value['status'];
         $marker->zoom = $value['zoom'];
+        $marker->raw = $value['raw'];
         // $marker->provider = $value['provider'];
         $marker->setTrackChanges(true);
 
@@ -133,7 +134,8 @@ class FieldtypeLeafletMapMarker extends Fieldtype {
             'lat' => strlen($marker->lat) ? $marker->lat : 0,
             'lng' => strlen($marker->lng) ? $marker->lng : 0,
             'status' => $marker->status,
-            'zoom' => $marker->zoom/*,
+            'zoom' => $marker->zoom,
+            'raw' => $marker->raw/*,
             'provider' => $marker->provider*/
         );
 
@@ -155,6 +157,7 @@ class FieldtypeLeafletMapMarker extends Fieldtype {
         $schema['lng'] = "FLOAT(10,6) NOT NULL DEFAULT 0";	// longitude
         $schema['status'] = "TINYINT NOT NULL DEFAULT 0";	// geocode status
         $schema['zoom'] = "TINYINT NOT NULL DEFAULT 0";		// zoom level (schema v1)
+        $schema['raw'] = "TEXT NOT NULL DEFAULT ''"; // raw google geocode data
         // $schema['provider'] = "VARCHAR(255) NOT NULL DEFAULT ''";
 
         $schema['keys']['latlng'] = "KEY latlng (lat, lng)";	// keep an index of lat/lng
@@ -201,6 +204,28 @@ class FieldtypeLeafletMapMarker extends Fieldtype {
                 }
             }
         }
+        
+        //PDO update by Patman15
+        if($schemaVersion == 1) {
+            // update schema to v2: add 'raw' column
+            $schemaVersion = 2;
+            $database = $this->wire('database');
+            $table = $database->escapeTable($field->getTable());
+            $query = $database->prepare("SHOW TABLES LIKE '$table'");
+            $query->execute();
+            $row = $query->fetch(\PDO::FETCH_NUM);
+            $query->closeCursor();
+            if(!empty($row)) {
+                $query = $database->prepare("SHOW COLUMNS FROM `$table` WHERE field='raw'");
+                $query->execute();
+                if(!$query->rowCount()) try {
+                    $database->exec("ALTER TABLE `$table` ADD raw $schema[raw] AFTER zoom");
+                    $this->message("Added 'raw' column to '$field->table'");
+                } catch(Exception $e) {
+                    $this->error($e->getMessage());
+                }
+            }
+        }
 
         $field->set('schemaVersion', $schemaVersion);
         $field->save();

InputfieldLeafletMapMarker.js

@@ -39,6 +39,7 @@ var InputfieldLeafletMapMarker = {
         var $lng = $map.siblings(".InputfieldLeafletMapMarkerLng").find("input[type=text]");
         var $addr = $map.siblings(".InputfieldLeafletMapMarkerAddress").find("input[type=text]");
         var $addrJS = $map.siblings(".InputfieldLeafletMapMarkerAddress").find("input[type=hidden]");
+        var $raw = $map.siblings(".InputfieldLeafletMapMarkerAddress").find("input[name$=_raw]");
         var $toggle = $map.siblings(".InputfieldLeafletMapMarkerToggle").find("input[type=checkbox]");
         var $zoom = $map.siblings(".InputfieldLeafletMapMarkerZoom").find("input[type=number]");
         var $notes = $map.siblings(".notes");
@@ -66,6 +67,7 @@ var InputfieldLeafletMapMarker = {
                 var r = results[0];
                 if (r) {
                     $addr.val(r.name);
+                    $raw.val(JSON.stringify(r.properties));
                 }
             })
         });
@@ -78,6 +80,7 @@ var InputfieldLeafletMapMarker = {
                 var r = results[0];
                 if (r) {
                     $addr.val(r.name);
+                    $raw.val(JSON.stringify(r.properties));                 
                 }
             })
         });
@@ -89,6 +92,7 @@ var InputfieldLeafletMapMarker = {
             $lat.val(result.center.lat);
             $lng.val(result.center.lng);
             $addr.val(result.name);
+            $raw.val(JSON.stringify(result.properties));
         };
 
 
@@ -102,6 +106,7 @@ var InputfieldLeafletMapMarker = {
                 var r = results[0];
                 if (r) {
                     $addr.val(r.name);
+                    $raw.val(JSON.stringify(r.properties));
                 }
             })
         });

InputfieldLeafletMapMarker.module

@@ -24,7 +24,7 @@ class InputfieldLeafletMapMarker extends Inputfield {
     public static function getModuleInfo() {
         return array(
             'title' => 'Leaflet Map Marker',
-            'version' => '3.0.2',
+            'version' => '3.0.3',
             'summary' => "Provides input for the LeafletMapMarker Fieldtype",
             'requires' => 'ProcessWire>=3.0.0, FieldtypeLeafletMapMarker',
             'icon' => 'map-marker',
@@ -127,6 +127,7 @@ class InputfieldLeafletMapMarker extends Inputfield {
             <input readonly type='text' id='{$id}' name='{$name}' value='{$address}'  /><br />
             </label>
             <input type='hidden' id='_{$name}_js_geocode_address' name='_{$name}_js_geocode_address' value='' />
+            <input type='hidden' id='_{$id}_raw' name='_{$name}_raw' value='{$marker->raw}' />
             </p>
 
 
@@ -205,6 +206,8 @@ _OUT;
         if(is_null($status)) $marker->set('status', LeafletMapMarker::statusNoGeocode); // disable geocode
         else $marker->set('status', (int) $status);
 
+        $raw = $input["_{$name}_raw"];
+        $marker->set('raw', $raw);
         // $provider = $input["_{$name}_provider"];
         // $marker->set('provider', $provider);
 
@@ -307,7 +310,8 @@ _OUT;
             "\$page->{$this->name}->address\n" .
             "\$page->{$this->name}->lat\n" .
             "\$page->{$this->name}->lng\n" .
-            "\$page->{$this->name}->zoom" .
+            "\$page->{$this->name}->zoom\n" .
+            "\$page->{$this->name}->raw" .            
             "</pre>";
 
         $inputfields->add($field);

LeafletMapMarker.php

@@ -36,6 +36,7 @@ public function __construct() {
         $this->set('status', 0);
         $this->set('zoom', 0);
         $this->set('provider', '');
+        $this->set('raw', '');
         // temporary runtime property to indicate the geocode should be skipped
         $this->set('skipGeocode', false);
     }
@@ -79,7 +80,7 @@ public function geocode() {
             return 0;
         }
 
-        $url = "http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=" . urlencode($this->address);
+        $url = "https://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=" . urlencode($this->address);
         $json = file_get_contents($url);
         $json = json_decode($json, true);
 
@@ -89,6 +90,7 @@ public function geocode() {
             else $this->status = -1;
             $this->lat = 0;
             $this->lng = 0;
+            $this->raw = '';
             return $this->status;
         }
 
@@ -98,6 +100,7 @@ public function geocode() {
 
         $this->lat = $location['lat'];
         $this->lng = $location['lng'];
+        $this->raw = json_encode($json['results'][0]);
 
         $statusString = $json['status'] . '_' . $locationType;
         $status = array_search($statusString, $this->geocodeStatuses);