}
- 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 hash_to_subtable($aAssociatedList)
{
$sHTML = '';
- foreach($aAssociatedList as $sKey => $sValue)
- {
+ foreach ($aAssociatedList as $sKey => $sValue) {
$sHTML = $sHTML.' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>'."\n";
}
return $sHTML;
}
- function map_icon($sIcon)
+ function map_icon($aPlace)
{
- if ($sIcon){
- echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
+ $sIcon = Nominatim\ClassTypes\getIconFile($aPlace);
+ if (isset($sIcon)) {
+ $sLabel = Nominatim\ClassTypes\getIcon($aPlace);
+ echo '<img id="mapicon" src="'.$sIcon.'" alt="'.$sLabel.'" />';
}
}
- 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>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</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'];
+ if ($aAddressLine['type'] == 'administrative'
+ && isset($aAddressLine['place_type']))
+ {
+ echo '('.$aAddressLine['place_type'].')';
+ }
+ echo "</td>\n";
echo ' <td>' . osmLink($aAddressLine) . "</td>\n";
- echo ' <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "</td>\n";
- echo ' <td>' . format_distance($aAddressLine['distance'])."</td>\n";
- echo ' <td>' . detailsLink($aAddressLine,'details >') . "</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'], $bDistanceInMeters)."</td>\n";
+ echo ' <td>' . detailsPermaLink($aAddressLine,'details >') . "</td>\n";
echo "</tr>\n";
}
<div class="container">
<div class="row">
<div class="col-sm-10">
- <h1><?php echo $aPointDetails['localname'] ?></h1>
+ <h1>
+ <?php echo $aPointDetails['localname'] ?>
+ </h1>
</div>
<div class="col-sm-2 text-right">
- <?php map_icon($aPointDetails['icon']) ?>
+ <?php map_icon($aPointDetails) ?>
</div>
</div>
<div class="row">
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) );
+ kv('Place Id (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)'
+ , $aPointDetails['place_id'] );
if ($aPointDetails['wikipedia'])
{
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']) );
?>
<td>Local name</td>
<td>Type</td>
<td>OSM</td>
+ <td>Address rank</td>
<td>Admin level</td>
<td>Distance</td>
<td></td>
<tbody>
<?php
-
- foreach($aAddressLines as $aAddressLine)
- {
+ foreach ($aAddressLines as $aAddressLine) {
_one_row($aAddressLine);
}
?>
-
<?php
if ($aLinkedLines)
{
headline('Linked Places');
- foreach($aLinkedLines as $aAddressLine)
- {
- _one_row($aAddressLine);
+ foreach ($aLinkedLines as $aAddressLine) {
+ _one_row($aAddressLine, true);
}
}
-
-
- if ($aPlaceSearchNameKeywords)
+ 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']);
+ }
}
- }
- if ($aPlaceSearchAddressKeywords)
- {
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']);
+ }
}
}
-
- if (sizeof($aParentOfLines))
+
+ if (!empty($aHierarchyLines))
{
headline('Parent Of');
$aGroupedAddressLines = array();
- foreach($aParentOfLines as $aAddressLine)
- {
+ foreach ($aHierarchyLines as $aAddressLine) {
if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
else $sType = $aAddressLine['type'];
$aGroupedAddressLines[$sType] = array();
$aGroupedAddressLines[$sType][] = $aAddressLine;
}
- foreach($aGroupedAddressLines as $sGroupHeading => $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 (sizeof($aParentOfLines) >= 500) {
+ if (count($aHierarchyLines) >= 500) {
echo '<p>There are more child objects which are not shown.</p>';
}
}
'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) . ';';
?>
projects / nominatim.git / blobdiff