Make nominatim search provider locale aware

qgis · Dec 16, 2021 · 1e139a1 · 1e139a1
1 parent 805b71c
commit 1e139a1
Show file tree

Hide file tree

Showing 16 changed files with 187 additions and 7 deletions.
diff --git a/js/SearchProviders.js b/js/SearchProviders.js
@@ -72,6 +72,7 @@ Format of search results:
 import axios from 'axios';
 import {addSearchResults, SearchResultType} from "qwc2/actions/search";
 import CoordinatesUtils from 'qwc2/utils/CoordinatesUtils';
+import LocaleUtils from 'qwc2/utils/LocaleUtils';
 
 function coordinatesSearch(text, requestId, searchOptions, dispatch) {
     const displaycrs = searchOptions.displaycrs || "EPSG:4326";
@@ -239,7 +240,7 @@ function nominatimSearchResults(obj, requestId) {
             groups[entry.class] = {
                 id: "nominatimgroup" + (groupcounter++),
                 // capitalize class
-                title: entry.class.charAt(0).toUpperCase() + entry.class.slice(1),
+                title: LocaleUtils.trWithFallback("search.nominatim." + entry.class, entry.class.charAt(0).toUpperCase() + entry.class.slice(1)),
                 items: []
             };
             results.push(groups[entry.class]);
@@ -290,11 +291,12 @@ function nominatimSearchResults(obj, requestId) {
 
 function nominatimSearch(text, requestId, searchOptions, dispatch) {
     axios.get("//nominatim.openstreetmap.org/search", {params: {
-        q: text,
-        addressdetails: 1,
-        polygon_geojson: 1,
-        limit: 20,
-        format: 'json'
+        'q': text,
+        'addressdetails': 1,
+        'polygon_geojson': 1,
+        'limit': 20,
+        'format': 'json',
+        'accept-language': LocaleUtils.lang()
     }}).then(response => dispatch(nominatimSearchResults(response.data, requestId)));
 }
 

diff --git a/static/translations/cs-CZ.json b/static/translations/cs-CZ.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Vše",
       "enablelayer": "",
       "existinglayer": "",

diff --git a/static/translations/de-CH.json b/static/translations/de-CH.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "Annehmlichkeit",
+        "boundary": "Grenze",
+        "building": "Gebäude",
+        "landuse": "Landnutzung",
+        "leisure": "Freizeit",
+        "place": "Ort",
+        "highway": "Autobahn",
+        "natural": "Natur",
+        "railway": "Eisenbahn",
+        "tourism": "Tourismus"
+      },
       "all": "Alle",
       "enablelayer": "Ebene einschalten",
       "existinglayer": "Die Ebene existiert bereits in der Karte",

diff --git a/static/translations/de-DE.json b/static/translations/de-DE.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "Koordinaten",
+      "nominatim": {
+        "amenity": "Annehmlichkeit",
+        "boundary": "Grenze",
+        "building": "Gebäude",
+        "landuse": "Landnutzung",
+        "leisure": "Freizeit",
+        "place": "Ort",
+        "highway": "Autobahn",
+        "natural": "Natur",
+        "railway": "Eisenbahn",
+        "tourism": "Tourismus"
+      },
       "all": "Alle",
       "enablelayer": "Ebene einschalten",
       "existinglayer": "Die Ebene existiert bereits in der Karte",

diff --git a/static/translations/en-US.json b/static/translations/en-US.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "Coordinates",
+      "nominatim": {
+        "amenity": "Amenity",
+        "boundary": "Boundary",
+        "building": "Building",
+        "landuse": "Land use",
+        "leisure": "Leisure",
+        "place": "Place",
+        "highway": "Highway",
+        "natural": "Natural",
+        "railway": "Railway",
+        "tourism": "Tourism"
+      },
       "all": "All",
       "enablelayer": "Enable layer",
       "existinglayer": "The layer already exists in the map",

diff --git a/static/translations/es-ES.json b/static/translations/es-ES.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Todo",
       "enablelayer": "Habilitar capa",
       "existinglayer": "La capa ya existe en el mapa",

diff --git a/static/translations/fr-FR.json b/static/translations/fr-FR.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "Coordonnées",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Tous",
       "enablelayer": "Activer la couche",
       "existinglayer": "La couche existe déjà dans la carte",

diff --git a/static/translations/it-IT.json b/static/translations/it-IT.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "Coordinate",
+      "nominatim": {
+        "amenity": "Amenità",
+        "boundary": "Confine",
+        "building": "Costruzione",
+        "landuse": "Utilizzo terreno",
+        "leisure": "Svago",
+        "place": "Località",
+        "highway": "Autostrata",
+        "natural": "Natura",
+        "railway": "Ferrovia",
+        "tourism": "Turismo"
+      },
       "all": "Tutti",
       "enablelayer": "Attivare il livello",
       "existinglayer": "Il livello esiste già nella mappa",

diff --git a/static/translations/pl-PL.json b/static/translations/pl-PL.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Wszystko",
       "enablelayer": "Włącz warstwę",
       "existinglayer": "",

diff --git a/static/translations/pt-BR.json b/static/translations/pt-BR.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Todos",
       "enablelayer": "Ativar a camada",
       "existinglayer": "A camada já existe no mapa",

diff --git a/static/translations/pt-PT.json b/static/translations/pt-PT.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Todos",
       "enablelayer": "Ativar a camada",
       "existinglayer": "A camada já existe no mapa",

diff --git a/static/translations/ro-RO.json b/static/translations/ro-RO.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "Coordonate",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Toate",
       "enablelayer": "Activare strat",
       "existinglayer": "Strat existent",

diff --git a/static/translations/ru-RU.json b/static/translations/ru-RU.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Всё",
       "enablelayer": "",
       "existinglayer": "",

diff --git a/static/translations/sv-SE.json b/static/translations/sv-SE.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "Koordinater",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "",
       "enablelayer": "",
       "existinglayer": "",

diff --git a/static/translations/tr-TR.json b/static/translations/tr-TR.json
@@ -27,6 +27,18 @@
     },
     "search": {
       "coordinates": "",
+      "nominatim": {
+        "amenity": "",
+        "boundary": "",
+        "building": "",
+        "landuse": "",
+        "leisure": "",
+        "place": "",
+        "highway": "",
+        "natural": "",
+        "railway": "",
+        "tourism": ""
+      },
       "all": "Tümü",
       "enablelayer": "Geçerli katman",
       "existinglayer": "Katman zaten haritada mevcut",

diff --git a/static/translations/tsconfig.json b/static/translations/tsconfig.json
@@ -17,7 +17,17 @@
   ],
   "extra_strings": [
     "appmenu.items.ExternalLink",
-    "search.coordinates"
+    "search.coordinates",
+    "search.nominatim.amenity",
+    "search.nominatim.boundary",
+    "search.nominatim.building",
+    "search.nominatim.landuse",
+    "search.nominatim.leisure",
+    "search.nominatim.place",
+    "search.nominatim.highway",
+    "search.nominatim.natural",
+    "search.nominatim.railway",
+    "search.nominatim.tourism"
   ],
   "overrides": [
     "bottombar.viewertitle_label"