X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d42aa0870592b36ba9c64eae05a0ceafd2467f4c..0df5f77bc4c92e2f8f635105441779277435da67:/website/lookup.php diff --git a/website/lookup.php b/website/lookup.php index 578d4c37..ec2a3a8a 100755 --- a/website/lookup.php +++ b/website/lookup.php @@ -11,7 +11,8 @@ 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'); +set_exception_handler_by_format($sOutputFormat); // Preferred language $aLangPrefOrder = $oParams->getPreferredLanguages(); @@ -25,11 +26,12 @@ $aCleanedQueryParts = array(); $oPlaceLookup = new Nominatim\PlaceLookup($oDB); $oPlaceLookup->loadParamArray($oParams); +$oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true)); $aOsmIds = explode(',', $oParams->getString('osm_ids', '')); if (count($aOsmIds) > CONST_Places_Max_ID_count) { - userError('Bulk User: Only ' . CONST_Places_Max_ID_count . " ids are allowed in one request."); + userError('Bulk User: Only ' . CONST_Places_Max_ID_count . ' ids are allowed in one request.'); } foreach ($aOsmIds as $sItem) { @@ -63,7 +65,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');