factor out parameter parsing into its own class

[nominatim.git] / website / hierarchy.php

diff --git a/website/hierarchy.php b/website/hierarchy.php
index b14422fa6a80e7ff8a409ecbc8a8dca940b2c4c4..60d77d6a9d6f69e3004ddf26eaf4dc4e6754f794 100755 (executable)
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -8,16 +8,18 @@
        require_once(CONST_BasePath.'/lib/output.php');
        ini_set('memory_limit', '200M');
 
-       $oDB =& getDB();
-
-       $sOutputFormat = getParamSet('format', array('html', 'json'), 'html');
+       $oParams = new ParameterParser();
 
-       $aLangPrefOrder = getPreferredLanguages();
+       $sOutputFormat = $oParams->getSet('format', array('html', 'json'), '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"));
@@ -57,9 +59,8 @@
        $oPlaceLookup = new PlaceLookup($oDB);
        $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
        $oPlaceLookup->setIncludeAddressDetails(true);
-       $oPlaceLookup->setPlaceId($iPlaceID);
 
-       $aPlaceAddress = array_reverse($oPlaceLookup->getAddressDetails());
+       $aPlaceAddress = array_reverse($oPlaceLookup->getAddressDetails($iPlaceID));
 
        if (!sizeof($aPlaceAddress)) userError("Unknown place id.");