X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/2613ebfa0143cdd1e3220577d48d9aa8341dbf38..513bf485f20f0308c7f25c96717190a354bf0ec3:/website/lookup.php diff --git a/website/lookup.php b/website/lookup.php index 71c93715..f09506a4 100755 --- a/website/lookup.php +++ b/website/lookup.php @@ -11,7 +11,7 @@ ini_set('memory_limit', '200M'); $oParams = new Nominatim\ParameterParser(); // Format for output -$sOutputFormat = $oParams->getSet('format', array('xml', 'json'), 'xml'); +$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'geojson'), 'xml'); // Preferred language $aLangPrefOrder = $oParams->getPreferredLanguages(); @@ -25,6 +25,7 @@ $aCleanedQueryParts = array(); $oPlaceLookup = new Nominatim\PlaceLookup($oDB); $oPlaceLookup->loadParamArray($oParams); +$oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true)); $aOsmIds = explode(',', $oParams->getString('osm_ids', '')); @@ -66,4 +67,5 @@ $bShowPolygons = ''; $aExcludePlaceIDs = array(); $sMoreURL = ''; -include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php'); +$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat; +include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');