also adapt uses of ClassTypes in website/

This commit is contained in:
Sarah Hoffmann
2020-05-17 16:32:42 +02:00
parent 528fe6553f
commit 859347523f
7 changed files with 10 additions and 12 deletions

View File

@@ -149,7 +149,7 @@ if (!$aPointDetails) {
}
$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)

View File

@@ -103,10 +103,8 @@ if (!empty($aParentOfLines)) {
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;

View File

@@ -58,7 +58,7 @@ foreach ($aOsmIds as $sItem) {
$oPlace['place_id'],
$oPlace['lon'],
$oPlace['lat'],
Nominatim\ClassTypes\getProperty($oPlace, 'defdiameter', 0.0001)
Nominatim\ClassTypes\getDefRadius($oPlace)
);
if ($aOutlineResult) {

View File

@@ -55,7 +55,7 @@ if (isset($aPlace)) {
$aPlace['place_id'],
$aPlace['lon'],
$aPlace['lat'],
Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
Nominatim\ClassTypes\getDefRadius($aPlace),
$fLat,
$fLon
);