Extended Nominatim API endpoint config (#142)

Co-authored-by: Peter C (petoc on github)

diff --git a/dist/config.defaults.js b/dist/config.defaults.js
index 9ab6f3a0427866a353bd7d135ca2df335b83a696..ccbddfc362b3c6d19263098579c8b8046aaee769 100644 (file)
--- a/dist/config.defaults.js
+++ b/dist/config.defaults.js
@@ -6,6 +6,12 @@ let Nominatim_Config = {
   // Where Nominatim API runs. Remember to add port if needed and trailing slash.
   Nominatim_API_Endpoint: 'http://localhost/nominatim/',
 
   // Where Nominatim API runs. Remember to add port if needed and trailing slash.
   Nominatim_API_Endpoint: 'http://localhost/nominatim/',
 

+  // Additional request headers for Nominatim API.
+  Nominatim_API_Endpoint_Headers: {},
+
+  // Additional query parameters for Nominatim API.
+  Nominatim_API_Endpoint_Params: {},
+

   // relative path or full URL
   Images_Base_Url: 'mapicons/',
 
   // relative path or full URL
   Images_Base_Url: 'mapicons/',
 

diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index 9dff8771818f23955d240a952cd0326c5f7b4f02..eb2a549c8eb938a0acd81a0d6a9758145ffbc95f 100644 (file)
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -14,7 +14,7 @@ export async function fetch_from_api(endpoint_name, params, callback) {
   if (endpoint_name !== 'status') last_api_request_url_store.set(null);
 
   try {
   if (endpoint_name !== 'status') last_api_request_url_store.set(null);
 
   try {

-    await fetch(api_url)
+    await fetch(api_url, { headers: Nominatim_Config.Nominatim_API_Endpoint_Headers || {} })

       .then(response => response.json())
       .then(data => {
         if (data.error) {
       .then(response => response.json())
       .then(data => {
         if (data.error) {


@@ -57,12 +57,19 @@ export async function fetch_content_into_element(url, dom_element) {
 }
 
 function generate_nominatim_api_url(endpoint_name, params) {
 }
 
 function generate_nominatim_api_url(endpoint_name, params) {

+  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('&');
 }
 
   return Nominatim_Config.Nominatim_API_Endpoint + endpoint_name + '.php?'
          + 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'