X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4a321487f3d44241242a1729ab4d137df1f57bfb..66adbf6a055c877a82fce52767bed7094d0f73a9:/website/lookup.php diff --git a/website/lookup.php b/website/lookup.php index 93743e2d..71c93715 100755 --- a/website/lookup.php +++ b/website/lookup.php @@ -8,7 +8,7 @@ require_once(CONST_BasePath.'/lib/PlaceLookup.php'); require_once(CONST_BasePath.'/lib/output.php'); ini_set('memory_limit', '200M'); -$oParams = new ParameterParser(); +$oParams = new Nominatim\ParameterParser(); // Format for output $sOutputFormat = $oParams->getSet('format', array('xml', 'json'), 'xml'); @@ -23,16 +23,13 @@ $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder); $aSearchResults = array(); $aCleanedQueryParts = array(); -$oPlaceLookup = new PlaceLookup($oDB); -$oPlaceLookup->setLanguagePreference($aLangPrefOrder); -$oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true)); -$oPlaceLookup->setIncludeExtraTags($oParams->getBool('extratags', false)); -$oPlaceLookup->setIncludeNameDetails($oParams->getBool('namedetails', false)); +$oPlaceLookup = new Nominatim\PlaceLookup($oDB); +$oPlaceLookup->loadParamArray($oParams); $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) { @@ -66,7 +63,7 @@ $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');