X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/77bbbd24983356f388d1ae1ad2dc44a8472c3ce2..b145dadd63527936fc1c3d1787fd7dd2b465aa2d:/lib/template/details-html.php diff --git a/lib/template/details-html.php b/lib/template/details-html.php index 9c967fff..1da69301 100644 --- a/lib/template/details-html.php +++ b/lib/template/details-html.php @@ -1,40 +1,15 @@ - + + OpenStreetMap Nominatim: <?php echo $aPointDetails['localname'];?> - - - + + + @@ -102,9 +80,9 @@ body { echo '

'; if ($aPointDetails['icon']) { - echo ''; + echo ''.$aPointDetails['icon'].''; } - echo $aPointDetails['localname'].'

'; + echo $aPointDetails['localname']."\n"; echo '
'; echo '
Name: '; foreach($aPointDetails['aNames'] as $sKey => $sValue) @@ -113,12 +91,14 @@ body { } echo '
'; echo '
Type: '.$aPointDetails['class'].':'.$aPointDetails['type'].'
'; + echo '
Last Updated: '.$aPointDetails['indexed_date'].'
'; echo '
Admin Level: '.$aPointDetails['admin_level'].'
'; echo '
Rank: '.$aPointDetails['rank_search_label'].'
'; - if ($aPointDetails['importance']) echo '
Importance: '.$aPointDetails['importance'].'
'; + if ($aPointDetails['calculated_importance']) echo '
Importance: '.$aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)').'
'; echo '
Coverage: '.($aPointDetails['isarea']=='t'?'Polygon':'Point').'
'; + echo '
Centre Point: '.$aPointDetails['lat'].','.$aPointDetails['lon'].'
'; $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':''))); - if ($sOSMType) echo '
OSM: '.$sOSMType.' '.$aPointDetails['osm_id'].'
'; + if ($sOSMType) echo '
OSM: '.$sOSMType.' '.$aPointDetails['osm_id'].'
'; if ($aPointDetails['wikipedia']) { list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aPointDetails['wikipedia']); @@ -130,10 +110,10 @@ body { echo '
'.$sValue.' ('.$sKey.')
'; } echo '
'; - echo ''; + echo "\n"; - echo '

Address

'; - echo '
'; + echo "

Address

\n"; + echo '
'; $iPrevRank = 1000000; $sPrevLocalName = ''; foreach($aAddressLines as $aAddressLine) @@ -149,21 +129,21 @@ body { echo ''.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').''; echo ' ('; echo 'Type: '.$aAddressLine['class'].':'.$aAddressLine['type'].''; - if ($sOSMType) echo ', '.$sOSMType.' '.$aAddressLine['osm_id'].''; - echo ', '.$aAddressLine['admin_level'].''; + if ($sOSMType) echo ', '.$sOSMType.' '.$aAddressLine['osm_id'].''; + if (isset($aAddressLine['admin_level'])) echo ', '.$aAddressLine['admin_level'].''; if (isset($aAddressLine['rank_search_label'])) echo ', '.$aAddressLine['rank_search_label'].''; // echo ', '.($aAddressLine['fromarea']=='t'?'Polygon':'Point').''; echo ', '.$aAddressLine['distance'].''; echo ' GOTO'; echo ')'; - echo '
'; + echo "
\n"; } - echo ''; + echo "\n"; if ($aLinkedLines) { - echo '

Linked Places

'; - echo '
'; + echo "

Linked Places

\n"; + echo '
'; foreach($aLinkedLines as $aAddressLine) { $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':''))); @@ -172,16 +152,16 @@ body { echo ''.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').''; echo ' ('; echo 'Type: '.$aAddressLine['class'].':'.$aAddressLine['type'].''; - if ($sOSMType) echo ', '.$sOSMType.' '.$aAddressLine['osm_id'].''; + if ($sOSMType) echo ', '.$sOSMType.' '.$aAddressLine['osm_id'].''; echo ', '.$aAddressLine['admin_level'].''; - echo ', '.$aAddressLine['rank_search_label'].''; + if (isset($aAddressLine['rank_search_label'])) echo ', '.$aAddressLine['rank_search_label'].''; // echo ', '.($aAddressLine['fromarea']=='t'?'Polygon':'Point').''; echo ', '.$aAddressLine['distance'].''; echo ' GOTO'; echo ')'; - echo '
'; + echo "
\n"; } - echo ''; + echo "\n"; } if ($aPlaceSearchNameKeywords) @@ -189,7 +169,7 @@ body { echo '

Name Keywords

'; foreach($aPlaceSearchNameKeywords as $aRow) { - echo '
'.$aRow['word_token'].'
'; + echo '
'.$aRow['word_token']."
\n"; } } @@ -198,24 +178,28 @@ body { echo '

Address Keywords

'; foreach($aPlaceSearchAddressKeywords as $aRow) { - echo '
'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'.'
'; + echo '
'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."
\n"; } } if (sizeof($aParentOfLines)) { - echo '

Parent Of:

'; + echo "

Parent Of:

\n
\n"; $aGroupedAddressLines = array(); foreach($aParentOfLines as $aAddressLine) { - if (!isset($aGroupedAddressLines[$aAddressLine['type']])) $aGroupedAddressLines[$aAddressLine['type']] = array(); - $aGroupedAddressLines[$aAddressLine['type']][] = $aAddressLine; + if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class']; + else $sType = $aAddressLine['type']; + + if (!isset($aGroupedAddressLines[$sType])) + $aGroupedAddressLines[$sType] = array(); + $aGroupedAddressLines[$sType][] = $aAddressLine; } foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines) { $sGroupHeading = ucwords($sGroupHeading); - echo "

$sGroupHeading

"; + echo "

$sGroupHeading

\n"; foreach($aParentOfLines as $aAddressLine) { $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber']; @@ -224,15 +208,12 @@ body { echo '
'; echo ''.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').''; echo ' ('; -// echo 'Type: '.$aAddressLine['class'].':'.$aAddressLine['type'].''; -// echo ', '.$aAddressLine['admin_level'].''; -// echo ', '.$aAddressLine['rank_address'].''; echo ''.($aAddressLine['isarea']=='t'?'Polygon':'Point').''; echo ', ~'.(round($aAddressLine['distance']*69,1)).' miles'; - if ($sOSMType) echo ', '.$sOSMType.' '.$aAddressLine['osm_id'].''; + if ($sOSMType) echo ', '.$sOSMType.' '.$aAddressLine['osm_id'].''; echo ', GOTO'; echo ')'; - echo '
'; + echo "
\n"; } } if (sizeof($aParentOfLines) >= 500) {