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 93363e4f5ff3c45cfb465030947b888e0bd50f39..9dff8771818f23955d240a952cd0326c5f7b4f02 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -1,8 +1,5 @@
-
-import { get_config_value } from './config_reader.js';

 import { last_api_request_url_store, error_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');
   if (!loading_el) return; // might not be on page yet
 function api_request_progress(status) {
   var loading_el = document.getElementById('loading');
   if (!loading_el) return; // might not be on page yet


@@ -36,21 +33,31 @@ export async function fetch_from_api(endpoint_name, params, callback) {
 
 var fetch_content_cache = {};
 export async function fetch_content_into_element(url, dom_element) {
 
 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?'
+  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('&');


@@ -70,7 +77,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(' | ');
 }