Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 3c3824eb1526355d96fa5db040bb2629fda4352f..5f9268c680e31e222370b001b8f9edcdeb355134 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -23,10 +23,7 @@ $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup->loadParamArray($oParams);
 
 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup->loadParamArray($oParams);

-if ($sOutputFormat == 'geocodejson') {
-    $oPlaceLookup->setAddressDetails(true);
-    $oPlaceLookup->setAddressAdminLevels(true);
-}
+$oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));

 
 $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osm_id', -1);
 
 $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osm_id', -1);


@@ -54,12 +51,13 @@ if ($sOsmType && $iOsmId > 0) {
 }
 
 if (isset($aPlace)) {
 }
 
 if (isset($aPlace)) {

-    $fRadius = $fDiameter = getResultDiameter($aPlace);

     $aOutlineResult = $oPlaceLookup->getOutlines(
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],
     $aOutlineResult = $oPlaceLookup->getOutlines(
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],

-        $fRadius
+        Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
+        $fLat,
+        $fLon

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


@@ -69,6 +67,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);