return parsed_geojson;
}
-jQuery(document).on('ready', function(){
+jQuery(document).ready(function(){
if ( !$('#search-page,#reverse-page').length ){ return; }
-
+
var is_reverse_search = !!( $('#reverse-page').length );
$('#q').focus();
+ $(document).ready(function() {
+ $("input[name='query-selector']").click(function(){
+ var query_val = $("input[name='query-selector']:checked").val() ;
+ if (query_val == "simple") {
+ $("div.form-group-structured").hide();
+ $("div.form-group-simple").show();
+ $("div.form-group-structured .form-control").prop('disabled', true);
+ $("div.form-group-simple .form-control").prop('disabled', false);
+ $('.form-group-structured').find('input:text').val('');
+ }
+ else if (query_val == "structured") {
+ $("div.form-group-simple").hide();
+ $("div.form-group-structured").show();
+ $("div.form-group-structured .form-control").prop('disabled', false);
+ $("div.form-group-simple .form-control").prop('disabled', true);
+ $('.form-group-simple').find('input:text').val('');
+ }
+ });
+
+ if (nominatim_structured_query) {
+ $('input#structured').prop('checked', true).trigger('click');
+ } else {
+ $('input#simple').prop('checked', true).trigger('click');
+ }
+ });
+
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 ) //'© <a href="http://osm.org/copyright">OpenStreetMap</a> 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});
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(',') : '-');
$('#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: map.getZoom(),
format: 'html'
}
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){
circle.on('click', function(){
highlight_result(position);
});
- layerGroup.addLayer(circle);
+ layerGroup.addLayer(circle);
}
if (result.aBoundingBox){
}
}
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);
+ }
}
}
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(','); // <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);
+ // 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; }
// 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,
});
attribution: (nominatim_map_init.tile_attribution || null ) //'© <a href="http://osm.org/copyright">OpenStreetMap</a> 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.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);
});
projects / nominatim.git / blobdiff