cut lines at 100, spacing changes for linter

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

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index 8de3f0f237e1880fa5bf539be9b09c434a105b2e..defaf25f5f2edc7161e6f80e2da1ab652bc39f96 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -11,10 +11,13 @@ export async function fetch_from_api(endpoint_name, params, callback) {
   var api_url = generate_nominatim_api_url(endpoint_name, params);
 
   // For the test suite:
   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
+  // If mock_http_status URL parameter is set we call an external webservice. First
+  // https://httpbin.org/#/Status_codes but we saw timeouts. Now beeceptor.com
+  // If that turns out unreliable or expensive (only 50/day free) we might have to
+  // start running a local webserver for the test suite

   var tmp_params = new URLSearchParams(window.location.search);
   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);
+  if (tmp_params && tmp_params.get('mock_http_status')) {
+    api_url = 'https://nominatim-ui.free.beeceptor.com/status/' + parseInt(tmp_params.get('mock_http_status'), 10);

   }
 
   api_request_progress('start');
   }
 
   api_request_progress('start');


@@ -73,7 +76,7 @@ export async function fetch_content_into_element(url, dom_element) {
     await fetch(url)
       .then(response => response.text())
       .then(html => {
     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;
       });
         dom_element.innerHTML = html;
         fetch_content_cache[url] = html;
       });


@@ -82,9 +85,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) {
 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);
   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('&');
          + Object.keys(clean_up_parameters(params)).map((k) => {
            return encodeURIComponent(k) + '=' + encodeURIComponent(params[k]);
          }).join('&');