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 956feae699f03dfc19e71a004211965030d30f69..e96ebd25c836c3469a2c5cfe36860b390943c8bb 100644 (file)
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -17,7 +17,7 @@ function parse_and_normalize_geojson_string(raw_string){
     return parsed_geojson;
 }
 
     return parsed_geojson;
 }
 

-jQuery(document).on('ready', function(){
+jQuery(document).ready(function(){

 
     if ( !$('#search-page,#reverse-page').length ){ return; }
     
 
     if ( !$('#search-page,#reverse-page').length ){ return; }
     


@@ -93,9 +93,9 @@ jQuery(document).on('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).on('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){


@@ -198,15 +198,18 @@ jQuery(document).on('ready', function(){
             }
         }
         else {
             }
         }
         else {

-            if ( is_reverse_search ){
-                // make sure the search coordinates are in the map view as well
-                map.fitBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {padding: [50,50], maxZoom: map.getZoom()});
-
-                // better, but causes a leaflet warning
-                // map.panInsideBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {animate: false});
-            }
-            else {
-                map.panTo([result.lat,result.lon], result.zoom || nominatim_map_init.zoom);
+            var result_coord = L.latLng(result.lat, result.lon);
+            if ( result_coord ){
+                if ( is_reverse_search ){
+                    // make sure the search coordinates are in the map view as well
+                    map.fitBounds([result_coord, [nominatim_map_init.lat,nominatim_map_init.lon]], {padding: [50,50], maxZoom: map.getZoom()});
+
+                    // better, but causes a leaflet warning
+                    // map.panInsideBounds([[result.lat,result.lon], [nominatim_map_init.lat,nominatim_map_init.lon]], {animate: false});
+                }
+                else {
+                    map.panTo(result_coord, result.zoom || nominatim_map_init.zoom);
+                }

             }
         }
 
             }
         }
 


@@ -238,12 +241,22 @@ jQuery(document).on('ready', function(){
         });
 
         $('#switch-coords').on('click', function(e){
         });
 
         $('#switch-coords').on('click', function(e){

+            e.preventDefault();
+            e.stopPropagation();

             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();
         });
             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();
         });

+    } 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);


@@ -252,15 +265,15 @@ jQuery(document).on('ready', function(){
     $('form input[name=lat]').on('change', function(){
         var coords = $(this).val().split(',');
         if (coords.length == 2) {
     $('form input[name=lat]').on('change', function(){
         var coords = $(this).val().split(',');
         if (coords.length == 2) {

-            $(this).val(coords[0]);
-            $(this).siblings('input[name=lon]').val(coords[1]);
+            $(this).val(L.Util.trim(coords[0]));
+            $(this).siblings('input[name=lon]').val(L.Util.trim(coords[1]));

         }
     });
 
 });
 
 
         }
     });
 
 });
 
 

-jQuery(document).on('ready', function(){
+jQuery(document).ready(function(){

 
     if ( !$('#details-page').length ){ return; }
 
 
     if ( !$('#details-page').length ){ return; }
 


@@ -279,9 +292,6 @@ jQuery(document).on('ready', function(){
             attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
         }).addTo(map);
 
             attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
         }).addTo(map);
 

-        var osm2 = new L.TileLayer(nominatim_map_init.tile_url, {minZoom: 0, maxZoom: 13, attribution: (nominatim_map_init.tile_attribution || null )});
-        var miniMap = new L.Control.MiniMap(osm2, {toggleDisplay: true}).addTo(map);
-

         var layerGroup = new L.layerGroup().addTo(map);
 
         var circle = L.circleMarker([nominatim_result.lat,nominatim_result.lon], { radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75});
         var layerGroup = new L.layerGroup().addTo(map);
 
         var circle = L.circleMarker([nominatim_result.lat,nominatim_result.lon], { radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75});


@@ -304,6 +314,8 @@ jQuery(document).on('ready', function(){
             map.setView([nominatim_result.lat,nominatim_result.lon],10);
         }
 
             map.setView([nominatim_result.lat,nominatim_result.lon],10);
         }
 

+        var osm2 = new L.TileLayer(nominatim_map_init.tile_url, {minZoom: 0, maxZoom: 13, attribution: (nominatim_map_init.tile_attribution || null )});
+        var miniMap = new L.Control.MiniMap(osm2, {toggleDisplay: true}).addTo(map);

 
 
 });
 
 
 });