From 9556bd407b7bacc9934acfae80aa363bae1dacec Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:42:00 +0200
Subject: [PATCH 1/2] refactor(location search): Photon: restrict via API URL
 on shop & amenity

---
 src/services/api.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/services/api.js b/src/services/api.js
index 4bd48db43b..c5e0ed1b47 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -5,6 +5,7 @@ import constants from '../constants'
 const PRICE_UPDATE_FIELDS = ['price', 'price_is_discounted', 'price_without_discount', 'price_per', 'currency', 'date']
 const PRICE_CREATE_FIELDS = PRICE_UPDATE_FIELDS.concat(['product_code', 'product_name', 'category_tag', 'labels_tags', 'origins_tags', 'location_osm_id', 'location_osm_type', 'proof_id'])
 const PROOF_UPDATE_FIELDS = ['type', 'date', 'currency']
+const LOCATION_SEARCH_LIMIT = 10
 
 const OP_DEFAULT_PAGE_SIZE = 20  // 100 slows down the app
 const OP_DEFAULT_HEADERS = {
@@ -239,7 +240,7 @@ export default {
   },
 
   openstreetmapNominatimSearch(q) {
-    return fetch(`${constants.OSM_NOMINATIM_SEARCH_URL}?q=${q}&addressdetails=1&format=json&limit=10`, {
+    return fetch(`${constants.OSM_NOMINATIM_SEARCH_URL}?q=${q}&addressdetails=1&format=json&limit=${LOCATION_SEARCH_LIMIT}`, {
       method: 'GET',
       headers: OP_DEFAULT_HEADERS
     })
@@ -254,8 +255,9 @@ export default {
     .then((response) => response.json())
     .then((data) => data.filter(l => !constants.NOMINATIM_RESULT_TYPE_EXCLUDE_LIST.includes(l.type)))
   },
+  // Photon: restrict the search to shop & amenity
   openstreetmapPhotonSearch(q) {
-    return fetch(`${constants.OSM_PHOTON_SEARCH_URL}?q=${q}&limit=10`, {
+    return fetch(`${constants.OSM_PHOTON_SEARCH_URL}?q=${q}&osm_key=shop&osm_tag=amenity&limit=${LOCATION_SEARCH_LIMIT}`, {
       method: 'GET',
       headers: OP_DEFAULT_HEADERS
     })

From 1f4925d234d0daea96240900842451a39421ab75 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Fri, 20 Sep 2024 22:48:41 +0200
Subject: [PATCH 2/2] Refactor

---
 src/services/api.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/services/api.js b/src/services/api.js
index c5e0ed1b47..ff167e42f8 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -232,7 +232,8 @@ export default {
   },
 
   openfoodfactsProductSearch(code) {
-    return fetch(`${constants.OFF_API_URL}/${code}.json`, {
+    const url = `${constants.OFF_API_URL}/${code}.json`
+    return fetch(url, {
       method: 'GET',
       headers: OP_DEFAULT_HEADERS
     })
@@ -240,7 +241,8 @@ export default {
   },
 
   openstreetmapNominatimSearch(q) {
-    return fetch(`${constants.OSM_NOMINATIM_SEARCH_URL}?q=${q}&addressdetails=1&format=json&limit=${LOCATION_SEARCH_LIMIT}`, {
+    const url = `${constants.OSM_NOMINATIM_SEARCH_URL}?q=${q}&addressdetails=1&format=json&limit=${LOCATION_SEARCH_LIMIT}`
+    return fetch(url, {
       method: 'GET',
       headers: OP_DEFAULT_HEADERS
     })
@@ -248,7 +250,8 @@ export default {
     .then((data) => data.filter(l => !constants.NOMINATIM_RESULT_TYPE_EXCLUDE_LIST.includes(l.type)))
   },
   openstreetmapNominatimLookup(id) {
-    return fetch(`${constants.OSM_NOMINATIM_LOOKUP_URL}?osm_ids=N${id},W${id},R${id}&addressdetails=1&format=json`, {
+    const url = `${constants.OSM_NOMINATIM_LOOKUP_URL}?osm_ids=N${id},W${id},R${id}&addressdetails=1&format=json`
+    return fetch(url, {
       method: 'GET',
       headers: OP_DEFAULT_HEADERS
     })
@@ -256,8 +259,12 @@ export default {
     .then((data) => data.filter(l => !constants.NOMINATIM_RESULT_TYPE_EXCLUDE_LIST.includes(l.type)))
   },
   // Photon: restrict the search to shop & amenity
-  openstreetmapPhotonSearch(q) {
-    return fetch(`${constants.OSM_PHOTON_SEARCH_URL}?q=${q}&osm_key=shop&osm_tag=amenity&limit=${LOCATION_SEARCH_LIMIT}`, {
+  openstreetmapPhotonSearch(q, restrictToShop=true) {
+    let url = `${constants.OSM_PHOTON_SEARCH_URL}?q=${q}&limit=${LOCATION_SEARCH_LIMIT}`
+    if (restrictToShop) {
+      url += '&osm_key=shop&osm_tag=amenity'
+    }
+    return fetch(url, {
       method: 'GET',
       headers: OP_DEFAULT_HEADERS
     })