foreach ($aSearchResults as $iIdx => $aResult) {
$fRadius = ClassTypes\getDefRadius($aResult);
- $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter);
+ $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fRadius);
if ($aOutlineResult) {
$aResult = array_merge($aResult, $aOutlineResult);
}
// Is there an icon set for this type of result?
$sIcon = ClassTypes\getIcon($aResult);
if (isset($sIcon)) {
- $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aIcon.'.p.20.png';
+ $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.p.20.png';
}
$sLabel = ClassTypes\getLabel($aResult);
// - number of exact matches from the query
$aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
// - importance of the class/type
- $iClassImportance = ClassTypes/getImportance($aResult);
+ $iClassImportance = ClassTypes\getImportance($aResult);
if (isset($iClassImportance)) {
$aResult['foundorder'] += 0.0001 * $iClassImportance;
} else {
function map_icon($sIcon)
{
- if ($sIcon){
+ if (isset($sIcon)) {
echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
}
}
$aPlaceDetails['extratags'] = $aPointDetails['aExtraTags'];
$aPlaceDetails['calculated_wikipedia'] = $aPointDetails['wikipedia'];
-if ($aPointDetails['icon']) {
+if (isset($aPointDetails['icon'])) {
$aPlaceDetails['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png';
}
}
$aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
-$aPointDetails['icon'] = Nominatim\ClassTypes\getProperty($aPointDetails, 'icon', false);
+$aPointDetails['icon'] = Nominatim\ClassTypes\getIcon($aPointDetails);
$aPointDetails['rank_search_label'] = getSearchRankLabel($aPointDetails['rank_search']); // only used in HTML format
// Get all alternative names (languages, etc)
echo '<h2>Parent Of:</h2>';
$aGroupedAddressLines = array();
foreach ($aParentOfLines as $aAddressLine) {
- $aAddressLine['label'] = Nominatim\ClassTypes\getProperty($aAddressLine, 'label');
- if (!$aAddressLine['label']) {
- $aAddressLine['label'] = ucwords($aAddressLine['type']);
- }
+ $aAddressLine['label'] = Nominatim\ClassTypes\getLabel($aAddressLine)
+ ?? ucwords($aAddressLine['type']);
if (!isset($aGroupedAddressLines[$aAddressLine['label']])) $aGroupedAddressLines[$aAddressLine['label']] = array();
$aGroupedAddressLines[$aAddressLine['label']][] = $aAddressLine;
$oPlace['place_id'],
$oPlace['lon'],
$oPlace['lat'],
- Nominatim\ClassTypes\getProperty($oPlace, 'defdiameter', 0.0001)
+ Nominatim\ClassTypes\getDefRadius($oPlace)
);
if ($aOutlineResult) {
$aPlace['place_id'],
$aPlace['lon'],
$aPlace['lat'],
- Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
+ Nominatim\ClassTypes\getDefRadius($aPlace),
$fLat,
$fLon
);