From: marc tobias <mtmail@gmx.net>
Date: Tue, 7 Jul 2020 12:12:56 +0000 (+0200)
Subject: remove empty URL parameter when generating target_url
X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/commitdiff_plain/ee9ae6193aefe2a28522a71406cbb92614844f1e?ds=inline;hp=-c

remove empty URL parameter when generating target_url
---

ee9ae6193aefe2a28522a71406cbb92614844f1e
diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index 1b148a8..87776c4 100644
--- a/dist/assets/js/nominatim-ui.js
+++ b/dist/assets/js/nominatim-ui.js
@@ -774,19 +774,37 @@ jQuery(document).ready(function () {
     if (!url) return false;
     if (url.indexOf('?') === 0) return true;
     if (url.indexOf('/') === 0) return true;
+    if (url.indexOf('#') === 0) return false;
     if (url.match(/^http/)) return false;
     if (!url.match(/\.html/)) return true;
 
     return false;
   }
 
+  // remove any URL paramters with empty values
+  // '&empty=&filled=value' => 'filled=value'
+  function clean_up_url_parameters(url) {
+    var url_params = new URLSearchParams(url);
+    var to_delete = []; // deleting inside loop would skip iterations
+    url_params.forEach(function (value, key) {
+      if (value === '') to_delete.push(key);
+    });
+    for (var i=0; i<to_delete.length; i++) {
+      url_params.delete(to_delete[i]);
+    }
+    return url_params.toString();
+  }
+
   parse_url_and_load_page();
 
   // load page after form submit
   $(document).on('submit', 'form', function (e) {
     e.preventDefault();
 
-    window.history.pushState(myhistory, '', '?' + $(this).serialize());
+    var target_url = $(this).serialize();
+    target_url = clean_up_url_parameters(target_url);
+
+    window.history.pushState(myhistory, '', '?' + target_url);
 
     parse_url_and_load_page();
   });
diff --git a/src/assets/js/controller.js b/src/assets/js/controller.js
index 4070d09..e7f010c 100644
--- a/src/assets/js/controller.js
+++ b/src/assets/js/controller.js
@@ -22,19 +22,37 @@ jQuery(document).ready(function () {
     if (!url) return false;
     if (url.indexOf('?') === 0) return true;
     if (url.indexOf('/') === 0) return true;
+    if (url.indexOf('#') === 0) return false;
     if (url.match(/^http/)) return false;
     if (!url.match(/\.html/)) return true;
 
     return false;
   }
 
+  // remove any URL paramters with empty values
+  // '&empty=&filled=value' => 'filled=value'
+  function clean_up_url_parameters(url) {
+    var url_params = new URLSearchParams(url);
+    var to_delete = []; // deleting inside loop would skip iterations
+    url_params.forEach(function (value, key) {
+      if (value === '') to_delete.push(key);
+    });
+    for (var i=0; i<to_delete.length; i++) {
+      url_params.delete(to_delete[i]);
+    }
+    return url_params.toString();
+  }
+
   parse_url_and_load_page();
 
   // load page after form submit
   $(document).on('submit', 'form', function (e) {
     e.preventDefault();
 
-    window.history.pushState(myhistory, '', '?' + $(this).serialize());
+    var target_url = $(this).serialize();
+    target_url = clean_up_url_parameters(target_url);
+
+    window.history.pushState(myhistory, '', '?' + target_url);
 
     parse_url_and_load_page();
   });