X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/64e1ec4d0f152bc9a279c2f016a111f9943dc6a4..29a80b4cbb82632e71b020b0e9a4b59a42e1dadf:/src/lib/api_utils.js diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js index e6f8158..7510c12 100644 --- a/src/lib/api_utils.js +++ b/src/lib/api_utils.js @@ -73,7 +73,7 @@ export async function fetch_content_into_element(url, dom_element) { await fetch(url) .then(response => response.text()) .then(html => { - html = html.replace('Nominatim_API_Endpoint', Nominatim_Config.Nominatim_API_Endpoint); + html = html.replace('Nominatim_API_Endpoint', generate_nominatim_endpoint_url()); dom_element.innerHTML = html; fetch_content_cache[url] = html; }); @@ -82,12 +82,25 @@ export async function fetch_content_into_element(url, dom_element) { } } +function generate_nominatim_endpoint_url(endpoint_name) { + var conf_endpoint = Nominatim_Config.Nominatim_API_Endpoint; + + if (typeof conf_endpoint === 'function') { + return conf_endpoint(endpoint_name); + } + + if (!endpoint_name) return conf_endpoint; + + return conf_endpoint + endpoint_name + '.php'; +} + function generate_nominatim_api_url(endpoint_name, params) { // default value for /search if (params.dedupe === 1) delete params.dedupe; extend_parameters(params, Nominatim_Config.Nominatim_API_Endpoint_Params); - return Nominatim_Config.Nominatim_API_Endpoint + endpoint_name + '.php?' + return generate_nominatim_endpoint_url(endpoint_name) + + '?' + Object.keys(clean_up_parameters(params)).map((k) => { return encodeURIComponent(k) + '=' + encodeURIComponent(params[k]); }).join('&');