updated

etl12003 · Apr 22, 2017 · 3cc824c · 3cc824c
1 parent 7800100
commit 3cc824c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Wello/www/map.php b/Wello/www/map.php
@@ -110,8 +110,8 @@ function initMap() {
             var markers = xml.documentElement.getElementsByTagName('marker');
             Array.prototype.forEach.call(markers, function(markerElem) {
               var id = markerElem.getAttribute('id');
-                var name = markerElem.getAttribute('name');
-                var address = markerElem.getAttribute('streetName');
+                var name = markerElem.getAttribute('id');
+                var address = markerElem.getAttribute('address');
               var point = new google.maps.LatLng(
                   parseFloat(markerElem.getAttribute('lat')),
                   parseFloat(markerElem.getAttribute('lng')));

diff --git a/Wello/www/xmlGenerate.php b/Wello/www/xmlGenerate.php
@@ -22,7 +22,7 @@
 
 // Select all the rows in the markers table
 
-$query = "SELECT * FROM well_completion_report WHERE 1 LIMIT 10";
+$query = "SELECT * FROM well_completion_report WHERE 1";
 $result = mysql_query($query);
 if (!$result) {
   die('Invalid query: ' . mysql_error());
@@ -37,9 +37,7 @@
   $node = $dom->createElement("marker");
   $newnode = $parnode->appendChild($node);
   $newnode->setAttribute("id",$row['Permit_Number']);
-  $newnode->setAttribute("streetNumber", $row['Well_Street_Number']);
-  $newnode->setAttribute("streetName", $row['Well_Street_Name']);
-  $newnode->setAttribute("Town", $row['Well_Town']);
+  $newnode->setAttribute("address", $row['Well_Street_Number']. " ".$row['Well_Street_Name']. ", ".$row['Well_Town']);
   $newnode->setAttribute("lat", $row['Well_Latitude']);
   $newnode->setAttribute("lng", $row['Well_Longitude']);
 }