X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f2a2c29815768171406587b7bc528f5033ec9b8f..8b491e85448629c8921b4bb7399df319f73977be:/website/js/nominatim-ui.js

diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index b99def9a..be108074 100644
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -3,23 +3,32 @@ var last_click_latlng;
 
 jQuery(document).on('ready', function(){
 
-	if ( !$('#search-page').length ){ return; }
+	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: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),
+				scrollWheelZoom:    !L.Browser.touch,
+				touchZoom:          false
 			});
 
-	L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+	L.tileLayer(nominatim_map_init.tile_url, {
+		noWrap: true, // otherwise we end up with click coordinates like latitude -728
 		// moved to footer
-		// attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+		attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <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);
+
+	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});
+		cm.addTo(map);
+	}
+
 
 
 	function display_map_position(mouse_lat_lng){
@@ -32,9 +41,11 @@ jQuery(document).on('ready', function(){
 			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');
 	}
 
@@ -81,7 +92,7 @@ jQuery(document).on('ready', function(){
 		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: 10, weight: 2, fillColor: '#ff7800', color: 'blue', 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);
@@ -116,7 +127,16 @@ jQuery(document).on('ready', function(){
 			}
 		}
 		else {
-			map.panTo([result.lat,result.lon], result.zoom || nominatim_map_init.zoom);
+			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 crosshairIcon = L.icon({
@@ -139,6 +159,14 @@ jQuery(document).on('ready', function(){
 		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);
 
 
@@ -153,16 +181,18 @@ jQuery(document).on('ready', function(){
 		map = new L.map('map', {
 					// center: [nominatim_map_init.lat, nominatim_map_init.lon],
 					// zoom:   nominatim_map_init.zoom,
-					attributionControl: false,
+					attributionControl: (nominatim_map_init.tile_attribution && nominatim_map_init.tile_attribution.length),
 					scrollWheelZoom:    false,
 					touchZoom:          false,
 				});
 
-		L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+
+		L.tileLayer(nominatim_map_init.tile_url, {
 			// moved to footer
-			// attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+			attribution: (nominatim_map_init.tile_attribution || null ) //'&copy; <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});