hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 05:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

details page: differentiate between spheric distance and distance in meters

Browse Source
This commit is contained in:
marc tobias
2019-12-11 00:49:32 +01:00
parent f8bd4f5133
commit 626e3238f2
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/template/details-html.php
View File

@@ -20,20 +20,25 @@
} }
function format_distance($fDistance) function format_distance($fDistance, $bInMeters = false)
{ {
// $fDistance is in meters if ($bInMeters) {
if ($fDistance < 1) // $fDistance is in meters
{ if ($fDistance < 1) {
return '0'; return '0';
} }
elseif ($fDistance < 1000) elseif ($fDistance < 1000) {
{ return '<abbr class="distance" title="'.$fDistance.' meters">~'.(round($fDistance,0)).' m</abbr>';
return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance,0)).' m</abbr>'; }
} else {
else return '<abbr class="distance" title="'.$fDistance.' meters">~'.(round($fDistance/1000,1)).' km</abbr>';
{ }
return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance/1000,1)).' km</abbr>'; } else {
if ($fDistance == 0) {
return '0';
} else {
return '<abbr class="distance" title="spheric distance '.$fDistance.'">'.(round($fDistance,4)).'</abbr>';
}
} }
} }
@@ -60,7 +65,7 @@
} }
function _one_row($aAddressLine){ function _one_row($aAddressLine, $bDistanceInMeters = false){
$bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress']; $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n"; echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
@@ -69,7 +74,7 @@
echo ' <td>' . osmLink($aAddressLine) . "</td>\n"; echo ' <td>' . osmLink($aAddressLine) . "</td>\n";
echo ' <td>' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . "</td>\n"; echo ' <td>' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . "</td>\n";
echo ' <td>' . ($aAddressLine['admin_level'] < 15 ? $aAddressLine['admin_level'] : '') . "</td>\n"; echo ' <td>' . ($aAddressLine['admin_level'] < 15 ? $aAddressLine['admin_level'] : '') . "</td>\n";
echo ' <td>' . format_distance($aAddressLine['distance'])."</td>\n"; echo ' <td>' . format_distance($aAddressLine['distance'], $bDistanceInMeters)."</td>\n";
echo ' <td>' . detailsLink($aAddressLine,'details &gt;') . "</td>\n"; echo ' <td>' . detailsLink($aAddressLine,'details &gt;') . "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
} }
@@ -173,7 +178,7 @@
{ {
headline('Linked Places'); headline('Linked Places');
foreach ($aLinkedLines as $aAddressLine) { foreach ($aLinkedLines as $aAddressLine) {
_one_row($aAddressLine); _one_row($aAddressLine, true);
} }
} }
@@ -212,7 +217,7 @@
headline3($sGroupHeading); headline3($sGroupHeading);
foreach ($aHierarchyLines as $aAddressLine) { foreach ($aHierarchyLines as $aAddressLine) {
_one_row($aAddressLine); _one_row($aAddressLine, true);
} }
} }
if (count($aHierarchyLines) >= 500) { if (count($aHierarchyLines) >= 500) {