From 775fdeb8e4cbafb5d21d4899192c783f150c16ed Mon Sep 17 00:00:00 2001
From: Marc Tobias Metten <mtmail@gmx.net>
Date: Tue, 13 Sep 2016 14:41:56 +0200
Subject: [PATCH] UI: viewbox parameter was set in wrong parameter order

---
 lib/template/search-html.php |  6 ++----
 website/js/nominatim-ui.js   | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 58d3dbd7..02c338cd 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -22,10 +22,8 @@
             <?php } ?>
             <input type="hidden" name="viewbox" value="<?php echo $sViewBox; ?>" />
             <div class="checkbox-inline">
-                <label>
-                    <input type="checkbox" id="use_viewbox" <?php if ($sViewBox) echo "checked='checked'"; ?>>
-                    apply viewbox
-                </label>
+                <input type="checkbox" id="use_viewbox" <?php if ($sViewBox) echo "checked='checked'"; ?>>
+                <label for="use_viewbox">apply viewbox</label>
             </div>
         </div>
         <div class="search-type-link">
diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index e32385f7..7c19b17a 100644
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -75,8 +75,14 @@ jQuery(document).on('ready', function(){
         $('input#use_viewbox').trigger('change');
     }
 
+    function update_viewbox_field(){
+        // hidden HTML field
+        $('input[name=viewbox]').val( $('input#use_viewbox').prop('checked') ? map_viewbox_as_string() : '');
+    }
+
     map.on('move', function(e) {
         display_map_position();
+        update_viewbox_field();
     });
 
     map.on('mousemove', function(e) {
@@ -94,7 +100,7 @@ jQuery(document).on('ready', function(){
 
 
     $('input#use_viewbox').on('change', function(){
-        $('input[name=viewbox]').val( $(this).prop('checked') ? map_viewbox_as_string() : '');
+        update_viewbox_field();
     });
 
 
@@ -102,10 +108,11 @@ jQuery(document).on('ready', function(){
     function map_viewbox_as_string() {
         // since .toBBoxString() doesn't round numbers
         return [
-            map.getBounds().getSouthWest().lat.toFixed(5),
-            map.getBounds().getSouthWest().lng.toFixed(5),
-            map.getBounds().getNorthEast().lat.toFixed(5),
-            map.getBounds().getNorthEast().lng.toFixed(5) ].join(',');
+            map.getBounds().getSouthWest().lng.toFixed(5), // left
+            map.getBounds().getNorthEast().lat.toFixed(5), // top
+            map.getBounds().getNorthEast().lng.toFixed(5), // right
+            map.getBounds().getSouthWest().lat.toFixed(5)  // bottom
+        ].join(',');
     }
     function map_link_to_osm(){
         return "http://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng;
-- 
2.45.1