ソースを参照

Prepare for multiple result marker

Johannes Zellner 7 年 前
親
コミット
328e353b1c
3 ファイル変更、29 行追加、16 行削除
  1. 1 0
      .dockerignore
  2. 1 1
      public/index.html
  3. 27 15
      public/index.js

+ 1 - 0
.dockerignore

@@ -3,4 +3,5 @@
 .dockerignore
 node_modules
 opt/
+otp-1.3.0-shaded.jar
 

+ 1 - 1
public/index.html

@@ -31,7 +31,7 @@
     </div>
     <div :class="{ 'open': !markerDetailsOpen }" class="query-search-result-container">
       <div class="query-search-result-container-inner">
-        <div v-for="item in querySearchResults" class="query-search-result-item" @click="searchSelectItem(item)">
+        <div v-for="item in querySearchResults" class="query-search-result-item" @click="activateSearchItem(item)">
           <h4><i class="fas" :class="[ item.icon ]"></i> {{ item.name }}</h4>
           <p v-if="item.class === 'city'">{{ item.address.postcode }} {{ item.address.country }}</p>
           <p v-else>{{ item.address.road || item.address.pedestrian }} {{ item.address.house_number }}, {{ item.address.city || item.address.town || item.address.village }} ({{ item.address.city_district }} {{ item.address.postcode }} {{ item.address.country }})</p>

+ 27 - 15
public/index.js

@@ -63,13 +63,14 @@ app = new Vue({
         querySearchStringTo: '',
         querySearchResults: [],
         searchPositionMarker: null,
+        searchMarker: [],
         markerDetailsOpen: false,
         markerDetails: {
             businessDetails: null
         }
     },
     methods: {
-        searchMarkerClicked: function (item) {
+        openPlaceDetails: function (item) {
             var that = this;
 
             var params = {
@@ -91,26 +92,35 @@ app = new Vue({
                 that.markerDetails = item;
             });
         },
-        setSearchPositionMarker: function (item) {
+        addSearchMarker: function (items) {
             var that = this;
 
-            if (this.searchPositionMarker) this.searchPositionMarker.remove();
+            that.clearSearchMarker();
 
-            var el = document.createElement('div');
-            el.className = 'search-result-marker';
-            el.addEventListener('click', function (e) {
-                that.searchMarkerClicked(item);
-            });
+            items.forEach(function (item) {
+                var el = document.createElement('div');
+                el.className = 'search-result-marker';
+                el.addEventListener('click', function (e) {
+                    that.openPlaceDetails(item);
+                });
 
-            this.searchPositionMarker = new mapboxgl.Marker(el);
-            this.searchPositionMarker.setLngLat([ item.lon, item.lat ]);
-            this.searchPositionMarker.addTo(map);
+                var m = new mapboxgl.Marker({ element: el });
+                m.setLngLat([ item.lon, item.lat ]);
+                m.addTo(map);
 
-            map.flyTo({ center: [ item.lon, item.lat ], zoom: 16 });
+                that.searchMarker.push(m);
+            });
+        },
+        clearSearchMarker: function () {
+            this.searchMarker.forEach(function (marker) {
+                marker.remove();
+            });
+
+            this.searchMarker = [];
         },
-        searchSelectItem: function (item) {
+        activateSearchItem: function (item) {
             this.querySearchString = item.display_name;
-            this.setSearchPositionMarker(item);
+            map.flyTo({ center: [ item.lon, item.lat ], zoom: 16 });
         },
         searchPlaces: function () {
             var that = this;
@@ -130,7 +140,9 @@ app = new Vue({
                 that.querySearchResults = response.data;
                 that.sidePanelOpen = true;
 
-                if (that.querySearchResults[0]) that.setSearchPositionMarker(that.querySearchResults[0]);
+                that.addSearchMarker(that.querySearchResults.slice(0,1));
+
+                if (that.querySearchResults[0]) map.flyTo({ center: [ that.querySearchResults[0].lon, that.querySearchResults[0].lat ], zoom: 16 });
             }).catch(function (error) {
                 console.error(error);
             });