X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/85f2de514d8d287b28b4cf833c1a97aeabd832a2..71b9066d9eed97aee7eff27a25d5c317b6f89595:/src/lib/api_utils.js

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index 0317e13..8422dc4 100644
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -7,7 +7,7 @@ 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' : 'none';
+  loading_el.style.display = (status === 'start') ? 'block' : null;
 }
 
 export async function fetch_from_api(endpoint_name, params, callback) {
@@ -25,6 +25,21 @@ export async function fetch_from_api(endpoint_name, params, callback) {
   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 (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;
+    });
+}
+
 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) => {
@@ -32,44 +47,6 @@ function generate_nominatim_api_url(endpoint_name, params) {
          }).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 || ['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]);
-  }
-  return url_params.toString();
-}
 
 function clean_up_parameters(params) {
   // `&a=&b=&c=1` => '&c=1'
@@ -84,7 +61,7 @@ function clean_up_parameters(params) {
 }
 
 export function update_html_title(title) {
-  document.title = [title, 'OpenStreetMap Nominatim']
+  document.title = [title, get_config_value('Page_Title')]
     .filter((val) => val && val.length > 1)
     .join(' | ');
 }