Merge pull request #27 from mtmail/always-display-more-url

Always display more-results button below search results

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index 1069b3e33d974962086ca453bb8a62cbc122b5d1..e36e866610a056b0bf8c07fe52e4371c1422e61a 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
 // *********************************************************
 
-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);
@@ -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);
+  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);
   }
@@ -581,6 +586,11 @@ 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,
@@ -645,6 +655,11 @@ 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'),
@@ -758,7 +773,7 @@ jQuery(document).ready(function () {
 
   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';
 

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
 // *********************************************************
 
-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);
@@ -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);
+  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);
   }

diff --git a/src/assets/js/controller.js b/src/assets/js/controller.js
index 6795cc6f61b17625e066a7f3700219482718f2a2..364e8f2611e01e5359e596df2bfca88c1e91a7a9 100644 (file)
--- a/src/assets/js/controller.js
+++ b/src/assets/js/controller.js
@@ -3,7 +3,7 @@ jQuery(document).ready(function () {
 
   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';
 

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