Merge pull request #508 from mtmail/addtype-in-installation.md

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index 495db2b40e668277fd18ceb92bfbc10cba5c923f..10490097cdd29de857b78bc1a089da04c992bbf9 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -5,26 +5,20 @@
        require_once(CONST_BasePath.'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/output.php');
-
-       $sOutputFormat = 'html';
-       /*
-          $fLoadAvg = getLoadAverage();
-          if ($fLoadAvg > 3)
-          {
-          echo "Page temporarily blocked due to high server load\n";
-          exit;
-          }
-        */
        ini_set('memory_limit', '200M');
 
-       $oDB =& getDB();
+       $oParams = new ParameterParser();
 
-       $aLangPrefOrder = getPreferredLanguages();
+       $sOutputFormat = 'html';
+       $aLangPrefOrder = $oParams->getPreferredLanguages();
        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
-       $sPlaceId = getParamString('place_id');
-       $sOsmType = getParamSet('osmtype', array('N', 'W', 'R'));
-       $iOsmId = getParamInt('osmid', -1);
+       $sPlaceId = $oParams->getString('place_id');
+       $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R'));
+       $iOsmId = $oParams->getInt('osmid', -1);
+
+       $oDB =& getDB();
+
        if ($sOsmType && $iOsmId > 0)
        {
                $sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));
@@ -132,7 +126,7 @@
 
        $aPlaceSearchNameKeywords = false;
        $aPlaceSearchAddressKeywords = false;
-       if (getParamBool('keywords'))
+       if ($oParams->getBool('keywords'))
        {
                $sSQL = "select * from search_name where place_id = $iPlaceID";
                $aPlaceSearchName = $oDB->getRow($sSQL);