Add a &debug=1 API link in the header instead of redirecting

diff --git a/dist/assets/css/common.css b/dist/assets/css/common.css
index ab814d77ed45f6b908718319bc327b807bebf63f..1141b33568a8071d75691d131fc1fc2f4194e82a 100755 (executable)
--- a/dist/assets/css/common.css
+++ b/dist/assets/css/common.css
@@ -32,6 +32,7 @@ header #last-updated {
   font-size: 0.7em;
   white-space: nowrap;
   text-align: center;
+  display: none;
 }
 
 header .dropdown-menu {

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index e36e866610a056b0bf8c07fe52e4371c1422e61a..406cf23ebfe65d852727a178aeb879fbf5886364 100644 (file)
--- a/dist/assets/js/nominatim-ui.js
+++ b/dist/assets/js/nominatim-ui.js
@@ -96,18 +96,36 @@ function generate_full_api_url(endpoint_name, params) {
   return api_url;
 }
 
-function fetch_from_api(endpoint_name, params, callback) {
+function update_last_updated(endpoint_name, params) {
+  if (endpoint_name === 'status') return;
+
   var api_url = generate_full_api_url(endpoint_name, params);
-  if (endpoint_name !== 'status') {
-    $('#api-request-link').attr('href', api_url);
+  $('#last-updated').show();
+
+  $('#api-request a').attr('href', api_url);
+  $('#api-request').show();
+
+  if (endpoint_name === 'search' || endpoint_name === 'reverse') {
+    $('#api-request-debug a').attr('href', api_url + '&debug=1');
+    $('#api-request-debug').show();
+  } else {
+    $('#api-request-debug').hide();
   }
+}
+
+function fetch_from_api(endpoint_name, params, callback) {
+  var api_url = generate_full_api_url(endpoint_name, params);
   $.get(api_url, function (data) {
+    if (endpoint_name !== 'status') {
+      update_last_updated(endpoint_name, params);
+    }
     callback(data);
   });
 }
 
 function update_data_date() {
   fetch_from_api('status', { format: 'json' }, function (data) {
+    $('#last-updated').show();
     $('#data-date').text(data.data_updated);
   });
 }
@@ -586,11 +604,6 @@ function search_page_load() {
       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,
@@ -655,11 +668,6 @@ function search_page_load() {
       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'),
@@ -792,6 +800,7 @@ jQuery(document).ready(function () {
 
   function is_relative_url(url) {
     if (!url) return false;
+    if (url.match(/debug=1/)) return false;
     if (url.indexOf('?') === 0) return true;
     if (url.indexOf('/') === 0) return true;
     if (url.indexOf('#') === 0) return false;

diff --git a/dist/deletable.html b/dist/deletable.html
index e323dcc10ec647e794612b338610034d006090d3..ac074d30e5555026124c43de23ecc32612d98ea6 100644 (file)
--- a/dist/deletable.html
+++ b/dist/deletable.html
@@ -31,10 +31,11 @@
       </div>
       <div id="last-updated" class="col-4 text-center">
         <div id="loading">loading...</div>
-        Data from <a id="api-request-link" href="">API request</a>
-        <br>
-        Data last updated:
-        <span id="data-date"></span>
+        <div id="api-request">
+          Data from <a href="">API request</a>
+          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+        </div>
+        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">

diff --git a/dist/details.html b/dist/details.html
index e323dcc10ec647e794612b338610034d006090d3..ac074d30e5555026124c43de23ecc32612d98ea6 100644 (file)
--- a/dist/details.html
+++ b/dist/details.html
@@ -31,10 +31,11 @@
       </div>
       <div id="last-updated" class="col-4 text-center">
         <div id="loading">loading...</div>
-        Data from <a id="api-request-link" href="">API request</a>
-        <br>
-        Data last updated:
-        <span id="data-date"></span>
+        <div id="api-request">
+          Data from <a href="">API request</a>
+          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+        </div>
+        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">

diff --git a/dist/polygons.html b/dist/polygons.html
index e323dcc10ec647e794612b338610034d006090d3..ac074d30e5555026124c43de23ecc32612d98ea6 100644 (file)
--- a/dist/polygons.html
+++ b/dist/polygons.html
@@ -31,10 +31,11 @@
       </div>
       <div id="last-updated" class="col-4 text-center">
         <div id="loading">loading...</div>
-        Data from <a id="api-request-link" href="">API request</a>
-        <br>
-        Data last updated:
-        <span id="data-date"></span>
+        <div id="api-request">
+          Data from <a href="">API request</a>
+          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+        </div>
+        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">

diff --git a/dist/reverse.html b/dist/reverse.html
index e323dcc10ec647e794612b338610034d006090d3..ac074d30e5555026124c43de23ecc32612d98ea6 100644 (file)
--- a/dist/reverse.html
+++ b/dist/reverse.html
@@ -31,10 +31,11 @@
       </div>
       <div id="last-updated" class="col-4 text-center">
         <div id="loading">loading...</div>
-        Data from <a id="api-request-link" href="">API request</a>
-        <br>
-        Data last updated:
-        <span id="data-date"></span>
+        <div id="api-request">
+          Data from <a href="">API request</a>
+          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+        </div>
+        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">

diff --git a/dist/search.html b/dist/search.html
index e323dcc10ec647e794612b338610034d006090d3..ac074d30e5555026124c43de23ecc32612d98ea6 100644 (file)
--- a/dist/search.html
+++ b/dist/search.html
@@ -31,10 +31,11 @@
       </div>
       <div id="last-updated" class="col-4 text-center">
         <div id="loading">loading...</div>
-        Data from <a id="api-request-link" href="">API request</a>
-        <br>
-        Data last updated:
-        <span id="data-date"></span>
+        <div id="api-request">
+          Data from <a href="">API request</a>
+          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+        </div>
+        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index ab814d77ed45f6b908718319bc327b807bebf63f..1141b33568a8071d75691d131fc1fc2f4194e82a 100755 (executable)
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -32,6 +32,7 @@ header #last-updated {
   font-size: 0.7em;
   white-space: nowrap;
   text-align: center;
+  display: none;
 }
 
 header .dropdown-menu {

diff --git a/src/assets/js/base.js b/src/assets/js/base.js
index 0a5b2c8ae9277c38820c739bafb7791513287dcb..0be31f4a1e9d65cd486846d6b10610946615e051 100644 (file)
--- a/src/assets/js/base.js
+++ b/src/assets/js/base.js
@@ -96,18 +96,36 @@ function generate_full_api_url(endpoint_name, params) {
   return api_url;
 }
 
-function fetch_from_api(endpoint_name, params, callback) {
+function update_last_updated(endpoint_name, params) {
+  if (endpoint_name === 'status') return;
+
   var api_url = generate_full_api_url(endpoint_name, params);
-  if (endpoint_name !== 'status') {
-    $('#api-request-link').attr('href', api_url);
+  $('#last-updated').show();
+
+  $('#api-request a').attr('href', api_url);
+  $('#api-request').show();
+
+  if (endpoint_name === 'search' || endpoint_name === 'reverse') {
+    $('#api-request-debug a').attr('href', api_url + '&debug=1');
+    $('#api-request-debug').show();
+  } else {
+    $('#api-request-debug').hide();
   }
+}
+
+function fetch_from_api(endpoint_name, params, callback) {
+  var api_url = generate_full_api_url(endpoint_name, params);
   $.get(api_url, function (data) {
+    if (endpoint_name !== 'status') {
+      update_last_updated(endpoint_name, params);
+    }
     callback(data);
   });
 }
 
 function update_data_date() {
   fetch_from_api('status', { format: 'json' }, function (data) {
+    $('#last-updated').show();
     $('#data-date').text(data.data_updated);
   });
 }

diff --git a/src/assets/js/controller.js b/src/assets/js/controller.js
index 364e8f2611e01e5359e596df2bfca88c1e91a7a9..56c7d009944c63ec677e3a7fb76985788eba9183 100644 (file)
--- a/src/assets/js/controller.js
+++ b/src/assets/js/controller.js
@@ -22,6 +22,7 @@ jQuery(document).ready(function () {
 
   function is_relative_url(url) {
     if (!url) return false;
+    if (url.match(/debug=1/)) return false;
     if (url.indexOf('?') === 0) return true;
     if (url.indexOf('/') === 0) return true;
     if (url.indexOf('#') === 0) return false;

diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index ee76ba83fcd98a3a184984e0bcf329a2eaad251a..95d842d5d176f3fd3a29c84e7a25559ca38b39b2 100755 (executable)
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -321,11 +321,6 @@ function search_page_load() {
       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,
@@ -390,11 +385,6 @@ function search_page_load() {
       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'),

diff --git a/src/layout.html b/src/layout.html
index 81c613a35de6b9bda48d65b0006720d9e4dce522..640794c8d00feb3264397c6afe4f7ccb57927f6d 100644 (file)
--- a/src/layout.html
+++ b/src/layout.html
@@ -31,10 +31,11 @@
       </div>
       <div id="last-updated" class="col-4 text-center">
         <div id="loading">loading...</div>
-        Data from <a id="api-request-link" href="">API request</a>
-        <br>
-        Data last updated:
-        <span id="data-date"></span>
+        <div id="api-request">
+          Data from <a href="">API request</a>
+          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+        </div>
+        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">