X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/348a3082c926bc6f8d9a2b5ba9341a9bae338ab6..2bbe5017d44e6f50069bd5b966cefbc5065e267b:/website/lookup.php?ds=sidebyside

diff --git a/website/lookup.php b/website/lookup.php
old mode 100755
new mode 100644
index 9d0cea4c..e5f01232
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -1,86 +1,73 @@
 <?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');
+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');
 
-	if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
-	{
-		$fLoadAvg = getLoadAverage();
-		if ($fLoadAvg > 2) sleep(60);
-		if ($fLoadAvg > 4) sleep(120);
-		if ($fLoadAvg > 6)
-		{
-			userError("Bulk User: Temporary block due to high server load");
-			exit;
-		}
-	}
+$oParams = new Nominatim\ParameterParser();
 
-	$oDB =& getDB();
-	ini_set('memory_limit', '200M');
+// Format for output
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');
+set_exception_handler_by_format($sOutputFormat);
 
-	// Format for output
-	$sOutputFormat = getParamSet('format', array('xml', 'json'), 'xml');
+// Preferred language
+$aLangPrefOrder = $oParams->getPreferredLanguages();
 
-	// Preferred language
-	$aLangPrefOrder = getPreferredLanguages();
+$oDB = new Nominatim\DB();
+$oDB->connect();
 
-	$hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
+$hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
-	$aSearchResults = array();
-	$aCleanedQueryParts = array();
+$aSearchResults = array();
+$aCleanedQueryParts = array();
 
-	$oPlaceLookup = new PlaceLookup($oDB);
-	$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
-	$oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
-	$oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
-	$oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
+$oPlaceLookup = new Nominatim\PlaceLookup($oDB);
+$oPlaceLookup->loadParamArray($oParams);
+$oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));
 
-	$aOsmIds = explode(',', getParamString('osm_ids', ''));
+$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)
-	{
-		// Skip empty sItem
-		if (empty($sItem)) continue;
-		
-		$sType = $sItem[0];
-		$iId = (int) substr($sItem, 1);
-		if ( $iId > 0 && ($sType == 'N' || $sType == 'W' || $sType == 'R') )
-		{
-			$aCleanedQueryParts[] = $sType . $iId;
-			$oPlaceLookup->setOSMID($sType, $iId);
-			$oPlace = $oPlaceLookup->lookup();
-			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'];
-				$aSearchResults[] = $oResult;
-			}
-		}
-	}
+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')) {
+        $aCleanedQueryParts[] = $sType . $iId;
+        $oPlace = $oPlaceLookup->lookupOSMID($sType, $iId);
+        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'];
+            if ($sOutputFormat != 'geocodejson') {
+                unset($oResult['langaddress']);
+                $oResult['name'] = $oPlace['langaddress'];
+            }
+            $aSearchResults[] = $oResult;
+        }
+    }
+}
 
 
-	if (CONST_Debug) exit;
+if (CONST_Debug) exit;
 
-	$sXmlRootTag = 'lookupresults';
-	$sQuery = join(',',$aCleanedQueryParts);
-	// we initialize these to avoid warnings in our logfile
-	$sViewBox = '';
-	$bShowPolygons = '';
-	$aExcludePlaceIDs = [];
-	$sMoreURL = '';
+$sXmlRootTag = 'lookupresults';
+$sQuery = join(',', $aCleanedQueryParts);
+// we initialize these to avoid warnings in our logfile
+$sViewBox = '';
+$bShowPolygons = '';
+$aExcludePlaceIDs = array();
+$sMoreURL = '';
 
-	include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php');
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
+include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');