Showing
3 changed files
with
20 additions
and
21 deletions
... | @@ -2,14 +2,6 @@ var map; | ... | @@ -2,14 +2,6 @@ var map; |
2 | var pos; | 2 | var pos; |
3 | var infowindow; | 3 | var infowindow; |
4 | var service; | 4 | var service; |
5 | -var result_food = []; | ||
6 | -var result_entertainment = []; | ||
7 | -var result_room = []; | ||
8 | - | ||
9 | -export { pos as posiiton }; | ||
10 | -export { result_food as foodList }; | ||
11 | -export { result_entertainment as entList }; | ||
12 | -export { result_room as roomList }; | ||
13 | 5 | ||
14 | function initMap() { | 6 | function initMap() { |
15 | map = new google.maps.Map(document.getElementById('map'), { | 7 | map = new google.maps.Map(document.getElementById('map'), { |
... | @@ -62,7 +54,7 @@ function searchPlace(str, placeType) { | ... | @@ -62,7 +54,7 @@ function searchPlace(str, placeType) { |
62 | service.nearbySearch({ | 54 | service.nearbySearch({ |
63 | location: pos, | 55 | location: pos, |
64 | radius: 500, | 56 | radius: 500, |
65 | - type: ['meal_takeaway'] | 57 | + type: [str.toString()] |
66 | }, callback_foods); | 58 | }, callback_foods); |
67 | break; | 59 | break; |
68 | case 'entertainment': | 60 | case 'entertainment': |
... | @@ -76,7 +68,7 @@ function searchPlace(str, placeType) { | ... | @@ -76,7 +68,7 @@ function searchPlace(str, placeType) { |
76 | service.nearbySearch({ | 68 | service.nearbySearch({ |
77 | location: pos, | 69 | location: pos, |
78 | radius: 500, | 70 | radius: 500, |
79 | - type: ['lodging'] | 71 | + type: [str.toString()] |
80 | }, callback_rooms); | 72 | }, callback_rooms); |
81 | break; | 73 | break; |
82 | default: | 74 | default: | ... | ... |
... | @@ -9,8 +9,8 @@ | ... | @@ -9,8 +9,8 @@ |
9 | <meta name="description" content=""> | 9 | <meta name="description" content=""> |
10 | <meta name="author" content=""> | 10 | <meta name="author" content=""> |
11 | 11 | ||
12 | - <title>저기어때</title> | 12 | + <title>뭐라도해</title> |
13 | - | 13 | + |
14 | <!-- Bootstrap core CSS--> | 14 | <!-- Bootstrap core CSS--> |
15 | <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet"> | 15 | <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet"> |
16 | 16 | ||
... | @@ -41,43 +41,43 @@ | ... | @@ -41,43 +41,43 @@ |
41 | 41 | ||
42 | <!-- Sidebar --> | 42 | <!-- Sidebar --> |
43 | <ul class="sidebar navbar-nav"> | 43 | <ul class="sidebar navbar-nav"> |
44 | - | 44 | + |
45 | <li class="nav-item"> | 45 | <li class="nav-item"> |
46 | <a class="nav-link" href="index.html"> | 46 | <a class="nav-link" href="index.html"> |
47 | <i class="fas fa-map-marker"></i> | 47 | <i class="fas fa-map-marker"></i> |
48 | <span>Map</span> | 48 | <span>Map</span> |
49 | </a> | 49 | </a> |
50 | </li> | 50 | </li> |
51 | - | 51 | + |
52 | <li class="nav-item"> | 52 | <li class="nav-item"> |
53 | <a class="nav-link" href="Foods.html"> | 53 | <a class="nav-link" href="Foods.html"> |
54 | <i class="fas fa-utensils" area-hidden ="true"></i> | 54 | <i class="fas fa-utensils" area-hidden ="true"></i> |
55 | <span>Foods</span> | 55 | <span>Foods</span> |
56 | </a> | 56 | </a> |
57 | </li> | 57 | </li> |
58 | - | 58 | + |
59 | <li class="nav-item"> | 59 | <li class="nav-item"> |
60 | <a class="nav-link" href="Entertainment.html"> | 60 | <a class="nav-link" href="Entertainment.html"> |
61 | <i class="fas fa-gamepad"></i> | 61 | <i class="fas fa-gamepad"></i> |
62 | <span>Entertainment</span> | 62 | <span>Entertainment</span> |
63 | </a> | 63 | </a> |
64 | </li> | 64 | </li> |
65 | - | 65 | + |
66 | <li class="nav-item active"> | 66 | <li class="nav-item active"> |
67 | <a class="nav-link" href="Rooms.html"> | 67 | <a class="nav-link" href="Rooms.html"> |
68 | <i class="fas fa-bed"></i> | 68 | <i class="fas fa-bed"></i> |
69 | <span>Rooms</span> | 69 | <span>Rooms</span> |
70 | </a> | 70 | </a> |
71 | </li> | 71 | </li> |
72 | - | 72 | + |
73 | <li class="nav-item"> | 73 | <li class="nav-item"> |
74 | <a class="nav-link" href="Favorite.html"> | 74 | <a class="nav-link" href="Favorite.html"> |
75 | <i class="fas fa-heart"></i> | 75 | <i class="fas fa-heart"></i> |
76 | <span>Favorite</span> | 76 | <span>Favorite</span> |
77 | </a> | 77 | </a> |
78 | </li> | 78 | </li> |
79 | - | 79 | + |
80 | - | 80 | + |
81 | </ul> | 81 | </ul> |
82 | <div id="content-wrapper"> | 82 | <div id="content-wrapper"> |
83 | 83 | ||
... | @@ -186,7 +186,7 @@ | ... | @@ -186,7 +186,7 @@ |
186 | <i class="fas fa-angle-up"></i> | 186 | <i class="fas fa-angle-up"></i> |
187 | </a> | 187 | </a> |
188 | 188 | ||
189 | - | 189 | + |
190 | 190 | ||
191 | <!-- Bootstrap core JavaScript--> | 191 | <!-- Bootstrap core JavaScript--> |
192 | <script src="vendor/jquery/jquery.min.js"></script> | 192 | <script src="vendor/jquery/jquery.min.js"></script> | ... | ... |
... | @@ -95,7 +95,14 @@ | ... | @@ -95,7 +95,14 @@ |
95 | </ul> | 95 | </ul> |
96 | 96 | ||
97 | <div id="content-wrapper"> | 97 | <div id="content-wrapper"> |
98 | - <script type="text/javascript" src="js/getPlaceList.js"></script> | 98 | + <script type='text/javascript'> |
99 | + var result_food = []; | ||
100 | + var result_entertainment = []; | ||
101 | + var result_room = []; | ||
102 | + var queryString = "?para1=" + result_food + "¶2=" + result_entertainment + "¶3=" + result_room; | ||
103 | + window.location.href = "Foods.html" + queryString; | ||
104 | + </script> | ||
105 | + <script type="text/javascript" src="../api/getPlaceList.js"></script> | ||
99 | <div id="map"></div> | 106 | <div id="map"></div> |
100 | <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDg4CkUEEt_96n1ork1nL5t4E_SpdKrgMI&libraries=places&callback=initMap" async defer></script> | 107 | <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDg4CkUEEt_96n1ork1nL5t4E_SpdKrgMI&libraries=places&callback=initMap" async defer></script> |
101 | <!-- Sticky Footer --> | 108 | <!-- Sticky Footer --> | ... | ... |
-
Please register or login to post a comment