X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7a50d2f9964421e932313b15f5d7d3b05ded4c45..cd6dcfa574b8620bde91aee91dc891be7f76439f:/website/hierarchy.php?ds=inline

diff --git a/website/hierarchy.php b/website/hierarchy.php
index 7740abbc..60d77d6a 100755
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -8,25 +8,27 @@
 	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 = $oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc");
+		$sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));
 
 		// Be nice about our error messages for broken geometry
 		if (!$sPlaceId)
 		{
-			$aPointDetails = $oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by updated desc limit 1");
-			if (!PEAR::isError($aPointDetails) && $aPointDetails) {
+			$aPointDetails = chksql($oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by updated desc limit 1"));
+			if ($aPointDetails) {
 				if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches))
 				{
 					$aPointDetails['error_x'] = $aMatches[1];
@@ -44,22 +46,21 @@
 
 	if (CONST_Use_US_Tiger_Data)
 	{
-		$iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID);
+		$iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID));
 		if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
 	}
 
 	if (CONST_Use_Aux_Location_data)
 	{
-		$iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID);
+		$iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID));
 		if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
 	}
 
 	$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.");
 
@@ -90,14 +91,14 @@
 		exit;
 	}
 
-	$aRelatedPlaceIDs = $oDB->getCol($sSQL = "select place_id from placex where linked_place_id = $iPlaceID or place_id = $iPlaceID");
+	$aRelatedPlaceIDs = chksql($oDB->getCol($sSQL = "select place_id from placex where linked_place_id = $iPlaceID or place_id = $iPlaceID"));
 
 	$sSQL = "select obj.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea,  st_area(geometry) as area, ";
 	$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
 	$sSQL .= " from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex ";
 	$sSQL .= " where parent_place_id in (".join(',',$aRelatedPlaceIDs).") and name is not null order by rank_address asc,rank_search asc limit 500) as obj";
 	$sSQL .= " order by rank_address asc,rank_search asc,localname,class, type,housenumber";
-	$aParentOfLines = $oDB->getAll($sSQL);
+	$aParentOfLines = chksql($oDB->getAll($sSQL));
 
 	if (sizeof($aParentOfLines))
 	{