hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: viewbox parameter was set in wrong parameter order

Browse Source
This commit is contained in:
Marc Tobias Metten
2016-09-13 14:41:56 +02:00
parent eb0b3bfa4c
commit 775fdeb8e4
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/template/search-html.php
View File

@@ -22,10 +22,8 @@
<?php } ?> <?php } ?>
<input type="hidden" name="viewbox" value="<?php echo $sViewBox; ?>" /> <input type="hidden" name="viewbox" value="<?php echo $sViewBox; ?>" />
<div class="checkbox-inline"> <div class="checkbox-inline">
<label> <input type="checkbox" id="use_viewbox" <?php if ($sViewBox) echo "checked='checked'"; ?>>
<input type="checkbox" id="use_viewbox" <?php if ($sViewBox) echo "checked='checked'"; ?>> <label for="use_viewbox">apply viewbox</label>
apply viewbox
</label>
</div> </div>
</div> </div>
<div class="search-type-link"> <div class="search-type-link">

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

@@ -75,8 +75,14 @@ jQuery(document).on('ready', function(){
$('input#use_viewbox').trigger('change'); $('input#use_viewbox').trigger('change');
} }
function update_viewbox_field(){
// hidden HTML field
$('input[name=viewbox]').val( $('input#use_viewbox').prop('checked') ? map_viewbox_as_string() : '');
}
map.on('move', function(e) { map.on('move', function(e) {
display_map_position(); display_map_position();
update_viewbox_field();
}); });
map.on('mousemove', function(e) { map.on('mousemove', function(e) {
@@ -94,7 +100,7 @@ jQuery(document).on('ready', function(){
$('input#use_viewbox').on('change', function(){ $('input#use_viewbox').on('change', function(){
$('input[name=viewbox]').val( $(this).prop('checked') ? map_viewbox_as_string() : ''); update_viewbox_field();
}); });
@@ -102,10 +108,11 @@ jQuery(document).on('ready', function(){
function map_viewbox_as_string() { function map_viewbox_as_string() {
// since .toBBoxString() doesn't round numbers // since .toBBoxString() doesn't round numbers
return [ return [
map.getBounds().getSouthWest().lat.toFixed(5), map.getBounds().getSouthWest().lng.toFixed(5), // left
map.getBounds().getSouthWest().lng.toFixed(5), map.getBounds().getNorthEast().lat.toFixed(5), // top
map.getBounds().getNorthEast().lat.toFixed(5), map.getBounds().getNorthEast().lng.toFixed(5), // right
map.getBounds().getNorthEast().lng.toFixed(5) ].join(','); map.getBounds().getSouthWest().lat.toFixed(5) // bottom
].join(',');
} }
function map_link_to_osm(){ function map_link_to_osm(){
return "http://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng; return "http://openstreetmap.org/#map=" + map.getZoom() + "/" + map.getCenter().lat + "/" + map.getCenter().lng;