encapsulate icon URL in a function

This commit is contained in:
Sarah Hoffmann
2020-05-17 16:45:46 +02:00
parent 859347523f
commit 3a2ddbe2e0
5 changed files with 24 additions and 8 deletions

View File

@@ -57,10 +57,12 @@
return $sHTML;
}
function map_icon($sIcon)
function map_icon($aPlace)
{
$sIcon = Nominatim\ClassTypes\getIconFile($aPlace);
if (isset($sIcon)) {
echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
$sLabel = Nominatim\ClassTypes\getIcon($aPlace);
echo '<img id="mapicon" src="'.$sIcon.'" alt="'.$sLabel.'" />';
}
}
@@ -112,7 +114,7 @@
</h1>
</div>
<div class="col-sm-2 text-right">
<?php map_icon($aPointDetails['icon']) ?>
<?php map_icon($aPointDetails) ?>
</div>
</div>
<div class="row">

View File

@@ -26,8 +26,9 @@ $aPlaceDetails['calculated_importance'] = (float) $aPointDetails['calculated_imp
$aPlaceDetails['extratags'] = $aPointDetails['aExtraTags'];
$aPlaceDetails['calculated_wikipedia'] = $aPointDetails['wikipedia'];
if (isset($aPointDetails['icon'])) {
$aPlaceDetails['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png';
$sIcon = Nominatim\ClassTypes\getIconFile($aPointDetails);
if (isset($sIcon)) {
$aPlaceDetails['icon'] = $sIcon;
}
$aPlaceDetails['rank_address'] = (int) $aPointDetails['rank_address'];