Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 3c3824eb1526355d96fa5db040bb2629fda4352f..952517235d81903ddb3b3188172251935b618d0b 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -24,7 +24,7 @@ $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup->loadParamArray($oParams);
 if ($sOutputFormat == 'geocodejson') {
 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup->loadParamArray($oParams);
 if ($sOutputFormat == 'geocodejson') {

-    $oPlaceLookup->setAddressDetails(true);
+    $oPlaceLookup->setIncludeAddressDetails(true);

     $oPlaceLookup->setAddressAdminLevels(true);
 }
 
     $oPlaceLookup->setAddressAdminLevels(true);
 }
 


@@ -59,7 +59,9 @@ if (isset($aPlace)) {
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],

-        $fRadius
+        $fRadius,
+        $fLat,
+        $fLon

     );
 
     if ($aOutlineResult) {
     );
 
     if ($aOutlineResult) {


@@ -69,6 +71,7 @@ if (isset($aPlace)) {
     $aPlace = array();
 }
 
     $aPlace = array();
 }
 

+logEnd($oDB, $hLog, sizeof($aPlace)?1:0);

 
 if (CONST_Debug) {
     var_dump($aPlace);
 
 if (CONST_Debug) {
     var_dump($aPlace);