X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f4a86ff4c4be439571bf385af9df2912fa76cd3f..178cb987951255c24b84bd6d8b0e18315253bcb4:/website/js/nominatim-ui.js diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js index 25233643..337ceb25 100644 --- 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; } -jQuery(document).on('ready', function(){ +jQuery(document).ready(function(){ if ( !$('#search-page,#reverse-page').length ){ return; } @@ -27,7 +27,7 @@ jQuery(document).on('ready', function(){ map = new L.map('map', { attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length), - scrollWheelZoom: !L.Browser.touch, + scrollWheelZoom: true, // !L.Browser.touch, touchZoom: false }); @@ -39,6 +39,9 @@ jQuery(document).on('ready', function(){ map.setView([nominatim_map_init.lat, nominatim_map_init.lon], nominatim_map_init.zoom); + 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); + if ( is_reverse_search ){ // We don't need a marker, but an L.circle instance changes radius once you zoom in/out var cm = L.circleMarker([nominatim_map_init.lat,nominatim_map_init.lon], { radius: 5, weight: 2, fillColor: '#ff7800', color: 'red', opacity: 0.75, clickable: false}); @@ -90,9 +93,9 @@ jQuery(document).on('ready', function(){ $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('
')); var reverse_params = { - lat: map.getCenter().lat.toFixed(5), - lon: map.getCenter().lng.toFixed(5), - zoom: map.getZoom(), + // lat: map.getCenter().lat.toFixed(5), + // lon: map.getCenter().lng.toFixed(5), + // zoom: 2, format: 'html' } $('#switch-to-reverse').attr('href', 'reverse.php?' + $.param(reverse_params)); @@ -140,7 +143,7 @@ jQuery(document).on('ready', function(){ ].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){ @@ -195,15 +198,18 @@ jQuery(document).on('ready', function(){ } } 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); + } } } @@ -235,21 +241,39 @@ jQuery(document).on('ready', function(){ }); $('#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(); }); + } else { + var search_params = new URLSearchParams(location.search); + var viewbox = search_params.get('viewbox'); + if (viewbox) { + var coords = viewbox.split(','); // ,,, + 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); + // common mistake is to copy&paste latitude and longitude into the 'lat' search box + $('form input[name=lat]').on('change', function(){ + var coords = $(this).val().split(','); + if (coords.length == 2) { + $(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; } @@ -258,7 +282,7 @@ jQuery(document).on('ready', function(){ // center: [nominatim_map_init.lat, nominatim_map_init.lon], // zoom: nominatim_map_init.zoom, attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length), - scrollWheelZoom: false, + scrollWheelZoom: true, // !L.Browser.touch, touchZoom: false, }); @@ -268,7 +292,6 @@ jQuery(document).on('ready', function(){ attribution: (nominatim_map_init.tile_attribution || null ) //'© OpenStreetMap contributors' }).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}); @@ -291,6 +314,8 @@ jQuery(document).on('ready', function(){ 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); });