X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..503baf46d58e414eca0ec19cdafd2229b372485f:/website/lookup.php?ds=sidebyside diff --git a/website/lookup.php b/website/lookup.php old mode 100755 new mode 100644 index 3529aa5c..39a17ebd --- a/website/lookup.php +++ b/website/lookup.php @@ -1,61 +1,70 @@ getSet('format', array('xml', 'json'), 'xml'); +$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml'); +set_exception_handler_by_format($sOutputFormat); // Preferred language $aLangPrefOrder = $oParams->getPreferredLanguages(); -$oDB =& getDB(); +$oDB = new Nominatim\DB(); +$oDB->connect(); $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder); $aSearchResults = array(); $aCleanedQueryParts = array(); -$oPlaceLookup = new PlaceLookup($oDB); -$oPlaceLookup->setLanguagePreference($aLangPrefOrder); +$oPlaceLookup = new Nominatim\PlaceLookup($oDB); +$oPlaceLookup->loadParamArray($oParams); $oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true)); -$oPlaceLookup->setIncludeExtraTags($oParams->getBool('extratags', false)); -$oPlaceLookup->setIncludeNameDetails($oParams->getBool('namedetails', false)); $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."); +if (count($aOsmIds) > CONST_Places_Max_ID_count) { + userError('Bulk User: Only ' . CONST_Places_Max_ID_count . ' ids are allowed in one request.'); } -foreach ($aOsmIds AS $sItem) -{ +foreach ($aOsmIds as $sItem) { // Skip empty sItem if (empty($sItem)) continue; $sType = $sItem[0]; $iId = (int) substr($sItem, 1); - if ( $iId > 0 && ($sType == 'N' || $sType == 'W' || $sType == 'R') ) - { + if ($iId > 0 && ($sType == 'N' || $sType == 'W' || $sType == 'R')) { $aCleanedQueryParts[] = $sType . $iId; $oPlace = $oPlaceLookup->lookupOSMID($sType, $iId); - if ($oPlace){ + if ($oPlace) { // we want to use the search-* output templates, so we need to fill // $aSearchResults and slightly change the (reverse search) oPlace // key names $oResult = $oPlace; unset($oResult['aAddress']); if (isset($oPlace['aAddress'])) $oResult['address'] = $oPlace['aAddress']; - unset($oResult['langaddress']); - $oResult['name'] = $oPlace['langaddress']; + if ($sOutputFormat != 'geocodejson') { + unset($oResult['langaddress']); + $oResult['name'] = $oPlace['langaddress']; + } + + $aOutlineResult = $oPlaceLookup->getOutlines( + $oPlace['place_id'], + $oPlace['lon'], + $oPlace['lat'], + Nominatim\ClassTypes\getProperty($oPlace, 'defdiameter', 0.0001) + ); + + if ($aOutlineResult) { + $oResult = array_merge($oResult, $aOutlineResult); + } + $aSearchResults[] = $oResult; } } @@ -65,11 +74,12 @@ foreach ($aOsmIds AS $sItem) if (CONST_Debug) exit; $sXmlRootTag = 'lookupresults'; -$sQuery = join(',',$aCleanedQueryParts); +$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');