hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 02:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

move ClassTypes into own namespace

Browse Source 
Also adds some convenience functions for lookups.
This commit is contained in:
Sarah Hoffmann
2018-07-09 23:20:46 +02:00
parent 879f818d81
commit 320d488627
7 changed files with 409 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/details.php
View File

@@ -135,15 +135,7 @@ if (!$aPointDetails) {
}
$aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
$aClassType = getClassTypesWithImportance();
$sPointClassType = $aPointDetails['class'].':'.$aPointDetails['type'];
if (isset($aClassType[$sPointClassType]) && $aClassType[$sPointClassType]['icon']) {
$aPointDetails['icon'] = $aClassType[$sPointClassType]['icon'];
} else {
$aPointDetails['icon'] = false;
}
$aPointDetails['icon'] = Nominatim\ClassTypes\getProperty($aPointDetails, 'icon', false);
// Get all alternative names (languages, etc)
$sSQL = 'SELECT (each(name)).key,(each(name)).value FROM placex ';

14
website/hierarchy.php
View File

@@ -102,18 +102,12 @@ $aParentOfLines = chksql($oDB->getAll($sSQL));
if (!empty($aParentOfLines)) {
echo '<h2>Parent Of:</h2>';
$aClassType = getClassTypesWithImportance();
$aGroupedAddressLines = array();
foreach ($aParentOfLines as $aAddressLine) {
if (isset($aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label'])
&& $aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label']
) {
$aAddressLine['label'] = $aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label'];
} elseif (isset($aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label'])
&& $aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label']
) {
$aAddressLine['label'] = $aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label'];
} else $aAddressLine['label'] = ucwords($aAddressLine['type']);
$aAddressLine['label'] = Nominatim\ClassTypes\getProperty($aAddressLine, 'label');
if (!$aAddressLine['label']) {
$aAddressLine['label'] = ucwords($aAddressLine['type']);
}
if (!isset($aGroupedAddressLines[$aAddressLine['label']])) $aGroupedAddressLines[$aAddressLine['label']] = array();
$aGroupedAddressLines[$aAddressLine['label']][] = $aAddressLine;

3
website/reverse.php
View File

@@ -54,12 +54,11 @@ if ($sOsmType && $iOsmId > 0) {
}
if (isset($aPlace)) {
$fRadius = $fDiameter = getResultDiameter($aPlace);
$aOutlineResult = $oPlaceLookup->getOutlines(
$aPlace['place_id'],
$aPlace['lon'],
$aPlace['lat'],
$fRadius,
Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
$fLat,
$fLon
);