var last_click_latlng;
jQuery(document).on('ready', function(){
+
+ if ( !$('#search-page,#reverse-page').length ){ return; }
+
+ var is_reverse_search = !!( $('#reverse-page').length );
+
$('#q').focus();
map = new L.map('map', {
- center: [nominatim_map_init.lat, nominatim_map_init.lon],
- zoom: nominatim_map_init.zoom,
- attributionControl: false,
- scrollWheelZoom: false,
- touchZoom: false,
+ attributionControl: false, // moved to page footer
+ scrollWheelZoom: !L.Browser.touch,
+ touchZoom: false
});
+
+
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
-// attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+ noWrap: true // otherwise we end up with click coordinates like latitude -728
+ // moved to footer
+ // attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
+ if ( nominatim_map_init.lat ){
+ map.setView([nominatim_map_init.lat || 0, nominatim_map_init.lon], nominatim_map_init.zoom);
+
+ if ( is_reverse_search ){
+ // not really a market, but the .circle 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});
+ cm.addTo(map);
+ }
+
+ } else {
+ map.setView([0,0],2);
+ }
+
function display_map_position(mouse_lat_lng){
map.getCenter().lat.toFixed(5) + ',' + map.getCenter().lng.toFixed(5) +
" <a target='_blank' href='" + map_link_to_osm() + "'>view on osm.org</a>";
+ html_zoom = "map zoom: " + map.getZoom();
+
html_viewbox = "viewbox: " + map_viewbox_as_string();
- $('#map-position').html([html_center,html_viewbox,html_click,html_mouse].join('<br/>'));
+ $('#map-position').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('<br/>'));
$('input#use_viewbox').trigger('change');
}
return L.marker([result.lat,result.lon], {riseOnHover:true,title:result.name });
}
function circle_for_result(result){
- return L.circleMarker([result.lat,result.lon], { radius: 50, weight: 1, fillColor: '#F0F7FF', color: 'red', opacity: 0.75});
+ return L.circleMarker([result.lat,result.lon], { radius: 10, weight: 2, fillColor: '#ff7800', color: 'blue', opacity: 0.75, clickable: !is_reverse_search});
}
var layerGroup = new L.layerGroup().addTo(map);
layerGroup.clearLayers();
+ if (result.lat){
+ var circle = circle_for_result(result);
+ circle.on('click', function(){
+ highlight_result(position);
+ });
+ layerGroup.addLayer(circle);
+ }
if (result.aBoundingBox){
- console.log('bounding box, maybe polygon', result);
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/) ){
var layer = omnivore.wkt.parse(result.astext);
layerGroup.addLayer(layer);
- // layer.addTo(map);
- // addedLayers.push(layer);
}
else {
- var layer = L.rectangle(bounds, {color: "#ff7800", weight: 1} );
- layerGroup.addLayer(layer);
+ // var layer = L.rectangle(bounds, {color: "#ff7800", weight: 1} );
+ // layerGroup.addLayer(layer);
}
}
else {
- // console.log('lat,lon,zoom');
- map.panTo([result.lat,result.lon], result.zoom || nominatim_map_init.zoom);
- var circle = circle_for_result(result);
- circle.on('click', function(){
- highlight_result(i);
- });
- layerGroup.addLayer(layer);
+ 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()});
- // circle.addTo(map);
+ // 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 crosshairIcon = L.icon({
- iconUrl: 'images/crosshair.png',
- iconSize: [12, 12],
- iconAnchor: [6, 6],
- });
- var crossMarker = new L.Marker([result.lat,result.lon], { icon: crosshairIcon, clickable: false});
- layerGroup.addLayer(crossMarker);
+ // var crosshairIcon = L.icon({
+ // iconUrl: 'images/crosshair.png',
+ // iconSize: [12, 12],
+ // iconAnchor: [6, 6],
+ // });
+ // var crossMarker = new L.Marker([result.lat,result.lon], { icon: crosshairIcon, clickable: false});
+ // layerGroup.addLayer(crossMarker);
- // crossMarker.addTo(map);
- // addedLayers.push(crossMarker);
if (bool_focus){
}
}
- $.each(nominatim_results, function(i, result){
-
- });
-
$('.result').on('click', function(e){
highlight_result($(this).data('position'), true);
});
+ 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').submit();
+ });
+ }
+
highlight_result(0, false);
});
+
+
+jQuery(document).on('ready', function(){
+
+ if ( !$('#details-page').length ){ return; }
+
+
+ map = new L.map('map', {
+ // center: [nominatim_map_init.lat, nominatim_map_init.lon],
+ // zoom: nominatim_map_init.zoom,
+ attributionControl: false,
+ scrollWheelZoom: false,
+ touchZoom: false,
+ });
+
+ L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+ // moved to footer
+ // attribution: '© <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.addLayer(circle);
+
+ if ( nominatim_result.outlinestring ){
+ var outline = omnivore.wkt.parse(nominatim_result.outlinestring);
+ map.addLayer(outline);
+ map.fitBounds(outline.getBounds());
+ } else {
+ map.setView([nominatim_result.lat,nominatim_result.lon],10);
+ }
+
+
+
+});
+
projects / nominatim.git / blobdiff