Merge remote-tracking branch 'upstream/master'

[nominatim-ui.git] / src / lib / api_utils.js

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index eb2a549c8eb938a0acd81a0d6a9758145ffbc95f..7510c126c3125d6d43d930789797c94aa310f9d2 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -10,17 +10,43 @@ function api_request_progress(status) {
 export async function fetch_from_api(endpoint_name, params, callback) {
   var api_url = generate_nominatim_api_url(endpoint_name, params);
 
+  // For the test suite:
+  // If httpbin_status URL parameter is set we call https://httpbin.org/#/Status_codes
+  var tmp_params = new URLSearchParams(window.location.search);
+  if (tmp_params && tmp_params.get('httpbin_status')) {
+    api_url = 'https://httpbin.org/status/' + parseInt(tmp_params.get('httpbin_status'), 10);
+  }
+
   api_request_progress('start');
   if (endpoint_name !== 'status') last_api_request_url_store.set(null);
 
   try {
     await fetch(api_url, { headers: Nominatim_Config.Nominatim_API_Endpoint_Headers || {} })
-      .then(response => response.json())
-      .then(data => {
-        if (data.error) {
-          error_store.set(data.error.message);
+      .then(async (response) => {
+        if (!((response.status >= 200 && response.status < 300) || response.status === 404)) {
+          error_store.set(`Error fetching data from ${api_url} (${response.statusText})`);
+          return undefined;
+        }
+
+        // Parse JSON here instead of returning a promise so we can catch possible
+        // errors.
+        var data;
+        try {
+          data = await response.json();
+        } catch (err) {
+          // e.g. 'JSON.parse: unexpected non-whitespace character after JSON data at line 1'
+          error_store.set(`Error parsing JSON data from ${api_url} (${err})`);
+          return undefined;
+        }
+        return data;
+      })
+      .then((data) => {
+        if (data) {
+          if (data.error) {
+            error_store.set(data.error.message);
+          }
+          callback(data);
         }
-        callback(data);
         api_request_progress('finish');
       });
   } catch (error) {
@@ -47,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;
       });
@@ -56,9 +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('&');