Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
old mode 100755 (executable)
new mode 100644 (file)
index 2e03aca..6864d65
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,5 @@
 <?php
 <?php

-@define('CONST_ConnectionBucket_PageType', 'Reverse');

 
 

-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');


@@ -13,6 +11,7 @@ $oParams = new Nominatim\ParameterParser();
 
 // Format for output
 $sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');
 
 // Format for output
 $sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');

+set_exception_handler_by_format($sOutputFormat);

 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();


@@ -23,10 +22,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->setIncludeAddressDetails(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);


@@ -70,6 +66,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);