X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9b76a8ffb4c4cd13628d85c00cf286382970b149..f00baba40c6f73ba8e637ac4cea60d59a11692f4:/website/hierarchy.php
diff --git a/website/hierarchy.php b/website/hierarchy.php
old mode 100755
new mode 100644
index 9b488f83..419a0474
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -1,10 +1,8 @@
setLanguagePreference($aLangPrefOrder);
-$oPlaceLookup->setIncludeAddressDetails(true);
-$aPlaceAddress = array_reverse($oPlaceLookup->getAddressDetails($iPlaceID));
+$oAddressLookup = new AddressDetails($oDB, $iPlaceID, -1, $aLangPrefOrder);
+$aPlaceAddress = array_reverse($oAddressLookup->getAddressDetails());
if (empty($aPlaceAddress)) userError('Unknown place id.');
@@ -102,18 +98,12 @@ $aParentOfLines = chksql($oDB->getAll($sSQL));
if (!empty($aParentOfLines)) {
echo '
Parent Of:
';
- $aClassType = getClassTypesWithImportance();
$aGroupedAddressLines = array();
foreach ($aParentOfLines as $aAddressLine) {
- if (isset($aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label'])
- && $aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label']
- ) {
- $aAddressLine['label'] = $aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label'];
- } elseif (isset($aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label'])
- && $aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label']
- ) {
- $aAddressLine['label'] = $aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label'];
- } else $aAddressLine['label'] = ucwords($aAddressLine['type']);
+ $aAddressLine['label'] = Nominatim\ClassTypes\getProperty($aAddressLine, 'label');
+ if (!$aAddressLine['label']) {
+ $aAddressLine['label'] = ucwords($aAddressLine['type']);
+ }
if (!isset($aGroupedAddressLines[$aAddressLine['label']])) $aGroupedAddressLines[$aAddressLine['label']] = array();
$aGroupedAddressLines[$aAddressLine['label']][] = $aAddressLine;