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 ccd403fa7160b35cde5f8cb10aa5ac55cf1c7d1b..e96ebd25c836c3469a2c5cfe36860b390943c8bb 100644 (file)
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -93,9 +93,9 @@ jQuery(document).ready(function(){
         $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('<br/>'));
 
         var reverse_params = {
         $('#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: 2,
+            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));
             format: 'html'
         }
         $('#switch-to-reverse').attr('href', 'reverse.php?' + $.param(reverse_params));


@@ -143,7 +143,7 @@ jQuery(document).ready(function(){
         ].join(',');
     }
     function map_link_to_osm(){
         ].join(',');
     }
     function map_link_to_osm(){

-        return "http://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng;
+        return "https://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng;

     }
 
     function get_result_element(position){
     }
 
     function get_result_element(position){


@@ -249,6 +249,14 @@ jQuery(document).ready(function(){
             $('form input[name=lon]').val(lat);
             $('form').submit();
         });
             $('form input[name=lon]').val(lat);
             $('form').submit();
         });

+    } else {
+        var search_params = new URLSearchParams(location.search);
+        var viewbox = search_params.get('viewbox');
+        if (viewbox) {
+            var coords = viewbox.split(','); // <x1>,<y1>,<x2>,<y2>
+            var bounds = L.latLngBounds([coords[1], coords[0]], [coords[3], coords[2]]);
+            L.rectangle(bounds, {color: "#69d53e", weight: 3, dashArray: '5 5', opacity: 0.8, fill: false}).addTo(map);
+        }

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