}
- function format_distance($fDistance)
+ function format_distance($fDistance, $bInMeters = false)
{
- // $fDistance is in meters
- if ($fDistance < 1)
- {
- return '0';
- }
- elseif ($fDistance < 1000)
- {
- return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance,0)).' m</abbr>';
- }
- else
- {
- return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance/1000,1)).' km</abbr>';
+ if ($bInMeters) {
+ // $fDistance is in meters
+ if ($fDistance < 1) {
+ return '0';
+ }
+ elseif ($fDistance < 1000) {
+ return '<abbr class="distance" title="'.$fDistance.' meters">~'.(round($fDistance,0)).' m</abbr>';
+ }
+ else {
+ return '<abbr class="distance" title="'.$fDistance.' meters">~'.(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>';
+ }
}
}
}
- function _one_row($aAddressLine){
- $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
+ function _one_row($aAddressLine, $bDistanceInMeters = false){
+ $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
- echo ' <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
+ echo ' <td class="name">'.(trim($aAddressLine['localname'])!==null?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
echo ' <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
echo ' <td>' . osmLink($aAddressLine) . "</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>' . format_distance($aAddressLine['distance'])."</td>\n";
+ echo ' <td>' . format_distance($aAddressLine['distance'], $bDistanceInMeters)."</td>\n";
echo ' <td>' . detailsLink($aAddressLine,'details >') . "</td>\n";
echo "</tr>\n";
}
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'])
{
headline('Linked Places');
foreach ($aLinkedLines as $aAddressLine) {
- _one_row($aAddressLine);
+ _one_row($aAddressLine, true);
}
}
-
-
if ($bIncludeKeywords)
{
headline('Name Keywords');
- foreach ($aPlaceSearchNameKeywords as $aRow) {
- _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+ if ($aPlaceSearchNameKeywords) {
+ foreach ($aPlaceSearchNameKeywords as $aRow) {
+ _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+ }
}
headline('Address Keywords');
- foreach ($aPlaceSearchAddressKeywords as $aRow) {
- _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+ if ($aPlaceSearchAddressKeywords) {
+ foreach ($aPlaceSearchAddressKeywords as $aRow) {
+ _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+ }
}
}
headline3($sGroupHeading);
foreach ($aHierarchyLines as $aAddressLine) {
- _one_row($aAddressLine);
+ _one_row($aAddressLine, true);
}
}
if (count($aHierarchyLines) >= 500) {