From: marc tobias <mtmail@gmx.net>
Date: Sat, 30 Nov 2019 12:25:42 +0000 (+0100)
Subject: Allow map to wrap-around, still longitude should be -180..+180
X-Git-Url: https://git.openstreetmap.org/nominatim-ui.git/commitdiff_plain/7ec9e882af170fec837f606720e4a5fdfd64be94

Allow map to wrap-around, still longitude should be -180..+180
---

diff --git a/src/assets/js/base.js b/src/assets/js/base.js
index 48f8feb..5754e3d 100644
--- a/src/assets/js/base.js
+++ b/src/assets/js/base.js
@@ -31,12 +31,22 @@ function map_link_to_osm(){
 }
 
 function map_viewbox_as_string() {
-    // since .toBBoxString() doesn't round numbers
+    var bounds = map.getBounds();
+    var west = bounds.getWest();
+    var east = bounds.getEast();
+
+    if ((east - west) >= 360) { // covers more than whole planet
+        west = map.getCenter().lng-179.999;
+        east = map.getCenter().lng+179.999;
+    }
+    east = L.latLng(77, east).wrap().lng;
+    west = L.latLng(77, west).wrap().lng;
+
     return [
-        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
+        west.toFixed(5), // left
+        bounds.getNorth().toFixed(5), // top
+        east.toFixed(5), // right
+        bounds.getSouth().toFixed(5) // bottom
     ].join(',');
 }
 
diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index 3528f19..44e7a79 100755
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -6,6 +6,10 @@
 
 function display_map_position(mouse_lat_lng){
 
+    if (mouse_lat_lng) {
+        mouse_lat_lng = map.wrapLatLng(mouse_lat_lng);
+    }
+
     html_mouse = "mouse position " + (mouse_lat_lng ? [mouse_lat_lng.lat.toFixed(5), mouse_lat_lng.lng.toFixed(5)].join(',') : '-');
     html_click = "last click: " + (last_click_latlng ? [last_click_latlng.lat.toFixed(5),last_click_latlng.lng.toFixed(5)].join(',') : '-');
 
@@ -20,9 +24,10 @@ function display_map_position(mouse_lat_lng){
 
     $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('<br/>'));
 
+    var center_lat_lng = map.wrapLatLng(map.getCenter());
     var reverse_params = {
-        // lat: map.getCenter().lat.toFixed(5),
-        // lon: map.getCenter().lng.toFixed(5),
+        lat: center_lat_lng.lat.toFixed(5),
+        lon: center_lat_lng.lng.toFixed(5)
         // zoom: 2,
         // format: 'html'
     }
@@ -46,7 +51,6 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
 
 
     L.tileLayer(get_config_value('Map_Tile_URL'), {
-        noWrap: true, // otherwise we end up with click coordinates like latitude -728
         // moved to footer
         attribution: (get_config_value('Map_Tile_Attribution') || null ) //'&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors'
     }).addTo(map);
@@ -205,7 +209,7 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
     if ( is_reverse_search ){
         map.on('click', function(e){
             $('form input[name=lat]').val( e.latlng.lat);
-            $('form input[name=lon]').val( e.latlng.lng);
+            $('form input[name=lon]').val( e.latlng.wrap().lng);
             $('form').submit();
         });