<?php
-@define('CONST_ConnectionBucket_PageType', 'Reverse');
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php');
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');
+$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.");
+ 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;
$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;
}
}
// we initialize these to avoid warnings in our logfile
$sViewBox = '';
$bShowPolygons = '';
-$aExcludePlaceIDs = [];
+$aExcludePlaceIDs = array();
$sMoreURL = '';
-include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php');
+logEnd($oDB, $hLog, 1);
+
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
+include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');