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 9939b614949443114c6f42183336ffd060cd16b9..eb2a549c8eb938a0acd81a0d6a9758145ffbc95f 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -1,77 +1,74 @@
+import { last_api_request_url_store, error_store } from './stores.js';

 
 

-import { get_config_value } from './config_reader.js';
-import { last_updated_store } from './stores.js';
-
+function api_request_progress(status) {
+  var loading_el = document.getElementById('loading');
+  if (!loading_el) return; // might not be on page yet

 
 

+  loading_el.style.display = (status === 'start') ? 'block' : null;
+}

 
 export async function fetch_from_api(endpoint_name, params, callback) {
   var api_url = generate_nominatim_api_url(endpoint_name, params);
 
 
 export async function fetch_from_api(endpoint_name, params, callback) {
   var api_url = generate_nominatim_api_url(endpoint_name, params);
 

-  document.getElementById('loading').style.display = 'block';
-  await fetch(api_url)
-    .then(response => response.json())
-    .then(data => {
-      callback(data);
-      document.getElementById('loading').style.display = 'none';
-    });
+  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);
+        }
+        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 (!window.location.protocol.match(/^http/)) {
+    dom_element.innerHTML = `Cannot display data from ${url} here. `
+      + 'Browser security prevents loading content from file:// URLs.';
+    return;
+  }

 
 

-  fetch(generate_nominatim_api_url('status', {format: 'json'}))
-    .then(response => response.json())
-    .then(data => {
-      let last_updated = {
-        api_request_url: api_url,
-        api_request_url_debug: api_url + '&debug=1',
-        date: data.data_updated
-      };
-      last_updated_store.set(last_updated)
-    });
+  if (fetch_content_cache[url]) {
+    dom_element.innerHTML = fetch_content_cache[url];
+    return;
+  }
+  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?'
-         + Object.keys(clean_up_parameters(params)).map( (k) => {
-           return encodeURIComponent(k) + '=' + encodeURIComponent(params[k])
+  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('&');
 }
 
          }).join('&');
 }
 

-/*!
- * Serialize all form data into a SearchParams string
- * (c) 2020 Chris Ferdinandi, MIT License, https://gomakethings.com
- * @param  {Node}   form The form to serialize
- * @return {String}      The serialized form data
- */
-export function serialize_form(form) {
-  var arr = [];
-  Array.prototype.slice.call(form.elements).forEach(function (field) {
-    if (!field.name || field.disabled || ['file', 'reset', 'submit', 'button'].indexOf(field.type) > -1) return;
-    // if (field.type === 'select-multiple') {
-    //   Array.prototype.slice.call(field.options).forEach(function (option) {
-    //     if (!option.selected) return;
-    //     arr.push(encodeURIComponent(field.name) + '=' + encodeURIComponent(option.value));
-    //   });
-    //   return;
-    // }
-    if (['checkbox', 'radio'].indexOf(field.type) >-1 && !field.checked) return;
-    if (typeof(field.value) === 'undefined') return;
-    arr.push(encodeURIComponent(field.name) + '=' + encodeURIComponent(field.value));
-  });
-  return arr.join('&');
-};
-
-
-// remove any URL paramters with empty values
-// '&empty=&filled=value' => 'filled=value'
-export function clean_up_url_parameters(url) {
-  var url_params = new URLSearchParams(url);
-  var to_delete = []; // deleting inside loop would skip iterations
-  url_params.forEach(function (value, key) {
-    if (value === '') to_delete.push(key);
-  });
-  for (var i = 0; i < to_delete.length; i += 1) {
-    url_params.delete(to_delete[i]);
+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]];

   }
   }

-  return url_params.toString();

 }
 
 function clean_up_parameters(params) {
 }
 
 function clean_up_parameters(params) {


@@ -87,8 +84,8 @@ function clean_up_parameters(params) {
 }
 
 export function update_html_title(title) {
 }
 
 export function update_html_title(title) {

-  document.title = [title, 'OpenStreetMap Nominatim']
-                     .filter( (val) => val && val.length > 1 )
-                     .join(' | ');
+  document.title = [title, Nominatim_Config.Page_Title]
+    .filter((val) => val && val.length > 1)
+    .join(' | ');

 }
 
 }