diff --git a/lib/template/details-html.php b/lib/template/details-html.php index 1da69301..da36167c 100644 --- a/lib/template/details-html.php +++ b/lib/template/details-html.php @@ -1,172 +1,196 @@ - - - - OpenStreetMap Nominatim: <?php echo $aPointDetails['localname'];?> - - - - - - -
'; - if ($aPointDetails['icon']) - { - echo ''.$aPointDetails['icon'].''; - } - echo $aPointDetails['localname']."\n"; - echo '
'; - echo '
Name: '; - foreach($aPointDetails['aNames'] as $sKey => $sValue) - { - echo '
'.$sValue.' ('.$sKey.')
'; - } - 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['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 ($aPointDetails['wikipedia']) - { - list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aPointDetails['wikipedia']); - echo '
Wikipedia Calculated: '.$aPointDetails['wikipedia'].'
'; - } - echo '
Extra Tags: '; - foreach($aPointDetails['aExtraTags'] as $sKey => $sValue) - { - echo '
'.$sValue.' ('.$sKey.')
'; - } - echo '
'; - echo "
\n"; - echo "

Address

\n"; - echo '
'; - $iPrevRank = 1000000; - $sPrevLocalName = ''; - foreach($aAddressLines as $aAddressLine) - { - $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':''))); + function headline($sTitle) + { + echo "

".$sTitle."

\n"; + } - echo '
'; - if (!($iPrevRank<=$aAddressLine['rank_address'] || $sPrevLocalName == $aAddressLine['localname'])) - { - $iPrevRank = $aAddressLine['rank_address']; - $sPrevLocalName = $aAddressLine['localname']; + 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'].''; } - echo ''.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').''; - echo ' ('; - echo 'Type: '.$aAddressLine['class'].':'.$aAddressLine['type'].''; - 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 "
\n"; + return ''; } - echo "
\n"; + + 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) + { + return'~'.(round($fDistance,1)).' km'; + } + + function kv($sKey,$sValue) + { + echo ' ' . $sKey . ''.$sValue.''. "\n"; + } + + + function hash_to_subtable($aAssociatedList) + { + $sHTML = ''; + foreach($aAssociatedList as $sKey => $sValue) + { + $sHTML = $sHTML.'
'.$sValue.' ('.$sKey.')
'."\n"; + } + 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){ + echo ''.$sIcon.''; + } + } + + + function _one_row($aAddressLine){ + $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f'); + + echo ''; + echo ' '.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').''; + echo ' ' . $aAddressLine['class'].':'.$aAddressLine['type'] . ''; + echo ' ' . osm_link($aAddressLine) . ''; + echo ' ' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . ''; + // echo '' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') .''; + // echo ', '.($aAddressLine['fromarea']=='t'?'Polygon':'Point').''; + echo ' ' . format_distance($aAddressLine['distance']).'';; + echo ' ' . nominatim_link($aAddressLine,'details >') . '';; + echo "\n"; + } + +?> + + + + +
+
+
+

+
+
+ +
+
+
+
+ + + + +
+
+ +
+
+
+ +
+
+
+ +

Address

+ + + + + + + + + + + + + + + + + + +
Local nameTypeOSMAdmin levelDistance
+ + +Linked Places\n"; - echo '
'; + headline('Linked Places'); + echo ''; foreach($aLinkedLines as $aAddressLine) { - $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':''))); - - echo '
'; - 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 (isset($aAddressLine['rank_search_label'])) echo ', '.$aAddressLine['rank_search_label'].''; -// echo ', '.($aAddressLine['fromarea']=='t'?'Polygon':'Point').''; - echo ', '.$aAddressLine['distance'].''; - echo ' GOTO'; - echo ')'; - echo "
\n"; + _one_row($aAddressLine); } - echo "\n"; + echo '
'; } + + if ($aPlaceSearchNameKeywords) { - echo '

Name Keywords

'; + headline('Name Keywords'); foreach($aPlaceSearchNameKeywords as $aRow) { echo '
'.$aRow['word_token']."
\n"; @@ -175,7 +199,7 @@ if ($aPlaceSearchAddressKeywords) { - echo '

Address Keywords

'; + headline('Address Keywords'); foreach($aPlaceSearchAddressKeywords as $aRow) { echo '
'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."
\n"; @@ -184,7 +208,7 @@ if (sizeof($aParentOfLines)) { - echo "

Parent Of:

\n
\n"; + headline('Parent Of'); $aGroupedAddressLines = array(); foreach($aParentOfLines as $aAddressLine) @@ -200,31 +224,46 @@ { $sGroupHeading = ucwords($sGroupHeading); echo "

$sGroupHeading

\n"; - foreach($aParentOfLines as $aAddressLine) - { - $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber']; - $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':''))); - - echo '
'; - echo ''.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').''; - echo ' ('; - echo ''.($aAddressLine['isarea']=='t'?'Polygon':'Point').''; - echo ', ~'.(round($aAddressLine['distance']*69,1)).' miles'; - if ($sOSMType) echo ', '.$sOSMType.' '.$aAddressLine['osm_id'].''; - echo ', GOTO'; - echo ')'; - echo "
\n"; - } + + echo ''; + foreach($aParentOfLines as $aAddressLine) + { + _one_row($aAddressLine); + } + echo '
'; } if (sizeof($aParentOfLines) >= 500) { echo '

There are more child objects which are not shown.

'; } - echo '
'; } -// echo '

Other Parts:

'; -// echo '

Linked To:

'; + // headline('Other Parts'); + // headline('Linked To'); ?> +
+
+
+ + + + + + + + + diff --git a/lib/template/includes/html-header.php b/lib/template/includes/html-header.php index 8662faf0..0832bff3 100644 --- a/lib/template/includes/html-header.php +++ b/lib/template/includes/html-header.php @@ -9,5 +9,3 @@ - - diff --git a/lib/template/includes/introduction.php b/lib/template/includes/introduction.php index 39425b53..7a76a959 100644 --- a/lib/template/includes/introduction.php +++ b/lib/template/includes/introduction.php @@ -1,2 +1,2 @@ -

This is Nominatim

- abc def +

This is Nominatim

+abc def diff --git a/lib/template/search-html.php b/lib/template/search-html.php index 88ca5f7a..91e9e890 100644 --- a/lib/template/search-html.php +++ b/lib/template/search-html.php @@ -1,9 +1,12 @@ + + + + -
@@ -58,62 +61,57 @@
- - -
+ + + + + + +
+
+
+
+ +