fix(location): improve location search result filtering and display (#…

…597)
openfoodfacts · May 31, 2024 · 40403c6 · 40403c6
1 parent 779b983
commit 40403c6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/components/LocationCard.vue b/src/components/LocationCard.vue
@@ -8,7 +8,7 @@
     <v-card-text v-if="location">
       <PriceCountChip :count="location.price_count" :withLabel="true" />
       <v-chip label size="small" density="comfortable" class="mr-1" title="OpenStreetMap tag">
-        {{ location.osm_tag_key }}:{{ location.osm_tag_value }}
+        {{ getLocationCategory(location) }}
       </v-chip>
     </v-card-text>
   </v-card>
@@ -39,6 +39,9 @@ export default {
       }
       return this.$route.params.id
     },
+    getLocationCategory(location) {
+      return utils.getLocationCategory(location)
+    },
     goToLocation(location) {
       if (this.readonly) {
         return

diff --git a/src/constants.js b/src/constants.js
@@ -66,5 +66,6 @@ export default {
     'apartments', 'barracks', 'bungalow', 'cabin', 'detached', 'dormitory', 'ger', 'house', 'houseboat', 'residential',  // 'farm', 'hotel'
     'fuel', 'gas', 'casino', 'parking', 'parking_space', 'charging_station', 'atm',
     'car_sharing',
+    'yes',
   ],
 }
diff --git a/src/services/api.js b/src/services/api.js
@@ -223,7 +223,7 @@ export default {
     })
     .then((response) => response.json())
     .then(data => data.features)
-    .then((data) => data.filter(l => !constants.NOMINATIM_RESULT_TYPE_EXCLUDE_LIST.includes(l.properties.osm_key)))
+    .then((data) => data.filter(l => !constants.NOMINATIM_RESULT_TYPE_EXCLUDE_LIST.includes(l.properties.osm_value)))
   },
   openstreetmapSearch(q, source='nominatim') {
     if (source === 'photon') {

diff --git a/src/utils.js b/src/utils.js
@@ -193,13 +193,17 @@ function getLocationUniqueID(locationObject) {
 }
 
 function getLocationCategory(locationObject) {
-  // examples: shop, amenity, building
+  // examples: shop:supermarket, shop:convenience, shop:bakery, shop:doityourself
   // Photon
   if (locationObject.properties) {
-    return locationObject.properties.type
+    return `${locationObject.properties.osm_key}:${locationObject.properties.osm_value}`
   }
-  // Nominatim or OP
-  return locationObject.type || locationObject.osm_type
+  // Nominatim
+  else if (locationObject.address) {
+    return `${locationObject.class}:${locationObject.type}`
+  }
+  // OP
+  return `${locationObject.osm_tag_key}:${locationObject.osm_tag_value}`
 }
 
 function getLocationLatLng(locationObject) {