X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e591269fd8c357b922f2809d21f726a2469788b3..6300d3619a6c429204c589a29a4abea88e15d47e:/lib/template/details-html.php diff --git a/lib/template/details-html.php b/lib/template/details-html.php index 83df4814..1da69301 100644 --- a/lib/template/details-html.php +++ b/lib/template/details-html.php @@ -82,7 +82,7 @@ { echo ''.$aPointDetails['icon'].''; } - echo $aPointDetails['localname'].''; + echo $aPointDetails['localname']."\n"; echo '
'; echo '
Name: '; foreach($aPointDetails['aNames'] as $sKey => $sValue) @@ -110,9 +110,9 @@ echo '
'.$sValue.' ('.$sKey.')
'; } echo '
'; - echo '
'; + echo "\n"; - echo '

Address

'; + echo "

Address

\n"; echo '
'; $iPrevRank = 1000000; $sPrevLocalName = ''; @@ -136,14 +136,14 @@ 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':''))); @@ -152,16 +152,16 @@ 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) @@ -169,7 +169,7 @@ echo '

Name Keywords

'; foreach($aPlaceSearchNameKeywords as $aRow) { - echo '
'.$aRow['word_token'].'
'; + echo '
'.$aRow['word_token']."
\n"; } } @@ -178,24 +178,28 @@ 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']; @@ -204,15 +208,12 @@ 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) {