Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index dfa09d3b7ffe8a84d5fc2484b5633340b0157d1e..b9cc88f767ccd19df7a90b00e581d931ab7b8231 100755 (executable)
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -1,92 +1,69 @@
 <?php
 <?php

-       @define('CONST_ConnectionBucket_PageType', 'Reverse');
+@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(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');

 
 

-       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'), 'xml');

 
 

-       // Format for output
-       $sOutputFormat = 'xml';
-       if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json'))
-       {
-               $sOutputFormat = $_GET['format'];
-       }
+// Preferred language
+$aLangPrefOrder = $oParams->getPreferredLanguages();

 
 

-       // Preferred language
-       $aLangPrefOrder = getPreferredLanguages();
+$oDB =& getDB();

 
 

-       $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
+$hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);

 
 

-       $aSearchResults = array();
-       $aCleanedQueryParts = array();
-       if (isset($_GET['osm_ids']))
-       {
-               $oPlaceLookup = new PlaceLookup($oDB);
-               $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
-               $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
-               $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
-               $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
-               
-               $aOsmIds = explode(',', $_GET['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.");
-                       exit;
-               }
-               
-               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;
-                               }
-                       }
-               }
-       }
+$aSearchResults = array();
+$aCleanedQueryParts = array();

 
 

+$oPlaceLookup = new Nominatim\PlaceLookup($oDB);
+$oPlaceLookup->loadParamArray($oParams);

 
 

-       if (CONST_Debug) exit;
+$aOsmIds = explode(',', $oParams->getString('osm_ids', ''));

 
 

-       $sXmlRootTag = 'lookupresults';
-       $sQuery = join(',',$aCleanedQueryParts);
-       // we initialize these to avoid warnings in our logfile
-       $sViewBox = '';
-       $bShowPolygons = '';
-       $aExcludePlaceIDs = [];
-       $sMoreURL = '';
+if (count($aOsmIds) > CONST_Places_Max_ID_count) {
+    userError('Bulk User: Only ' . CONST_Places_Max_ID_count . ' ids are allowed in one request.');
+}

 
 

-       include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php');
+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'];
+            unset($oResult['langaddress']);
+            $oResult['name'] = $oPlace['langaddress'];
+            $aSearchResults[] = $oResult;
+        }
+    }
+}
+
+
+if (CONST_Debug) exit;
+
+$sXmlRootTag = 'lookupresults';
+$sQuery = join(',', $aCleanedQueryParts);
+// we initialize these to avoid warnings in our logfile
+$sViewBox = '';
+$bShowPolygons = '';
+$aExcludePlaceIDs = [];
+$sMoreURL = '';
+
+include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php');