redirect to API URL when parameter &debug=1 in URL

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index 43f71c217da193df43c431144017d466bf5ed1af..d16de70e48b3d9edf37319a0582b5696f6d759a2 100644 (file)
--- a/dist/assets/js/nominatim-ui.js
+++ b/dist/assets/js/nominatim-ui.js
@@ -80,7 +80,7 @@ function map_viewbox_as_string() {
 // PAGE HELPERS
 // *********************************************************
 
 // PAGE HELPERS
 // *********************************************************
 

-function fetch_from_api(endpoint_name, params, callback) {
+function generate_full_api_url(endpoint_name, params) {

   //
   // `&a=&b=&c=1` => '&c=1'
   var param_names = Object.keys(params);
   //
   // `&a=&b=&c=1` => '&c=1'
   var param_names = Object.keys(params);


@@ -93,6 +93,11 @@ function fetch_from_api(endpoint_name, params, callback) {
 
   var api_url = get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?'
                   + $.param(params);
 
   var api_url = get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?'
                   + $.param(params);

+  return api_url;
+}
+
+function fetch_from_api(endpoint_name, params, callback) {
+  var api_url = generate_full_api_url(endpoint_name, params);

   if (endpoint_name !== 'status') {
     $('#api-request-link').attr('href', api_url);
   }
   if (endpoint_name !== 'status') {
     $('#api-request-link').attr('href', api_url);
   }


@@ -581,6 +586,11 @@ function search_page_load() {
       format: 'jsonv2'
     };
 
       format: 'jsonv2'
     };
 

+    if (search_params.get('debug') === '1') {
+      window.location.href = generate_full_api_url('reverse', api_request_params);
+      return;
+    }
+

     context = {
       // aPlace: aPlace,
       fLat: api_request_params.lat,
     context = {
       // aPlace: aPlace,
       fLat: api_request_params.lat,


@@ -645,6 +655,11 @@ function search_page_load() {
       format: 'jsonv2'
     };
 
       format: 'jsonv2'
     };
 

+    if (search_params.get('debug') === '1') {
+      window.location.href = generate_full_api_url('search', api_request_params);
+      return;
+    }
+

     context = {
       sQuery: api_request_params.q,
       sViewBox: search_params.get('viewbox'),
     context = {
       sQuery: api_request_params.q,
       sViewBox: search_params.get('viewbox'),


@@ -757,9 +772,9 @@ jQuery(document).ready(function () {
 
   function parse_url_and_load_page() {
     // 'search', 'reverse', 'details'
 
   function parse_url_and_load_page() {
     // 'search', 'reverse', 'details'

-    var pagename = window.location.pathname.replace('.html', '').replace(/.+\//, '');
+    var pagename = window.location.pathname.replace('.html', '').replace(/^.*\//, '');

 
 

-    if (pagename === '') pagename = 'search'
+    if (pagename === '') pagename = 'search';

 
     $('body').attr('id', pagename + '-page');
 
 
     $('body').attr('id', pagename + '-page');
 

diff --git a/src/assets/js/base.js b/src/assets/js/base.js
index 4ff6b2377dd6f5929c5347763ec82ea78ac7a875..0a5b2c8ae9277c38820c739bafb7791513287dcb 100644 (file)
--- a/src/assets/js/base.js
+++ b/src/assets/js/base.js
@@ -80,7 +80,7 @@ function map_viewbox_as_string() {
 // PAGE HELPERS
 // *********************************************************
 
 // PAGE HELPERS
 // *********************************************************
 

-function fetch_from_api(endpoint_name, params, callback) {
+function generate_full_api_url(endpoint_name, params) {

   //
   // `&a=&b=&c=1` => '&c=1'
   var param_names = Object.keys(params);
   //
   // `&a=&b=&c=1` => '&c=1'
   var param_names = Object.keys(params);


@@ -93,6 +93,11 @@ function fetch_from_api(endpoint_name, params, callback) {
 
   var api_url = get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?'
                   + $.param(params);
 
   var api_url = get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?'
                   + $.param(params);

+  return api_url;
+}
+
+function fetch_from_api(endpoint_name, params, callback) {
+  var api_url = generate_full_api_url(endpoint_name, params);

   if (endpoint_name !== 'status') {
     $('#api-request-link').attr('href', api_url);
   }
   if (endpoint_name !== 'status') {
     $('#api-request-link').attr('href', api_url);
   }

diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index 0aeab64a90c3234140c7b76777e429c1be0e61ba..914d864af95a582cf2323bed752e29c9d7f487c1 100755 (executable)
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -321,6 +321,11 @@ function search_page_load() {
       format: 'jsonv2'
     };
 
       format: 'jsonv2'
     };
 

+    if (search_params.get('debug') === '1') {
+      window.location.href = generate_full_api_url('reverse', api_request_params);
+      return;
+    }
+

     context = {
       // aPlace: aPlace,
       fLat: api_request_params.lat,
     context = {
       // aPlace: aPlace,
       fLat: api_request_params.lat,


@@ -385,6 +390,11 @@ function search_page_load() {
       format: 'jsonv2'
     };
 
       format: 'jsonv2'
     };
 

+    if (search_params.get('debug') === '1') {
+      window.location.href = generate_full_api_url('search', api_request_params);
+      return;
+    }
+

     context = {
       sQuery: api_request_params.q,
       sViewBox: search_params.get('viewbox'),
     context = {
       sQuery: api_request_params.q,
       sViewBox: search_params.get('viewbox'),