From 2361ca2c718bd650d187a618ebb465b11f5b81b7 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Sat, 21 Oct 2017 14:28:28 +0200
Subject: [PATCH] UI: allow copy&pasting lat,lon into the lat search field

---
 lib/template/address-html.php |  2 +-
 website/js/nominatim-ui.js    | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/template/address-html.php b/lib/template/address-html.php
index 621c9773..e022b604 100644
--- a/lib/template/address-html.php
+++ b/lib/template/address-html.php
@@ -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; ?>" >
-            <button class="btn btn-default btn-xs" id="switch-coords" title="switch lat and lon">&lt;&gt;</button>
+            <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
diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index 956feae6..c971d745 100644
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -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()});
-
-                // 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 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_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);
@@ -252,8 +257,8 @@ jQuery(document).on('ready', function(){
     $('form input[name=lat]').on('change', function(){
         var coords = $(this).val().split(',');
         if (coords.length == 2) {
-            $(this).val(coords[0]);
-            $(this).siblings('input[name=lon]').val(coords[1]);
+            $(this).val(L.Util.trim(coords[0]));
+            $(this).siblings('input[name=lon]').val(L.Util.trim(coords[1]));
         }
     });
 
-- 
2.39.5