From ed66968308f321cd7bc60aca0b1ae753f86f623e Mon Sep 17 00:00:00 2001 From: J Guthrie Date: Sat, 24 Nov 2018 21:12:51 +0000 Subject: [PATCH] Add localised lang param to API url call --- modules/services/taginfo.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js index 524f833d3..d25f51995 100644 --- a/modules/services/taginfo.js +++ b/modules/services/taginfo.js @@ -6,6 +6,7 @@ import _omit from 'lodash-es/omit'; import { json as d3_json } from 'd3-request'; import { utilQsString } from '../util'; +import { currentLocale } from '../util/locale'; var apibase = 'https://taginfo.openstreetmap.org/api/4/', @@ -189,7 +190,7 @@ export default { // Fetch popular keys. We'll exclude these from `values` // lookups because they stress taginfo, and they aren't likely // to yield meaningful autocomplete results.. see #3955 - var params = { rp: 100, sortname: 'values_all', sortorder: 'desc', page: 1, debounce: false }; + var params = { rp: 100, sortname: 'values_all', sortorder: 'desc', page: 1, debounce: false, lang: currentLocale }; this.keys(params, function(err, data) { if (err) return; data.forEach(function(d) { @@ -209,7 +210,7 @@ export default { keys: function(params, callback) { var doRequest = params.debounce ? debouncedRequest : request; params = clean(setSort(params)); - params = _extend({ rp: 10, sortname: 'count_all', sortorder: 'desc', page: 1 }, params); + params = _extend({ rp: 10, sortname: 'count_all', sortorder: 'desc', page: 1, lang: currentLocale }, params); var url = apibase + 'keys/all?' + utilQsString(params); doRequest(url, params, false, callback, function(err, d) { @@ -228,7 +229,7 @@ export default { multikeys: function(params, callback) { var doRequest = params.debounce ? debouncedRequest : request; params = clean(setSort(params)); - params = _extend({ rp: 25, sortname: 'count_all', sortorder: 'desc', page: 1 }, params); + params = _extend({ rp: 25, sortname: 'count_all', sortorder: 'desc', page: 1, lang: currentLocale }, params); var prefix = params.query; var url = apibase + 'keys/all?' + utilQsString(params); @@ -255,7 +256,7 @@ export default { var doRequest = params.debounce ? debouncedRequest : request; params = clean(setSort(setFilter(params))); - params = _extend({ rp: 25, sortname: 'count_all', sortorder: 'desc', page: 1 }, params); + params = _extend({ rp: 25, sortname: 'count_all', sortorder: 'desc', page: 1, lang: currentLocale }, params); var url = apibase + 'key/values?' + utilQsString(params); doRequest(url, params, false, callback, function(err, d) { @@ -282,7 +283,7 @@ export default { var doRequest = params.debounce ? debouncedRequest : request; var geometry = params.geometry; params = clean(setSortMembers(params)); - params = _extend({ rp: 25, sortname: 'count_all_members', sortorder: 'desc', page: 1 }, params); + params = _extend({ rp: 25, sortname: 'count_all_members', sortorder: 'desc', page: 1, lang: currentLocale }, params); var url = apibase + 'relation/roles?' + utilQsString(params); doRequest(url, params, true, callback, function(err, d) { @@ -300,6 +301,7 @@ export default { docs: function(params, callback) { var doRequest = params.debounce ? debouncedRequest : request; + params = _extend({ lang: currentLocale }, params); params = clean(setSort(params)); var path = 'key/wiki_pages?';