X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6a3c6c43ea7133c934834ce1face9212f4e3d239..f6cf89fdde89f3ae26cb5146c6b2124cf9022f77:/website/lookup.php diff --git a/website/lookup.php b/website/lookup.php index b9cc88f7..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', '')); @@ -63,7 +64,8 @@ $sQuery = join(',', $aCleanedQueryParts); // we initialize these to avoid warnings in our logfile $sViewBox = ''; $bShowPolygons = ''; -$aExcludePlaceIDs = []; +$aExcludePlaceIDs = array(); $sMoreURL = ''; -include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php'); +$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat; +include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');