X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f05ea577f42c5ad4a62ff25ec62fbb60c550ee26..e70f405abddfe5a8a7400424558071ebba769eda:/website/hierarchy.php diff --git a/website/hierarchy.php b/website/hierarchy.php old mode 100755 new mode 100644 index 7459b483..419a0474 --- a/website/hierarchy.php +++ b/website/hierarchy.php @@ -1,18 +1,16 @@ getSet('format', array('html', 'json'), 'html'); $aLangPrefOrder = $oParams->getPreferredLanguages(); -$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]"; +$sLanguagePrefArraySQL = 'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']'; $sPlaceId = $oParams->getString('place_id'); $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R')); @@ -25,7 +23,12 @@ if ($sOsmType && $iOsmId > 0) { // Be nice about our error messages for broken geometry if (!$sPlaceId) { - $aPointDetails = chksql($oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by updated desc limit 1")); + $sSQL = 'select osm_type, osm_id, errormessage, class, type,'; + $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname,"; + $sSQL .= ' ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom'; + $sSQL .= " from import_polygon_error where osm_type = '".$sOsmType; + $sSQL .= "' and osm_id = ".$iOsmId.' order by updated desc limit 1'; + $aPointDetails = chksql($oDB->getRow($sSQL)); if ($aPointDetails) { if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) { $aPointDetails['error_x'] = $aMatches[1]; @@ -37,7 +40,7 @@ if ($sOsmType && $iOsmId > 0) { } } -if (!$sPlaceId) userError("Please select a place id"); +if (!$sPlaceId) userError('Please select a place id'); $iPlaceID = (int)$sPlaceId; @@ -51,32 +54,32 @@ if (CONST_Use_Aux_Location_data) { if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; } -$oPlaceLookup = new PlaceLookup($oDB); -$oPlaceLookup->setLanguagePreference($aLangPrefOrder); -$oPlaceLookup->setIncludeAddressDetails(true); -$aPlaceAddress = array_reverse($oPlaceLookup->getAddressDetails($iPlaceID)); +$oAddressLookup = new AddressDetails($oDB, $iPlaceID, -1, $aLangPrefOrder); +$aPlaceAddress = array_reverse($oAddressLookup->getAddressDetails()); -if (!sizeof($aPlaceAddress)) userError("Unknown place id."); +if (empty($aPlaceAddress)) userError('Unknown place id.'); $aBreadcrums = array(); foreach ($aPlaceAddress as $i => $aPlace) { if (!$aPlace['place_id']) continue; - $aBreadcrums[] = array('placeId' => $aPlace['place_id'], - 'osmType' => $aPlace['osm_type'], - 'osmId' => $aPlace['osm_id'], - 'localName' => $aPlace['localname']); + $aBreadcrums[] = array( + 'placeId' => $aPlace['place_id'], + 'osmType' => $aPlace['osm_type'], + 'osmId' => $aPlace['osm_id'], + 'localName' => $aPlace['localname'] + ); if ($sOutputFormat == 'html') { $sPlaceUrl = 'hierarchy.php?place_id='.$aPlace['place_id']; - if ($i) echo " > "; + if ($i) echo ' > '; echo ''.$aPlace['localname'].' ('.osmLink($aPlace).')'; } } if ($sOutputFormat == 'json') { - header("content-type: application/json; charset=UTF-8"); + header('content-type: application/json; charset=UTF-8'); $aDetails = array(); $aDetails['breadcrumbs'] = $aBreadcrums; javascript_renderData($aDetails); @@ -85,27 +88,22 @@ if ($sOutputFormat == 'json') { $aRelatedPlaceIDs = chksql($oDB->getCol($sSQL = "select place_id from placex where linked_place_id = $iPlaceID or place_id = $iPlaceID")); -$sSQL = "select obj.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_area(geometry) as area, "; +$sSQL = 'select obj.place_id, osm_type, osm_id, class, type, housenumber, admin_level,'; +$sSQL .= " rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_area(geometry) as area, "; $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength "; -$sSQL .= " from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex "; -$sSQL .= " where parent_place_id in (".join(',',$aRelatedPlaceIDs).") and name is not null order by rank_address asc,rank_search asc limit 500) as obj"; -$sSQL .= " order by rank_address asc,rank_search asc,localname,class, type,housenumber"; +$sSQL .= ' from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex '; +$sSQL .= ' where parent_place_id in ('.join(',', $aRelatedPlaceIDs).') and name is not null order by rank_address asc,rank_search asc limit 500) as obj'; +$sSQL .= ' order by rank_address asc,rank_search asc,localname,class, type,housenumber'; $aParentOfLines = chksql($oDB->getAll($sSQL)); -if (sizeof($aParentOfLines)) { +if (!empty($aParentOfLines)) { echo '

Parent Of:

'; - $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; @@ -128,7 +126,7 @@ if (sizeof($aParentOfLines)) { echo ''; } } - if (sizeof($aParentOfLines) >= 500) { + if (count($aParentOfLines) >= 500) { echo '

There are more child objects which are not shown.

'; } echo '';