X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/984e91e519795fabc0dddbd588f99dfd4cfed896..626e3238f27d972614ad3c0e978605facf0f9bd2:/lib/template/details-html.php
diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 00d6ba63..f0798773 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -20,20 +20,25 @@
}
- function format_distance($fDistance)
+ function format_distance($fDistance, $bInMeters = false)
{
- // $fDistance is in meters
- if ($fDistance < 1)
- {
- return '0';
- }
- elseif ($fDistance < 1000)
- {
- return'~'.(round($fDistance,0)).' m';
- }
- else
- {
- return'~'.(round($fDistance/1000,1)).' km';
+ if ($bInMeters) {
+ // $fDistance is in meters
+ if ($fDistance < 1) {
+ return '0';
+ }
+ elseif ($fDistance < 1000) {
+ return '~'.(round($fDistance,0)).' m';
+ }
+ else {
+ return '~'.(round($fDistance/1000,1)).' km';
+ }
+ } else {
+ if ($fDistance == 0) {
+ return '0';
+ } else {
+ return ''.(round($fDistance,4)).'';
+ }
}
}
@@ -46,8 +51,7 @@
function hash_to_subtable($aAssociatedList)
{
$sHTML = '';
- foreach($aAssociatedList as $sKey => $sValue)
- {
+ foreach ($aAssociatedList as $sKey => $sValue) {
$sHTML = $sHTML.'
'.$sValue.' ('.$sKey.')
'."\n";
}
return $sHTML;
@@ -61,16 +65,16 @@
}
- function _one_row($aAddressLine){
- $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
+ function _one_row($aAddressLine, $bDistanceInMeters = false){
+ $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
echo ''."\n";
- echo ' '.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name')." | \n";
+ echo ' '.(trim($aAddressLine['localname'])!==null?$aAddressLine['localname']:'No Name')." | \n";
echo ' ' . $aAddressLine['class'].':'.$aAddressLine['type'] . " | \n";
echo ' ' . osmLink($aAddressLine) . " | \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 ' ' . format_distance($aAddressLine['distance'], $bDistanceInMeters)." | \n";
echo ' ' . detailsLink($aAddressLine,'details >') . " | \n";
echo "
\n";
}
@@ -114,13 +118,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'])
@@ -162,13 +166,10 @@
-
$aParentOfLines)
- {
+ foreach ($aGroupedAddressLines as $sGroupHeading => $aHierarchyLines) {
$sGroupHeading = ucwords($sGroupHeading);
headline3($sGroupHeading);
- foreach($aParentOfLines as $aAddressLine)
- {
- _one_row($aAddressLine);
+ foreach ($aHierarchyLines as $aAddressLine) {
+ _one_row($aAddressLine, true);
}
}
- if (count($aParentOfLines) >= 500) {
+ if (count($aHierarchyLines) >= 500) {
echo 'There are more child objects which are not shown.
';
}
}
@@ -252,7 +246,7 @@
'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) . ';';
?>