X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d4b633bfc50188f36e3c4a8b2b99c3a0e6a7f12e..932ac23f18110749ca9659a834c20aee8bf828fe:/website/lookup.php diff --git a/website/lookup.php b/website/lookup.php index 20d06af0..39a17ebd 100644 --- a/website/lookup.php +++ b/website/lookup.php @@ -9,7 +9,7 @@ ini_set('memory_limit', '200M'); $oParams = new Nominatim\ParameterParser(); // Format for output -$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'geojson'), 'xml'); +$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml'); set_exception_handler_by_format($sOutputFormat); // Preferred language @@ -49,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; } }