node package updates: eslint 7->8, puppeteer 9->10, mocha 8->0 (#165)

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

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index 8422dc491237696e55b65f0a0956c255141c10c4..eb2a549c8eb938a0acd81a0d6a9758145ffbc95f 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -1,7 +1,4 @@
-
-import { get_config_value } from './config_reader.js';
-import { last_api_request_url_store } from './stores.js';
-
+import { last_api_request_url_store, error_store } from './stores.js';

 
 function api_request_progress(status) {
   var loading_el = document.getElementById('loading');
 
 function api_request_progress(status) {
   var loading_el = document.getElementById('loading');


@@ -14,39 +11,65 @@ export async function fetch_from_api(endpoint_name, params, callback) {
   var api_url = generate_nominatim_api_url(endpoint_name, params);
 
   api_request_progress('start');
   var api_url = generate_nominatim_api_url(endpoint_name, params);
 
   api_request_progress('start');

+  if (endpoint_name !== 'status') last_api_request_url_store.set(null);

 
 

-  await fetch(api_url)
-    .then(response => response.json())
-    .then(data => {
-      callback(data);
-      api_request_progress('finish');
-    });
+  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);
+        }
+        callback(data);
+        api_request_progress('finish');
+      });
+  } catch (error) {
+    error_store.set(`Error fetching data from ${api_url} (${error})`);
+    api_request_progress('finish');
+  }

 
   if (endpoint_name !== 'status') last_api_request_url_store.set(api_url);
 }
 
 var fetch_content_cache = {};
 export async function fetch_content_into_element(url, dom_element) {
 
   if (endpoint_name !== 'status') last_api_request_url_store.set(api_url);
 }
 
 var fetch_content_cache = {};
 export async function fetch_content_into_element(url, dom_element) {

+  if (!window.location.protocol.match(/^http/)) {
+    dom_element.innerHTML = `Cannot display data from ${url} here. `
+      + 'Browser security prevents loading content from file:// URLs.';
+    return;
+  }
+

   if (fetch_content_cache[url]) {
     dom_element.innerHTML = fetch_content_cache[url];
     return;
   }
   if (fetch_content_cache[url]) {
     dom_element.innerHTML = fetch_content_cache[url];
     return;
   }

-  await fetch(url)
-    .then(response => response.text())
-    .then(html => {
-      html = html.replace('Nominatim_API_Endpoint', get_config_value('Nominatim_API_Endpoint'));
-      dom_element.innerHTML = html;
-      fetch_content_cache[url] = html;
-    });
+  try {
+    await fetch(url)
+      .then(response => response.text())
+      .then(html => {
+        html = html.replace('Nominatim_API_Endpoint', Nominatim_Config.Nominatim_API_Endpoint);
+        dom_element.innerHTML = html;
+        fetch_content_cache[url] = html;
+      });
+  } catch (error) {
+    dom_element.innerHTML = `Error fetching content from ${url} (${error})`;
+  }

 }
 
 function generate_nominatim_api_url(endpoint_name, params) {
 }
 
 function generate_nominatim_api_url(endpoint_name, params) {

-  return get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?'
+  extend_parameters(params, Nominatim_Config.Nominatim_API_Endpoint_Params);
+  return Nominatim_Config.Nominatim_API_Endpoint + endpoint_name + '.php?'

          + 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('&');
 }
 

+function extend_parameters(params, params2) {
+  var param_names = Object.keys(params2);
+  for (var i = 0; i < param_names.length; i += 1) {
+    params[param_names[i]] = params2[param_names[i]];
+  }
+}

 
 function clean_up_parameters(params) {
   // `&a=&b=&c=1` => '&c=1'
 
 function clean_up_parameters(params) {
   // `&a=&b=&c=1` => '&c=1'


@@ -61,7 +84,7 @@ function clean_up_parameters(params) {
 }
 
 export function update_html_title(title) {
 }
 
 export function update_html_title(title) {

-  document.title = [title, get_config_value('Page_Title')]
+  document.title = [title, Nominatim_Config.Page_Title]

     .filter((val) => val && val.length > 1)
     .join(' | ');
 }
     .filter((val) => val && val.length > 1)
     .join(' | ');
 }