Merge remote-tracking branch 'origin/master'

etl12003 · Apr 22, 2017 · 513d1ab · 513d1ab
2 parents a9addba + c86d41c
commit 513d1ab
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 47 deletions.
diff --git a/map.php b/map.php
@@ -1,6 +1,4 @@
-
-
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html class="no-js" lang="">
 
 <head>
@@ -57,31 +55,10 @@
         </div>
     </nav>
 
-    <main class="map">
-<!--        <div style=""> -->
-<!--
-            <div id="map">
-                <iframe
-                  width="600"
-                  height="450"
-                  frameborder="0" style="border:0"
-                  src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBmQZToyeMOBTd6KlJRFHzv-5sj7u_AidY
-                    &q=41.8077,-72.2540" allowfullscreen>
-                </iframe>
-
-            </div>
--->
-<!--        </div>-->
+    <main class="map">
 
-		<div class="google-maps">
-			<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m12!1m3!1d7098.94326104394!2d78.0430654485247!3d27.172909818538997!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sen!2s!4v1385710909804" width="600" height="450" frameborder="0" style="border:0"></iframe>
-		</div>
-
-<!--
-        <script async defer
-        src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
-        </script>
--->
+		<div id="map" class="google-maps">
+		</div>
 
         <div class="well-preview well-card clearfix">
             <div class="well-img"></div>
@@ -122,21 +99,27 @@
     </script>
     <script src="js/plugins.js"></script>
     <script src="js/main.js"></script>
-    <!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
+
+
     <script>
-        (function (b, o, i, l, e, r) {
-            b.GoogleAnalyticsObject = l;
-            b[l] || (b[l] = function () {
-                (b[l].q = b[l].q || []).push(arguments)
-            });
-            b[l].l = +new Date;
-            e = o.createElement(i);
-            r = o.getElementsByTagName(i)[0];
-            e.src = 'https://www.google-analytics.com/analytics.js';
-            r.parentNode.insertBefore(e, r)
-        }(window, document, 'script', 'ga'));
-        ga('create', 'UA-XXXXX-X', 'auto');
-        ga('send', 'pageview');
+
+      function initMap() {
+        var myLatLng = {lat: -25.363, lng: 131.044};
+
+        var map = new google.maps.Map(document.getElementById('map'), {
+          zoom: 4,
+          center: myLatLng
+        });
+
+        var marker = new google.maps.Marker({
+          position: myLatLng,
+          map: map,
+          title: 'Hello World!'
+        });
+      }
+    </script>
+    <script async defer
+    src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
     </script>
 </body>
 
@@ -147,4 +130,4 @@
 we will need a file where we import the well name, address, longiture and latitude within the range we chose
 
 we need a food loop for it
--->
+-->
diff --git a/multiplemarkers.php b/multiplemarkers.php
@@ -1,18 +1,18 @@
 
 
-// first we will need to work on getting the current location using the google maps API
+<!-- first we will need to work on getting the current location using the google maps API-->
 
-// we can get the current location by using the functions form the geolocation.html
+<!-- we can get the current location by using the functions form the geolocation.html-->
 
 
-// now we use the geolocation to find the list of nearby locations
+<!--now we use the geolocation to find the list of nearby locations-->
 
-//https://developers.google.com/maps/documentation/javascript/store-locator?csw=1 is what we are using for reference
+<!--https://developers.google.com/maps/documentation/javascript/store-locator?csw=1 is what we are using for reference-->
 
 <html>
     <body>
         <script src = "http://maps.google.com/maps/api/js?sensor=false"></script>
-        <script src = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.10.1.min.js"> < /scipt>
+        <script src = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.10.1.min.js"> </scipt>
     <div id = "map" style = "width: 500pxl height: 400px; "> </div>
     <script>