From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 24 Feb 2019 16:51:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~291
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/69f30e8e193b5be4b7fc6b504641e6d17fe1827b?hp=24e52de5f34363dd7fa5cc318d00e7c7135b84ff

Merge remote-tracking branch 'upstream/master'
---

diff --git a/utils/query.php b/utils/query.php
index 16657daf..9694bbb9 100644
--- a/utils/query.php
+++ b/utils/query.php
@@ -39,11 +39,7 @@ if ($oParams->getBool('search')) {
 
     $aSearchResults = $oGeocode->lookup();
 
-    if (version_compare(phpversion(), '5.4.0', '<')) {
-        echo json_encode($aSearchResults);
-    } else {
-        echo json_encode($aSearchResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n";
-    }
+    echo json_encode($aSearchResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n";
 } else {
     showUsage($aCMDOptions, true);
 }
diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index 337ceb25..e96ebd25 100644
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -93,9 +93,9 @@ jQuery(document).ready(function(){
         $('#map-position-inner').html([html_center,html_zoom,html_viewbox,html_click,html_mouse].join('<br/>'));
 
         var reverse_params = {
-            // lat: map.getCenter().lat.toFixed(5),
-            // lon: map.getCenter().lng.toFixed(5),
-            // zoom: 2,
+            lat: map.getCenter().lat.toFixed(5),
+            lon: map.getCenter().lng.toFixed(5),
+            zoom: map.getZoom(),
             format: 'html'
         }
         $('#switch-to-reverse').attr('href', 'reverse.php?' + $.param(reverse_params));