From 70425bd01a6dfbbdec384eb6b21fbad3e83ef6e4 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Tue, 1 Sep 2020 17:21:47 +0200
Subject: [PATCH] dont intercept links in last-updated page section

---
 dist/assets/js/nominatim-ui.js      |  4 +++-
 dist/assets/js/url-search-params.js |  2 +-
 dist/deletable.html                 | 14 ++++++++------
 dist/details.html                   | 14 ++++++++------
 dist/polygons.html                  | 14 ++++++++------
 dist/reverse.html                   | 14 ++++++++------
 dist/search.html                    | 14 ++++++++------
 src/assets/js/base.js               |  2 ++
 src/assets/js/controller.js         |  2 +-
 src/layout.html                     | 14 ++++++++------
 10 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index 406cf23..4dd8d01 100644
--- a/dist/assets/js/nominatim-ui.js
+++ b/dist/assets/js/nominatim-ui.js
@@ -157,6 +157,8 @@ function hide_error() {
 jQuery(document).ready(function () {
   hide_error();
 
+  $('#last-updated').hide();
+
   $(document).ajaxStart(function () {
     $('#loading').fadeIn('fast');
   }).ajaxComplete(function () {
@@ -800,7 +802,6 @@ 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;
@@ -842,6 +843,7 @@ jQuery(document).ready(function () {
   $(document).on('click', 'a', function (e) {
     var target_url = $(this).attr('href');
     if (!is_relative_url(target_url)) return;
+    if ($(this).parents('#last-updated')) return;
 
     e.preventDefault();
     e.stopPropagation();
diff --git a/dist/assets/js/url-search-params.js b/dist/assets/js/url-search-params.js
index ff9e344..ddf750e 100644
--- a/dist/assets/js/url-search-params.js
+++ b/dist/assets/js/url-search-params.js
@@ -1,2 +1,2 @@
 /*! (c) Andrea Giammarchi - ISC */
-var self=this||{};try{!function(t,e){if(new t("q=%2B").get("q")!==e||new t({q:e}).get("q")!==e||new t([["q",e]]).get("q")!==e||"q=%0A"!==new t("q=\n").toString()||"q=+%26"!==new t({q:" &"}).toString()||"q=%25zx"!==new t({q:"%zx"}).toString())throw t;self.URLSearchParams=t}(URLSearchParams,"+")}catch(t){!function(t,a,o){"use strict";var u=t.create,h=t.defineProperty,e=/[!'\(\)~]|%20|%00/g,n=/%(?![0-9a-fA-F]{2})/g,r=/\+/g,i={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+","%00":"\0"},s={append:function(t,e){p(this._ungap,t,e)},delete:function(t){delete this._ungap[t]},get:function(t){return this.has(t)?this._ungap[t][0]:null},getAll:function(t){return this.has(t)?this._ungap[t].slice(0):[]},has:function(t){return t in this._ungap},set:function(t,e){this._ungap[t]=[a(e)]},forEach:function(e,n){var r=this;for(var i in r._ungap)r._ungap[i].forEach(t,i);function t(t){e.call(n,t,a(i),r)}},toJSON:function(){return{}},toString:function(){var t=[];for(var e in this._ungap)for(var n=v(e),r=0,i=this._ungap[e];r<i.length;r++)t.push(n+"="+v(i[r]));return t.join("&")}};for(var c in s)h(f.prototype,c,{configurable:!0,writable:!0,value:s[c]});function f(t){var e=u(null);switch(h(this,"_ungap",{value:e}),!0){case!t:break;case"string"==typeof t:"?"===t.charAt(0)&&(t=t.slice(1));for(var n=t.split("&"),r=0,i=n.length;r<i;r++){var a=(s=n[r]).indexOf("=");-1<a?p(e,g(s.slice(0,a)),g(s.slice(a+1))):s.length&&p(e,g(s),"")}break;case o(t):for(r=0,i=t.length;r<i;r++){var s;p(e,(s=t[r])[0],s[1])}break;case"forEach"in t:t.forEach(l,e);break;default:for(var c in t)p(e,c,t[c])}}function l(t,e){p(this,e,t)}function p(t,e,n){var r=o(n)?n.join(","):n;e in t?t[e].push(r):t[e]=[r]}function g(t){return decodeURIComponent(t.replace(n,"%25").replace(r," "))}function v(t){return encodeURIComponent(t).replace(e,d)}function d(t){return i[t]}self.URLSearchParams=f}(Object,String,Array.isArray)}!function(d){var r=!1;try{r=!!Symbol.iterator}catch(t){}function t(t,e){var n=[];return t.forEach(e,n),r?n[Symbol.iterator]():{next:function(){var t=n.shift();return{done:void 0===t,value:t}}}}"forEach"in d||(d.forEach=function(n,r){var i=this,t=Object.create(null);this.toString().replace(/=[\s\S]*?(?:&|$)/g,"=").split("=").forEach(function(e){!e.length||e in t||(t[e]=i.getAll(e)).forEach(function(t){n.call(r,t,e,i)})})}),"keys"in d||(d.keys=function(){return t(this,function(t,e){this.push(e)})}),"values"in d||(d.values=function(){return t(this,function(t,e){this.push(t)})}),"entries"in d||(d.entries=function(){return t(this,function(t,e){this.push([e,t])})}),!r||Symbol.iterator in d||(d[Symbol.iterator]=d.entries),"sort"in d||(d.sort=function(){for(var t,e,n,r=this.entries(),i=r.next(),a=i.done,s=[],c=Object.create(null);!a;)e=(n=i.value)[0],s.push(e),e in c||(c[e]=[]),c[e].push(n[1]),a=(i=r.next()).done;for(s.sort(),t=0;t<s.length;t++)this.delete(s[t]);for(t=0;t<s.length;t++)e=s[t],this.append(e,c[e].shift())}),function(f){function l(t){var e=t.append;t.append=d.append,URLSearchParams.call(t,t._usp.search.slice(1)),t.append=e}function p(t,e){if(!(t instanceof e))throw new TypeError("'searchParams' accessed on an object that does not implement interface "+e.name)}function t(e){var n,r,i,t=e.prototype,a=v(t,"searchParams"),s=v(t,"href"),c=v(t,"search");function o(t,e){d.append.call(this,t,e),t=this.toString(),i.set.call(this._usp,t?"?"+t:"")}function u(t){d.delete.call(this,t),t=this.toString(),i.set.call(this._usp,t?"?"+t:"")}function h(t,e){d.set.call(this,t,e),t=this.toString(),i.set.call(this._usp,t?"?"+t:"")}!a&&c&&c.set&&(i=c,r=function(t,e){return t.append=o,t.delete=u,t.set=h,g(t,"_usp",{configurable:!0,writable:!0,value:e})},n=function(t,e){return g(t,"_searchParams",{configurable:!0,writable:!0,value:r(e,t)}),e},f.defineProperties(t,{href:{get:function(){return s.get.call(this)},set:function(t){var e=this._searchParams;s.set.call(this,t),e&&l(e)}},search:{get:function(){return c.get.call(this)},set:function(t){var e=this._searchParams;c.set.call(this,t),e&&l(e)}},searchParams:{get:function(){return p(this,e),this._searchParams||n(this,new URLSearchParams(this.search.slice(1)))},set:function(t){p(this,e),n(this,t)}}}))}var g=f.defineProperty,v=f.getOwnPropertyDescriptor;try{t(HTMLAnchorElement),/^function|object$/.test(typeof URL)&&URL.prototype&&t(URL)}catch(t){}}(Object)}(self.URLSearchParams.prototype,Object);
\ No newline at end of file
+var self=this||{};try{!function(t,e){if(new t("q=%2B").get("q")!==e||new t({q:e}).get("q")!==e||new t([["q",e]]).get("q")!==e||"q=%0A"!==new t("q=\n").toString()||"q=+%26"!==new t({q:" &"}).toString()||"q=%25zx"!==new t({q:"%zx"}).toString())throw t;self.URLSearchParams=t}(URLSearchParams,"+")}catch(t){!function(t,a,o){"use strict";var u=t.create,h=t.defineProperty,e=/[!'\(\)~]|%20|%00/g,n=/%(?![0-9a-fA-F]{2})/g,r=/\+/g,i={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+","%00":"\0"},s={append:function(t,e){p(this._ungap,t,e)},delete:function(t){delete this._ungap[t]},get:function(t){return this.has(t)?this._ungap[t][0]:null},getAll:function(t){return this.has(t)?this._ungap[t].slice(0):[]},has:function(t){return t in this._ungap},set:function(t,e){this._ungap[t]=[a(e)]},forEach:function(e,n){var r=this;for(var i in r._ungap)r._ungap[i].forEach(t,i);function t(t){e.call(n,t,a(i),r)}},toJSON:function(){return{}},toString:function(){var t=[];for(var e in this._ungap)for(var n=v(e),r=0,i=this._ungap[e];r<i.length;r++)t.push(n+"="+v(i[r]));return t.join("&")}};for(var c in s)h(f.prototype,c,{configurable:!0,writable:!0,value:s[c]});function f(t){var e=u(null);switch(h(this,"_ungap",{value:e}),!0){case!t:break;case"string"==typeof t:"?"===t.charAt(0)&&(t=t.slice(1));for(var n=t.split("&"),r=0,i=n.length;r<i;r++){var a=(s=n[r]).indexOf("=");-1<a?p(e,g(s.slice(0,a)),g(s.slice(a+1))):s.length&&p(e,g(s),"")}break;case o(t):for(var s,r=0,i=t.length;r<i;r++){p(e,(s=t[r])[0],s[1])}break;case"forEach"in t:t.forEach(l,e);break;default:for(var c in t)p(e,c,t[c])}}function l(t,e){p(this,e,t)}function p(t,e,n){var r=o(n)?n.join(","):n;e in t?t[e].push(r):t[e]=[r]}function g(t){return decodeURIComponent(t.replace(n,"%25").replace(r," "))}function v(t){return encodeURIComponent(t).replace(e,d)}function d(t){return i[t]}self.URLSearchParams=f}(Object,String,Array.isArray)}!function(d){var r=!1;try{r=!!Symbol.iterator}catch(t){}function t(t,e){var n=[];return t.forEach(e,n),r?n[Symbol.iterator]():{next:function(){var t=n.shift();return{done:void 0===t,value:t}}}}"forEach"in d||(d.forEach=function(n,r){var i=this,t=Object.create(null);this.toString().replace(/=[\s\S]*?(?:&|$)/g,"=").split("=").forEach(function(e){!e.length||e in t||(t[e]=i.getAll(e)).forEach(function(t){n.call(r,t,e,i)})})}),"keys"in d||(d.keys=function(){return t(this,function(t,e){this.push(e)})}),"values"in d||(d.values=function(){return t(this,function(t,e){this.push(t)})}),"entries"in d||(d.entries=function(){return t(this,function(t,e){this.push([e,t])})}),!r||Symbol.iterator in d||(d[Symbol.iterator]=d.entries),"sort"in d||(d.sort=function(){for(var t,e,n,r=this.entries(),i=r.next(),a=i.done,s=[],c=Object.create(null);!a;)e=(n=i.value)[0],s.push(e),e in c||(c[e]=[]),c[e].push(n[1]),a=(i=r.next()).done;for(s.sort(),t=0;t<s.length;t++)this.delete(s[t]);for(t=0;t<s.length;t++)e=s[t],this.append(e,c[e].shift())}),function(f){function l(t){var e=t.append;t.append=d.append,URLSearchParams.call(t,t._usp.search.slice(1)),t.append=e}function p(t,e){if(!(t instanceof e))throw new TypeError("'searchParams' accessed on an object that does not implement interface "+e.name)}function t(e){var n,r,i,t=e.prototype,a=v(t,"searchParams"),s=v(t,"href"),c=v(t,"search");function o(t,e){d.append.call(this,t,e),t=this.toString(),i.set.call(this._usp,t?"?"+t:"")}function u(t){d.delete.call(this,t),t=this.toString(),i.set.call(this._usp,t?"?"+t:"")}function h(t,e){d.set.call(this,t,e),t=this.toString(),i.set.call(this._usp,t?"?"+t:"")}!a&&c&&c.set&&(i=c,r=function(t,e){return t.append=o,t.delete=u,t.set=h,g(t,"_usp",{configurable:!0,writable:!0,value:e})},n=function(t,e){return g(t,"_searchParams",{configurable:!0,writable:!0,value:r(e,t)}),e},f.defineProperties(t,{href:{get:function(){return s.get.call(this)},set:function(t){var e=this._searchParams;s.set.call(this,t),e&&l(e)}},search:{get:function(){return c.get.call(this)},set:function(t){var e=this._searchParams;c.set.call(this,t),e&&l(e)}},searchParams:{get:function(){return p(this,e),this._searchParams||n(this,new URLSearchParams(this.search.slice(1)))},set:function(t){p(this,e),n(this,t)}}}))}var g=f.defineProperty,v=f.getOwnPropertyDescriptor;try{t(HTMLAnchorElement),/^function|object$/.test(typeof URL)&&URL.prototype&&t(URL)}catch(t){}}(Object)}(self.URLSearchParams.prototype,Object);
\ No newline at end of file
diff --git a/dist/deletable.html b/dist/deletable.html
index ac074d3..f82ae80 100644
--- a/dist/deletable.html
+++ b/dist/deletable.html
@@ -29,13 +29,15 @@
           </a>
         </div>
       </div>
-      <div id="last-updated" class="col-4 text-center">
-        <div id="loading">loading...</div>
-        <div id="api-request">
-          Data from <a href="">API request</a>
-          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+      <div class="col-4">
+        <div id="last-updated" class="text-center">
+          <div id="loading">loading...</div>
+          <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>
-        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 ac074d3..f82ae80 100644
--- a/dist/details.html
+++ b/dist/details.html
@@ -29,13 +29,15 @@
           </a>
         </div>
       </div>
-      <div id="last-updated" class="col-4 text-center">
-        <div id="loading">loading...</div>
-        <div id="api-request">
-          Data from <a href="">API request</a>
-          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+      <div class="col-4">
+        <div id="last-updated" class="text-center">
+          <div id="loading">loading...</div>
+          <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>
-        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 ac074d3..f82ae80 100644
--- a/dist/polygons.html
+++ b/dist/polygons.html
@@ -29,13 +29,15 @@
           </a>
         </div>
       </div>
-      <div id="last-updated" class="col-4 text-center">
-        <div id="loading">loading...</div>
-        <div id="api-request">
-          Data from <a href="">API request</a>
-          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+      <div class="col-4">
+        <div id="last-updated" class="text-center">
+          <div id="loading">loading...</div>
+          <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>
-        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 ac074d3..f82ae80 100644
--- a/dist/reverse.html
+++ b/dist/reverse.html
@@ -29,13 +29,15 @@
           </a>
         </div>
       </div>
-      <div id="last-updated" class="col-4 text-center">
-        <div id="loading">loading...</div>
-        <div id="api-request">
-          Data from <a href="">API request</a>
-          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+      <div class="col-4">
+        <div id="last-updated" class="text-center">
+          <div id="loading">loading...</div>
+          <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>
-        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 ac074d3..f82ae80 100644
--- a/dist/search.html
+++ b/dist/search.html
@@ -29,13 +29,15 @@
           </a>
         </div>
       </div>
-      <div id="last-updated" class="col-4 text-center">
-        <div id="loading">loading...</div>
-        <div id="api-request">
-          Data from <a href="">API request</a>
-          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+      <div class="col-4">
+        <div id="last-updated" class="text-center">
+          <div id="loading">loading...</div>
+          <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>
-        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">
diff --git a/src/assets/js/base.js b/src/assets/js/base.js
index 0be31f4..39d1f13 100644
--- a/src/assets/js/base.js
+++ b/src/assets/js/base.js
@@ -157,6 +157,8 @@ function hide_error() {
 jQuery(document).ready(function () {
   hide_error();
 
+  $('#last-updated').hide();
+
   $(document).ajaxStart(function () {
     $('#loading').fadeIn('fast');
   }).ajaxComplete(function () {
diff --git a/src/assets/js/controller.js b/src/assets/js/controller.js
index 56c7d00..9975ba7 100644
--- a/src/assets/js/controller.js
+++ b/src/assets/js/controller.js
@@ -22,7 +22,6 @@ 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;
@@ -64,6 +63,7 @@ jQuery(document).ready(function () {
   $(document).on('click', 'a', function (e) {
     var target_url = $(this).attr('href');
     if (!is_relative_url(target_url)) return;
+    if ($(this).parents('#last-updated')) return;
 
     e.preventDefault();
     e.stopPropagation();
diff --git a/src/layout.html b/src/layout.html
index 640794c..a1ef890 100644
--- a/src/layout.html
+++ b/src/layout.html
@@ -29,13 +29,15 @@
           </a>
         </div>
       </div>
-      <div id="last-updated" class="col-4 text-center">
-        <div id="loading">loading...</div>
-        <div id="api-request">
-          Data from <a href="">API request</a>
-          <span id="api-request-debug">(<a href="">debug output</a>)</span>
+      <div class="col-4">
+        <div id="last-updated" class="text-center">
+          <div id="loading">loading...</div>
+          <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>
-        Data last updated: <span id="data-date"></span>
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">
-- 
2.39.5