-
Well location
Yield Test
gallons per minute
go to >
\ No newline at end of file
+-->
diff --git a/html-ONLY-site/priv_includes/config.inc.php b/html-ONLY-site/priv_includes/config.inc.php
deleted file mode 100644
index 17b607c..0000000
--- a/html-ONLY-site/priv_includes/config.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/html-ONLY-site/priv_includes/mysqli_oo_connect.php b/html-ONLY-site/priv_includes/mysqli_oo_connect.php
deleted file mode 100644
index 4d3e2eb..0000000
--- a/html-ONLY-site/priv_includes/mysqli_oo_connect.php
+++ /dev/null
@@ -1,20 +0,0 @@
-connect_error) { //if there is a connection error
- echo $mysqli->connect_error; //echo error to screen
- unset($mysqli); //delete the object created on line 19
-}
-else { //establish encoding
- $mysqli->set_charset('utf8');
-}
-
-/* terminating php tag "?>" not needed if this file end in .php extension */
diff --git a/html-ONLY-site/wells-list.html b/html-ONLY-site/wells-list.html
deleted file mode 100644
index 16aaef0..0000000
--- a/html-ONLY-site/wells-list.html
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/html-ONLY-site/wells-list.php b/html-ONLY-site/wells-list.php
index f3da33d..4f5c408 100644
--- a/html-ONLY-site/wells-list.php
+++ b/html-ONLY-site/wells-list.php
@@ -7,7 +7,9 @@
exit();
}
-$query = "SELECT Well_Street_Name FROM well_completion_report";
+$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number
+ FROM well_completion_report
+ LIMIT 10";
?>
@@ -27,7 +29,7 @@
-
+
@@ -52,7 +54,7 @@
-
+
@@ -74,16 +76,16 @@
/* fetch associative array */
while ($row = $result->fetch_assoc()) {
echo'
-
+
-
-
-
-
-
-
-
- Well Name
-short well description
-
-
-
-
-
-
-
- Well Name
-short well description
-Nearby Wells
-
'.$row["Well_Street_Name"].'
-short well description
+'.$row["WellAddress"].'
+'.$row["Well_Town"].'
+Permit Number: '.$row["Permit_Number"].'
Click the button to get your coordinates.
- - - - - - - - - + + + + +Click the button to get your coordinates.
+ + + + + + + + + diff --git a/maps.js b/maps.js index 5eb558b..1a42c4a 100644 --- a/maps.js +++ b/maps.js @@ -1,84 +1,84 @@ -var map; -var infoWindow; - -// markersData variable stores the information necessary to each marker -// figure out a way to import mapData - - -function initialize() { - var mapOptions = { - center: new google.maps.LatLng(40.601203,-8.668173), - zoom: 9, - mapTypeId: 'roadmap', - }; - - map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions); - - // a new Info Window is created - infoWindow = new google.maps.InfoWindow(); - - // Event that closes the Info Window with a click on the map - google.maps.event.addListener(map, 'click', function() { - infoWindow.close(); - }); - - // Finally displayMarkers() function is called to begin the markers creation - displayMarkers(); -} -google.maps.event.addDomListener(window, 'load', initialize); - - -// This function will iterate over markersData array -// creating markers with createMarker function -function displayMarkers(){ - - // this variable sets the map bounds according to markers position - var bounds = new google.maps.LatLngBounds(); - - // for loop traverses markersData array calling createMarker function for each marker - for (var i = 0; i < markersData.length; i++){ - - var latlng = new google.maps.LatLng(markersData[i].lat, markersData[i].lng); - var name = markersData[i].name; - var address1 = markersData[i].address1; - var address2 = markersData[i].address2; - var postalCode = markersData[i].postalCode; - - createMarker(latlng, name, address1, address2, postalCode); - - // marker position is added to bounds variable - bounds.extend(latlng); - } - - // Finally the bounds variable is used to set the map bounds - // with fitBounds() function - map.fitBounds(bounds); -} - -// This function creates each marker and it sets their Info Window content -function createMarker(latlng, name, address1, address2, postalCode){ - var marker = new google.maps.Marker({ - map: map, - position: latlng, - title: name - }); - - // This event expects a click on a marker - // When this event is fired the Info Window content is created - // and the Info Window is opened. - google.maps.event.addListener(marker, 'click', function() { - - // Creating the content to be inserted in the infowindow - var iwContent = '' +
- '
';
-
- // including content to the Info Window.
- infoWindow.setContent(iwContent);
-
- // opening the Info Window in the current map and at the current marker location.
- infoWindow.open(map, marker);
- });
-}
+var map;
+var infoWindow;
+
+// markersData variable stores the information necessary to each marker
+// figure out a way to import mapData
+
+
+function initialize() {
+ var mapOptions = {
+ center: new google.maps.LatLng(40.601203,-8.668173),
+ zoom: 9,
+ mapTypeId: 'roadmap',
+ };
+
+ map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions);
+
+ // a new Info Window is created
+ infoWindow = new google.maps.InfoWindow();
+
+ // Event that closes the Info Window with a click on the map
+ google.maps.event.addListener(map, 'click', function() {
+ infoWindow.close();
+ });
+
+ // Finally displayMarkers() function is called to begin the markers creation
+ displayMarkers();
+}
+google.maps.event.addDomListener(window, 'load', initialize);
+
+
+// This function will iterate over markersData array
+// creating markers with createMarker function
+function displayMarkers(){
+
+ // this variable sets the map bounds according to markers position
+ var bounds = new google.maps.LatLngBounds();
+
+ // for loop traverses markersData array calling createMarker function for each marker
+ for (var i = 0; i < markersData.length; i++){
+
+ var latlng = new google.maps.LatLng(markersData[i].lat, markersData[i].lng);
+ var name = markersData[i].name;
+ var address1 = markersData[i].address1;
+ var address2 = markersData[i].address2;
+ var postalCode = markersData[i].postalCode;
+
+ createMarker(latlng, name, address1, address2, postalCode);
+
+ // marker position is added to bounds variable
+ bounds.extend(latlng);
+ }
+
+ // Finally the bounds variable is used to set the map bounds
+ // with fitBounds() function
+ map.fitBounds(bounds);
+}
+
+// This function creates each marker and it sets their Info Window content
+function createMarker(latlng, name, address1, address2, postalCode){
+ var marker = new google.maps.Marker({
+ map: map,
+ position: latlng,
+ title: name
+ });
+
+ // This event expects a click on a marker
+ // When this event is fired the Info Window content is created
+ // and the Info Window is opened.
+ google.maps.event.addListener(marker, 'click', function() {
+
+ // Creating the content to be inserted in the infowindow
+ var iwContent = '' + name + '
' +
- '' + address1 + '
' + - address2 + '
' + - postalCode + '
' + - address2 + '
' + - postalCode + '
' +
+ '
';
+
+ // including content to the Info Window.
+ infoWindow.setContent(iwContent);
+
+ // opening the Info Window in the current map and at the current marker location.
+ infoWindow.open(map, marker);
+ });
+}
' + name + '
' +
+ '' + address1 + '
' + + address2 + '
' + + postalCode + '
' + + address2 + '
' + + postalCode + '