ソースを参照

Improve result layout

Johannes Zellner 8 年 前
親
コミット
380dec6dfe
3 ファイル変更、55 行追加、14 行削除
  1. 14 1
      index.css
  2. 4 10
      index.html
  3. 37 3
      index.js

+ 14 - 1
index.css

@@ -76,6 +76,19 @@ html, body {
     background: #E7E7E7;
 }
 
+.query-search-result-item h4 {
+    margin: 0;
+    margin-top: 10px;
+    margin-bottom: 5px;
+}
+
+.query-search-result-item p {
+    margin: 0;
+    margin-bottom: 10px;
+    color: gray;
+    font-size: 14px;
+}
+
 .search-input {
     width: 100%;
 }
@@ -111,4 +124,4 @@ html, body {
     width: 80px;
     height: 80px;
     cursor: pointer;
-}
+}

+ 4 - 10
index.html

@@ -31,26 +31,20 @@
     </div>
     <div :class="{ 'open': !markerDetailsOpen }" class="query-search-result-container">
       <div v-for="item in querySearchResults" class="query-search-result-item" @click="searchSelectItem(item)">
-        <i class="fas fa-utensils" v-if="item.type === 'restaurant'"></i>
-        <i class="fas fa-user-md" v-else-if="item.type === 'doctors'"></i>
-        <i class="fas fa-car" v-else-if="item.type === 'car'"></i>
-        <i class="fas fa-city" v-else-if="item.type === 'city' || item.type === 'village'"></i>
-        <i class="fas fa-beer" v-else-if="item.type === 'pub' || item.type === 'bar'"></i>
-        <i class="fas fa-bed" v-else-if="item.type === 'hotel' || item.type === 'hostel'"></i>
-        <i class="fas fa-address-card" v-else></i>
-        {{ item.display_name }}
+        <h4><i class="fas" :class="[ item.icon ]"></i> {{ item.name }}</h4>
+        <p>{{ item.address.road }} {{ item.address.house_number }}, {{ item.address.city }} ({{ item.address.city_district }} {{ item.address.postcode }})</p>
       </div>
     </div>
     <div :class="{ 'open': markerDetailsOpen }" class="query-search-result-container">
       <el-button icon="el-icon-close" circle @click="markerDetailsOpen = false;"></el-button>
       <div>
           <h2>Details</h2>
-          <p>{{ markerDetails.display_name }}</p>
+          <p>{{ markerDetails.name }}</p>
       </div>
     </div>
   </div>
   <div id="map" class="map"></div>
-  <el-input placeholder="Search ..." v-model="querySearchString" class="query-search-input" :class="{ 'open': sidePanelOpen }" @keyup.enter.native="doQuerySearch()"></el-input>
+  <el-input placeholder="Search ..." v-model="querySearchString" id="querySearchInput" class="query-search-input" :class="{ 'open': sidePanelOpen }" @keyup.enter.native="doQuerySearch()"></el-input>
   <el-input placeholder="Search ..." v-show="directionsOpen" v-model="querySearchStringTo" class="query-search-input second" :class="{ 'open': sidePanelOpen }" @keyup.enter.native="doQuerySearch()"></el-input>
   <el-button :class="{ 'open': sidePanelOpen, 'el-icon-arrow-left': sidePanelOpen, 'el-icon-arrow-right': !sidePanelOpen }" circle @click="sidePanelOpen = !sidePanelOpen" class="side-panel-toggle-button"></el-button>
 </el-container>

+ 37 - 3
index.js

@@ -33,6 +33,36 @@ function setupMap() {
 
 function findResults(queryString, position, callback) {
 
+    function amendDetails(results) {
+        results.forEach(function (r) {
+            // icons
+            r.icon = 'fa-address-card';
+            if (r.type === 'restaurant') r.icon = 'fa-utensils';
+            if (r.type === 'doctors') r.icon = 'fa-user-md';
+            if (r.type === 'dentist') r.icon = 'fa-tooth';
+            if (r.type === 'car') r.icon = 'fa-car';
+            if (r.type === 'bicycle-rental') r.icon = 'fa-bicycle';
+            if (r.type === 'school') r.icon = 'fa-graduation-cap';
+            if (r.type === 'canal' || r.type === 'river' || r.type === 'water') r.icon = 'fa-water';
+            if (r.type === 'station' || r.type === 'stop') r.icon = 'fa-subway';
+            if (r.type === 'attraction') r.icon = 'fa-monument';
+            if (r.type === 'city' || r.type === 'village' || r.type === 'administrative') r.icon = 'fa-city';
+            if (r.type === 'administrative') r.icon = 'fa-building';
+            if (r.type === 'pub' || r.type === 'bar') r.icon = 'fa-beer';
+            if (r.type === 'hotel' || r.type === 'hostel') r.icon = 'fa-bed';
+
+            // ensure we have some city if only town is mentioned
+            if (!r.address.city) r.address.city = r.address.town;
+
+            // name
+            r.name = r.display_name.split(',')[0];
+            if (r.class === 'place' || r.class === 'building') r.name = r.address.road + ' ' + r.address.house_number;
+
+        });
+
+        return results;
+    }
+
     function removeDuplicates(results) {
         var tmp = [];
 
@@ -48,6 +78,7 @@ function findResults(queryString, position, callback) {
         var params = {
             format: 'json',
             limit: 20,
+            addressdetails: 1,
             q: (detail && queryString.indexOf(detail) === -1) ? (queryString + ' , ' + detail) : queryString
         };
 
@@ -66,16 +97,16 @@ function findResults(queryString, position, callback) {
 
     query(position.details.address.city + ' , ' + position.details.address.country, function (result) {
         results = removeDuplicates(results.concat(result));
-        if (results.length >= 20) return callback(results);
+        if (results.length >= 20) return callback(amendDetails(results));
 
         query(position.details.address.country, function (result) {
             results = removeDuplicates(results.concat(result));
-            if (results.length >= 20) return callback(results);
+            if (results.length >= 20) return callback(amendDetails(results));
 
             query(null, function (result) {
                 results = removeDuplicates(results.concat(result));
 
-                return callback(results);
+                return callback(amendDetails(results));
             });
         });
     });
@@ -163,5 +194,8 @@ app = new Vue({
     created: function () {
         setupMap();
         this.getPositionDetails();
+        setTimeout(function () {
+            document.getElementById('querySearchInput').focus();
+        }, 1000);
     }
 });