X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ac29f8bc91ec69cf6695ffc8118292b1cccce1e4..9e2841ad446ef333178c6b4f695fc927669ff643:/website/js/nominatim-ui.js
diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index 337ceb25..72c1b3b0 100644
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -20,11 +20,37 @@ function parse_and_normalize_geojson_string(raw_string){
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: true, // !L.Browser.touch,
@@ -32,7 +58,6 @@ jQuery(document).ready(function(){
});
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);
@@ -78,6 +103,9 @@ jQuery(document).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(',') : '-');
@@ -92,10 +120,11 @@ jQuery(document).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),
- // zoom: 2,
+ lat: center_lat_lng.lat.toFixed(5),
+ lon: center_lat_lng.lng.toFixed(5),
+ zoom: map.getZoom(),
format: 'html'
}
$('#switch-to-reverse').attr('href', 'reverse.php?' + $.param(reverse_params));
@@ -134,12 +163,22 @@ jQuery(document).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(){
@@ -172,7 +211,7 @@ jQuery(document).ready(function(){
circle.on('click', function(){
highlight_result(position);
});
- layerGroup.addLayer(circle);
+ layerGroup.addLayer(circle);
}
if (result.aBoundingBox){
@@ -236,7 +275,7 @@ jQuery(document).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();
});
@@ -273,6 +312,30 @@ jQuery(document).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; }