X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cfb0f3f94ced30b8b44390367e07bc9b0cec787d..b9171dd10b39fe66a2bd912fe77104f7565fdbe7:/website/js/nominatim-ui.js?ds=sidebyside diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js index c5e91cf7..d631e7aa 100644 --- a/website/js/nominatim-ui.js +++ b/website/js/nominatim-ui.js @@ -1,7 +1,23 @@ var map; var last_click_latlng; -jQuery(document).on('ready', function(){ +function parse_and_normalize_geojson_string(raw_string){ + // normalize places the geometry into a featurecollection, similar to + // https://github.com/mapbox/geojson-normalize + var parsed_geojson = { + type: "FeatureCollection", + features: [ + { + type: "Feature", + geometry: JSON.parse(raw_string), + properties: {} + } + ] + }; + return parsed_geojson; +} + +jQuery(document).ready(function(){ if ( !$('#search-page,#reverse-page').length ){ return; } @@ -11,18 +27,20 @@ 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 }); L.tileLayer(nominatim_map_init.tile_url, { - noWrap: true, // otherwise we end up with click coordinates like latitude -728 // moved to footer attribution: (nominatim_map_init.tile_attribution || null ) //'© OpenStreetMap contributors' }).addTo(map); 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}); @@ -59,6 +77,9 @@ jQuery(document).on('ready', function(){ 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(',') : '-'); @@ -73,9 +94,10 @@ jQuery(document).on('ready', function(){ $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('
')); + 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: map.getZoom(), format: 'html' } @@ -115,16 +137,26 @@ jQuery(document).on('ready', function(){ 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(','); } 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){ @@ -159,12 +191,18 @@ jQuery(document).on('ready', function(){ var bounds = [[result.aBoundingBox[0]*1,result.aBoundingBox[2]*1], [result.aBoundingBox[1]*1,result.aBoundingBox[3]*1]]; map.fitBounds(bounds); - if (result.astext && result.astext.match(/(POLY)|(LINE)/) ){ - var geojson_layer = L.geoJson(null, { - // http://leafletjs.com/reference.html#geojson-style - style: function(feature) { return { clickable: false, color: 'blue' }; } - }); - omnivore.wkt.parse(result.astext,null,geojson_layer); + + if (result.asgeojson && result.asgeojson.match(/(Polygon)|(Line)/) ){ + + var geojson_layer = L.geoJson( + parse_and_normalize_geojson_string(result.asgeojson), + { + // http://leafletjs.com/reference-1.0.3.html#path-option + style: function(feature) { + return { interactive: false, color: 'blue' }; + } + } + ); layerGroup.addLayer(geojson_layer); } else { @@ -173,15 +211,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); + } } } @@ -208,26 +249,68 @@ jQuery(document).on('ready', function(){ 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(); }); $('#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-index-page').length ){ return; } + + $('#form-by-type-and-id,#form-by-osm-url').on('submit', function(e){ + e.preventDefault(); + + var val = $(this).find('input[type=edit]').val(); + var matches = val.match(/^\s*([NWR])(\d+)\s*$/i); + + if (!matches) { + matches = val.match(/\/(relation|way|node)\/(\d+)\s*$/); + } + + if (matches) { + $(this).find('input[name=osmtype]').val(matches[1].charAt(0).toUpperCase()); + $(this).find('input[name=osmid]').val(matches[2]); + $(this).get(0).submit(); + } else { + alert('invalid input'); + } + }); +}); + +jQuery(document).ready(function(){ if ( !$('#details-page').length ){ return; } @@ -236,7 +319,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, }); @@ -246,25 +329,30 @@ 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}); map.addLayer(circle); - if ( nominatim_result.outlinestring ){ - - var geojson_layer = L.geoJson(null, { - // http://leafletjs.com/reference.html#geojson-style - style: function(feature) { return { clickable: false, color: 'blue' }; } - }); - omnivore.wkt.parse(nominatim_result.outlinestring,null,geojson_layer); - layerGroup.addLayer(geojson_layer); + if ( nominatim_result.asgeojson ){ + + var geojson_layer = L.geoJson( + parse_and_normalize_geojson_string(nominatim_result.asgeojson), + { + // http://leafletjs.com/reference-1.0.3.html#path-option + style: function(feature) { + return { interactive: false, color: 'blue' }; + } + } + ); + map.addLayer(geojson_layer); map.fitBounds(geojson_layer.getBounds()); } else { 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); });