X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/26bd8304c65746b59dd45fc0965343fb3637f6f8..eeb26aaa6fb4010fcbe34decbf3efc8c42995d1c:/lib/template/details-html.php?ds=sidebyside
diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 328786e2..cfba6eb3 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -61,10 +61,10 @@
function _one_row($aAddressLine){
- $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
+ $bNotUsed = isset($aAddressLine['isaddress']) && !$aAddressLine['isaddress'];
echo '
'."\n";
- echo ' '.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name')." | \n";
+ echo ' '.(trim($aAddressLine['localname'])!==null?$aAddressLine['localname']:'No Name')." | \n";
echo ' ' . $aAddressLine['class'].':'.$aAddressLine['type'] . " | \n";
echo ' ' . osmLink($aAddressLine) . " | \n";
echo ' ' . (isset($aAddressLine['rank_address']) ? $aAddressLine['rank_address'] : '') . " | \n";
@@ -119,7 +119,7 @@
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) );
if ($aPointDetails['wikipedia'])
@@ -177,18 +177,20 @@
}
}
-
-
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']);
+ }
}
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']);
+ }
}
}