Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / js / nominatim-ui.js

diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index e32385f7fb73e0863eab52ea00c8d4652c40e2cd..c5e91cf79d45574280899cd1d51be5425567b003 100644 (file)
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -72,11 +72,26 @@ jQuery(document).on('ready', function(){
         html_viewbox = "viewbox: " + map_viewbox_as_string();
 
         $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('<br/>'));
         html_viewbox = "viewbox: " + map_viewbox_as_string();
 
         $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('<br/>'));

+
+        var reverse_params = {
+            lat: map.getCenter().lat.toFixed(5),
+            lon: map.getCenter().lng.toFixed(5),
+            zoom: map.getZoom(),
+            format: 'html'
+        }
+        $('#switch-to-reverse').attr('href', 'reverse.php?' + $.param(reverse_params));
+

         $('input#use_viewbox').trigger('change');
     }
 
         $('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();
     map.on('move', function(e) {
         display_map_position();

+        update_viewbox_field();

     });
 
     map.on('mousemove', function(e) {
     });
 
     map.on('mousemove', function(e) {


@@ -94,7 +109,7 @@ jQuery(document).on('ready', function(){
 
 
     $('input#use_viewbox').on('change', function(){
 
 
     $('input#use_viewbox').on('change', function(){

-        $('input[name=viewbox]').val( $(this).prop('checked') ? map_viewbox_as_string() : '');
+        update_viewbox_field();

     });
 
 
     });
 
 


@@ -102,10 +117,11 @@ jQuery(document).on('ready', function(){
     function map_viewbox_as_string() {
         // since .toBBoxString() doesn't round numbers
         return [
     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;
     }
     function map_link_to_osm(){
         return "http://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng;


@@ -195,6 +211,14 @@ jQuery(document).on('ready', function(){
             $('form input[name=lon]').val( e.latlng.lng);
             $('form').submit();
         });
             $('form input[name=lon]').val( e.latlng.lng);
             $('form').submit();
         });

+
+        $('#switch-coords').on('click', function(e){
+            var lat = $('form input[name=lat]').val();
+            var lon = $('form input[name=lon]').val();
+            $('form input[name=lat]').val(lon);
+            $('form input[name=lon]').val(lat);
+            $('form').submit();
+        });

     }
 
     highlight_result(0, false);
     }
 
     highlight_result(0, false);