X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6c1977b448e8b195bf96b6144674ffe0527e79de..932ac23f18110749ca9659a834c20aee8bf828fe:/website/lookup.php diff --git a/website/lookup.php b/website/lookup.php old mode 100755 new mode 100644 index b9cc88f7..39a17ebd --- a/website/lookup.php +++ b/website/lookup.php @@ -1,7 +1,5 @@ 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); @@ -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', '')); @@ -48,8 +49,22 @@ foreach ($aOsmIds as $sItem) { $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; } } @@ -63,7 +78,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');