X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..0c483063dd7f5b62c28e10279e22250ec861fb8f:/lib/template/details-html.php?ds=sidebyside diff --git a/lib/template/details-html.php b/lib/template/details-html.php index a1334740..9b76efc1 100644 --- a/lib/template/details-html.php +++ b/lib/template/details-html.php @@ -46,8 +46,7 @@ function hash_to_subtable($aAssociatedList) { $sHTML = ''; - foreach($aAssociatedList as $sKey => $sValue) - { + foreach ($aAssociatedList as $sKey => $sValue) { $sHTML = $sHTML.'
'.$sValue.' ('.$sKey.')
'."\n"; } return $sHTML; @@ -62,13 +61,14 @@ function _one_row($aAddressLine){ - $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f'); + $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress']; echo ''."\n"; echo ' '.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name')."\n"; echo ' ' . $aAddressLine['class'].':'.$aAddressLine['type'] . "\n"; echo ' ' . osmLink($aAddressLine) . "\n"; - echo ' ' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "\n"; + echo ' ' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . "\n"; + echo ' ' . ($aAddressLine['admin_level'] < 15 ? $aAddressLine['admin_level'] : '') . "\n"; echo ' ' . format_distance($aAddressLine['distance'])."\n"; echo ' ' . detailsLink($aAddressLine,'details >') . "\n"; echo "\n"; @@ -96,7 +96,10 @@
-

+

+ + +

@@ -110,13 +113,13 @@ kv('Name' , hash_to_subtable($aPointDetails['aNames']) ); kv('Type' , $aPointDetails['class'].':'.$aPointDetails['type'] ); - kv('Last Updated' , $aPointDetails['indexed_date'] ); + kv('Last Updated' , (new DateTime('@'.$aPointDetails['indexed_epoch']))->format(DateTime::RFC822) ); kv('Admin Level' , $aPointDetails['admin_level'] ); kv('Rank' , $aPointDetails['rank_search_label'] ); if ($aPointDetails['calculated_importance']) { kv('Importance' , $aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)') ); } - kv('Coverage' , ($aPointDetails['isarea']=='t'?'Polygon':'Point') ); + kv('Coverage' , ($aPointDetails['isarea']?'Polygon':'Point') ); kv('Centre Point' , $aPointDetails['lat'].','.$aPointDetails['lon'] ); kv('OSM' , osmLink($aPointDetails) ); if ($aPointDetails['wikipedia']) @@ -124,6 +127,8 @@ kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) ); } + kv('Computed Postcode', $aPointDetails['postcode']); + kv('Address Tags' , hash_to_subtable($aPointDetails['aAddressTags']) ); kv('Extra Tags' , hash_to_subtable($aPointDetails['aExtraTags']) ); ?> @@ -147,6 +152,7 @@ Local name Type OSM + Address rank Admin level Distance @@ -155,13 +161,10 @@ - $aParentOfLines) - { + foreach ($aGroupedAddressLines as $sGroupHeading => $aHierarchyLines) { $sGroupHeading = ucwords($sGroupHeading); headline3($sGroupHeading); - foreach($aParentOfLines as $aAddressLine) - { + foreach ($aHierarchyLines as $aAddressLine) { _one_row($aAddressLine); } } - if (sizeof($aParentOfLines) >= 500) { + if (count($aHierarchyLines) >= 500) { echo '

There are more child objects which are not shown.

'; } } @@ -241,11 +237,11 @@ echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';'; $aPlace = array( - 'outlinestring' => $aPointDetails['outlinestring'], + 'asgeojson' => $aPointDetails['asgeojson'], 'lon' => $aPointDetails['lon'], 'lat' => $aPointDetails['lat'], ); - echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; + echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; ?>