Show Entertainment list

Donghoon Kim
Commit 837cfff8691040d82fec1685b1fc425b8525507f 837cfff8 1 parent ffdbf2b6
Showing 2 changed files with 42 additions and 80 deletions
public/Entertainment.html
public/js/showEnt.js
--- a/public/Entertainment.html
View file @837cfff
+++ b/public/Entertainment.html
View file @837cfff
@@ -41,36 +41,36 @@
       <!-- Sidebar -->
       <ul class="sidebar navbar-nav">
-        
+
     <li class="nav-item">
           <a class="nav-link" href="index.html">
             <i class="fas fa-map-marker"></i>
             <span>Map</span>
           </a>
         </li>
-        
+
     <li class="nav-item">
           <a class="nav-link" href="Foods.html">
             <i class="fas fa-utensils" area-hidden ="true"></i>
             <span>Foods</span>
           </a>
         </li>
-        
+
     <li class="nav-item active">
           <a class="nav-link" href="Entertainment.html">
             <i class="fas fa-gamepad"></i>
             <span>Entertainment</span>
           </a>
         </li>
-        
+
     <li class="nav-item">
           <a class="nav-link" href="Rooms.html">
             <i class="fas fa-bed"></i>
             <span>Rooms</span>
           </a>
         </li>
-    
+
-    
+
       </ul>
       <div id="content-wrapper">
@@ -84,6 +84,12 @@
           </ol>
+          <script>
+            var result_entertainment = []
+          </script>
+          <script type="text/javascript" src="/js/showEnt.js"></script>
+          <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDg4CkUEEt_96n1ork1nL5t4E_SpdKrgMI&libraries=places&callback=initMap" async defer></script>
+
           <!-- Icon Cards-->
           <div class="row">
             <div class="col-xl-3 col-sm-6 mb-3">
@@ -179,7 +185,7 @@
       <i class="fas fa-angle-up"></i>
     </a>
-        
+
     <!-- Bootstrap core JavaScript-->
     <script src="vendor/jquery/jquery.min.js"></script>
--- a/public/js/showEnt.js
View file @837cfff
+++ b/public/js/showEnt.js
View file @837cfff
+function initMap() {
+    // Try HTML5 geolocation.
+    if (navigator.geolocation) {
+        navigator.geolocation.getCurrentPosition(function(position) {
+            pos = {
+                lat: position.coords.latitude,
+                lng: position.coords.longitude
+            };
+
+            searchPlace('department_store','entertainment');
+            searchPlace('movie_theater','entertainment');
+            searchPlace('museum','entertainment');
+            searchPlace('night_club','entertainment');
+            searchPlace('shopping_mall','entertainment');
+            searchPlace('zoo','entertainment');
+        });
+    }
+}
+
 function searchPlace(str, placeType) {
   switch(placeType) {
     case 'food':
@@ -26,84 +45,21 @@ function searchPlace(str, placeType) {
   }
 }
-
-function callback_foods(results, status) {
-    if (status === google.maps.places.PlacesServiceStatus.OK) {
-        for (var i = 0; i < results.length; i++) {
-            putDataToDB(results[i], 'food')
-            createMarker_foods(results[i]);
-        }
-    }
-}
-
 function callback_entertainment(results, status) {
     if (status === google.maps.places.PlacesServiceStatus.OK) {
         for (var i = 0; i < results.length; i++) {
-            putDataToDB(results[i], 'entertainment')
+            result_entertainment.push(result[i])
-            createMarker_entertainment(results[i]);
-        }
-    }
-}
-
-function callback_rooms(results, status) {
-    if (status === google.maps.places.PlacesServiceStatus.OK) {
-        for (var i = 0; i < results.length; i++) {
-          putDataToDB(results[i], 'room')
-          createMarker_rooms(results[i]);
         }
     }
 }
-function createMarker_foods(place) {
+  // const id = result['id'];
-    var marker = new google.maps.Marker({
+  // const place_id =result['place_id'];
-        map: map,
+  // const name = result['name'];
-        position: place.geometry.location,
+  // const address = result['vicinity'];
-        icon : "./icons/restaurant-15.svg",
+  // let category_big = category1
-        //fillcolor : "#FF0000"
+  // const category_small = result.types[0];
-    });
+  // const image = "default"
-
+  // const rating = result.rating;
-    google.maps.event.addListener(marker, 'click', function() {
+  // const lng = result.geometry.viewport.ea.j;
-        infowindow.setContent(place.name);
-        infowindow.open(map, this);
-    });
-}
-
-function createMarker_entertainment(place) {
-    var placeLoc = place.geometry.location;
-    var marker = new google.maps.Marker({
-        map: map,
-        position: place.geometry.location,
-        icon : "./icons/gaming-15.svg"
-    });
-
-    google.maps.event.addListener(marker, 'click', function() {
-        infowindow.setContent(place.name);
-        infowindow.open(map, this);
-    });
-}
-
-function createMarker_rooms(place) {
-    var placeLoc = place.geometry.location;
-    var marker = new google.maps.Marker({
-        map: map,
-        position: place.geometry.location,
-        icon : "./icons/lodging-15.svg"
-    });
-
-    google.maps.event.addListener(marker, 'click', function() {
-        infowindow.setContent(place.name);
-        infowindow.open(map, this);
-    });
-}
-
-function putDataToDB(result, category1) {
-  const id = result['id'];
-  const place_id =result['place_id'];
-  const name = result['name'];
-  const address = result['vicinity'];
-  let category_big = category1
-  const category_small = result.types[0];
-  const image = "default"
-  const rating = result.rating;
-  const lng = result.geometry.viewport.ea.j;
   const lat =result.geometry.viewport.la.j;