X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6fef943e49ddd719524d1987e134d97fa89f2157..5c187e131a372d0cbdbba3372668862e3f1c47f9:/website/hierarchy.php

diff --git a/website/hierarchy.php b/website/hierarchy.php
index 8c0ae1f5..28a56f00 100755
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -5,6 +5,7 @@
 	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');
 
 	$oDB =& getDB();
@@ -19,13 +20,13 @@
 	$iOsmId = getParamInt('osmid', -1);
 	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];
@@ -43,22 +44,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.");
 
@@ -66,12 +66,17 @@
 	foreach($aPlaceAddress as $i => $aPlace)
 	{
 		if (!$aPlace['place_id']) continue;
-		$aBreadcrums[] = array('placeId'=>$aPlace['place_id'], 'osmType'=>$aPlace['osm_type'], 'osmId'=>$aPlace['osm_id'], 'localName'=>$aPlace['localname']);
-		$sPlaceUrl = 'hierarchy.php?place_id='.$aPlace['place_id'];
-		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
-				$sOSMUrl = 'http://www.openstreetmap.org/'.$sOSMType.'/'.$aPlace['osm_id'];
-		if ($sOutputFormat == 'html') if ($i) echo " > ";
-		if ($sOutputFormat == 'html') echo '<a href="'.$sPlaceUrl.'">'.$aPlace['localname'].'</a> (<a href="'.$sOSMUrl.'">osm</a>)';
+		$aBreadcrums[] = array('placeId'   => $aPlace['place_id'],
+		                       'osmType'   => $aPlace['osm_type'],
+		                       'osmId'     => $aPlace['osm_id'],
+		                       'localName' => $aPlace['localname']);
+
+		if ($sOutputFormat == 'html')
+		{
+			$sPlaceUrl = 'hierarchy.php?place_id='.$aPlace['place_id'];
+			if ($i) echo " &gt; ";
+			echo '<a href="'.$sPlaceUrl.'">'.$aPlace['localname'].'</a> ('.osmLink($aPlace).')';
+		}
 	}
 
 
@@ -84,14 +89,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))
 	{
@@ -114,28 +119,29 @@
 
 			if (!isset($aGroupedAddressLines[$aAddressLine['label']])) $aGroupedAddressLines[$aAddressLine['label']] = array();
 				$aGroupedAddressLines[$aAddressLine['label']][] = $aAddressLine;
-			}
-			foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
+		}
+
+		foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
+		{
+			echo "<h3>$sGroupHeading</h3>";
+			foreach($aParentOfLines as $aAddressLine)
 			{
-				echo "<h3>$sGroupHeading</h3>";
-				foreach($aParentOfLines as $aAddressLine)
-				{
-					$aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
-					$sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
-
-					echo '<div class="line">';
-					echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
-					echo ' (';
-					echo '<span class="area">'.($aAddressLine['isarea']=='t'?'Polygon':'Point').'</span>';
-					if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
-					echo ', <a href="hierarchy.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
-					echo ', '.$aAddressLine['area'];
-					echo ')';
-					echo '</div>';
-				}
+				$aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
+				$sOSMType = formatOSMType($aAddressLine['osm_type'], false);
+
+				echo '<div class="line">';
+				echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
+				echo ' (';
+				echo '<span class="area">'.($aAddressLine['isarea']=='t'?'Polygon':'Point').'</span>';
+				if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' '.osmLink($aAddressLine).'</span>';
+				echo ', <a href="hierarchy.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
+				echo ', '.$aAddressLine['area'];
+				echo ')';
+				echo '</div>';
 			}
-			if (sizeof($aParentOfLines) >= 500) {
-				echo '<p>There are more child objects which are not shown.</p>';
-			}
-			echo '</div>';
 		}
+		if (sizeof($aParentOfLines) >= 500) {
+			echo '<p>There are more child objects which are not shown.</p>';
+		}
+		echo '</div>';
+	}