X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c2b68c337b398aff21bc04d51b83f42608bbbbc8..797c2d1e74a14d8d52d963f1efad9be53fca5f5f:/lib/template/details-html.php diff --git a/lib/template/details-html.php b/lib/template/details-html.php index d5c18252..71fcc7b3 100644 --- a/lib/template/details-html.php +++ b/lib/template/details-html.php @@ -6,8 +6,6 @@ - -

".$sTitle."

\n"; } - function osm_link($aFeature) - { - $sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':''))); - if ($sOSMType) - { - return ''.$sOSMType.' '.$aFeature['osm_id'].''; - } - return ''; - } - - function wikipedia_link($aFeature) - { - if ($aFeature['wikipedia']) - { - list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aFeature['wikipedia']); - return ''.$aFeature['wikipedia'].''; - } - return ''; - } - - function nominatim_link($aFeature, $sTitle) - { - return ''.$sTitle.''; - } function format_distance($fDistance) { @@ -79,18 +53,6 @@ return $sHTML; } - // function hash_to_subtable($aAssociatedList) - // { - // $sHTML = ''; - // foreach($aAssociatedList as $sKey => $sValue) - // { - // $sHTML = $sHTML . ''."\n"; - // } - // $sHTML = $sHTML . '
'.$sKey.''.$sValue.'
'; - // return $sHTML; - // } - - function map_icon($sIcon) { if ($sIcon){ @@ -105,20 +67,32 @@ echo ''."\n"; echo ' '.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name')."\n"; echo ' ' . $aAddressLine['class'].':'.$aAddressLine['type'] . "\n"; - echo ' ' . osm_link($aAddressLine) . "\n"; + echo ' ' . osmLink($aAddressLine) . "\n"; echo ' ' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "\n"; - // echo '' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') ."\n"; - // echo ', '.($aAddressLine['fromarea']=='t'?'Polygon':'Point').''; echo ' ' . format_distance($aAddressLine['distance'])."\n"; - echo ' ' . nominatim_link($aAddressLine,'details >') . "\n"; + echo ' ' . detailsLink($aAddressLine,'details >') . "\n"; echo "\n"; } + function _one_keyword_row($keyword_token,$word_id){ + echo "\n"; + echo ''; + // mark partial tokens (those starting with a space) with a star for readability + echo ($keyword_token[0]==' '?'*':''); + echo $keyword_token; + if (isset($word_id)) + { + echo 'word id: '.$word_id; + } + echo "\n"; + } + ?> +
@@ -144,10 +118,10 @@ } kv('Coverage' , ($aPointDetails['isarea']=='t'?'Polygon':'Point') ); kv('Centre Point' , $aPointDetails['lat'].','.$aPointDetails['lon'] ); - kv('OSM' , osm_link($aPointDetails) ); + kv('OSM' , osmLink($aPointDetails) ); if ($aPointDetails['wikipedia']) { - kv('Wikipedia Calculated' , wikipedia_link($aPointDetails) ); + kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) ); } kv('Extra Tags' , hash_to_subtable($aPointDetails['aExtraTags']) ); @@ -174,7 +148,6 @@ Type OSM Admin level - Distance @@ -209,7 +182,7 @@ headline('Name Keywords'); foreach($aPlaceSearchNameKeywords as $aRow) { - echo '
'.$aRow['word_token']."
\n"; + _one_keyword_row($aRow['word_token'], $aRow['word_id']); } } @@ -218,7 +191,7 @@ headline('Address Keywords'); foreach($aPlaceSearchAddressKeywords as $aRow) { - echo '
'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."
\n"; + _one_keyword_row($aRow['word_token'], $aRow['word_id']); } } @@ -251,9 +224,6 @@ } } - // headline('Other Parts'); - // headline('Linked To'); - echo "\n"; ?> @@ -262,13 +232,23 @@