osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-24 14:32:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #822 from mtmail/ui-allow-copypaste-combined-latlon

Browse Source 
Ui allow copypaste combined latlon
This commit is contained in:
Sarah Hoffmann 2017-10-22 12:11:02 +02:00 committed by GitHub
commit 8f884d7f23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/template/address-html.php
View File

@ -15,7 +15,7 @@
<input name="format" type="hidden" value="html">
lat
<input name="lat" type="text" class="form-control input-sm" placeholder="latitude" value="<?php echo $fLat; ?>" >
<span id="switch-coords" title="switch lat and lon">&lt;&gt;</span>
<a href="#" class="btn btn-default btn-xs" id="switch-coords" title="switch lat and lon">&lt;&gt;</a>
lon
<input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo $fLon; ?>" >
max zoom

29
website/js/nominatim-ui.js
View File

@ -198,15 +198,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()});
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.lat,result.lon], result.zoom || nominatim_map_init.zoom);
// 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);
}
}
}
@ -238,6 +241,8 @@ jQuery(document).on('ready', function(){
});
$('#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);
@ -248,6 +253,14 @@ jQuery(document).on('ready', function(){
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]));
}
});
});