X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..4a28d28c086d7e4966bbf521e45cd7046cef9af6:/website/hierarchy.php diff --git a/website/hierarchy.php b/website/hierarchy.php index 959facc7..3ac4f323 100755 --- a/website/hierarchy.php +++ b/website/hierarchy.php @@ -4,15 +4,15 @@ require_once(dirname(dirname(__FILE__)).'/settings/settings.php'); require_once(CONST_BasePath.'/lib/init-website.php'); require_once(CONST_BasePath.'/lib/log.php'); -require_once(CONST_BasePath.'/lib/PlaceLookup.php'); +require_once(CONST_BasePath.'/lib/AddressDetails.php'); require_once(CONST_BasePath.'/lib/output.php'); ini_set('memory_limit', '200M'); -$oParams = new ParameterParser(); +$oParams = new Nominatim\ParameterParser(); $sOutputFormat = $oParams->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')); @@ -20,17 +20,19 @@ $iOsmId = $oParams->getInt('osmid', -1); $oDB =& getDB(); -if ($sOsmType && $iOsmId > 0) -{ +if ($sOsmType && $iOsmId > 0) { $sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc")); // 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")); + if (!$sPlaceId) { + $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)) - { + if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) { $aPointDetails['error_x'] = $aMatches[1]; $aPointDetails['error_y'] = $aMatches[2]; } @@ -40,51 +42,46 @@ if ($sOsmType && $iOsmId > 0) } } -if (!$sPlaceId) userError("Please select a place id"); +if (!$sPlaceId) userError('Please select a place id'); $iPlaceID = (int)$sPlaceId; -if (CONST_Use_US_Tiger_Data) -{ +if (CONST_Use_US_Tiger_Data) { $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID)); if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; } -if (CONST_Use_Aux_Location_data) -{ +if (CONST_Use_Aux_Location_data) { $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID)); 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) -{ +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']); - - if ($sOutputFormat == 'html') - { + $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"); +if ($sOutputFormat == 'json') { + header('content-type: application/json; charset=UTF-8'); $aDetails = array(); $aDetails['breadcrumbs'] = $aBreadcrums; javascript_renderData($aDetails); @@ -93,41 +90,30 @@ 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']; + foreach ($aParentOfLines as $aAddressLine) { + $aAddressLine['label'] = Nominatim\ClassTypes\getProperty($aAddressLine, 'label'); + if (!$aAddressLine['label']) { + $aAddressLine['label'] = ucwords($aAddressLine['type']); } - else $aAddressLine['label'] = ucwords($aAddressLine['type']); if (!isset($aGroupedAddressLines[$aAddressLine['label']])) $aGroupedAddressLines[$aAddressLine['label']] = array(); $aGroupedAddressLines[$aAddressLine['label']][] = $aAddressLine; } - foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines) - { + foreach ($aGroupedAddressLines as $sGroupHeading => $aParentOfLines) { echo "

$sGroupHeading

"; - foreach($aParentOfLines as $aAddressLine) - { + foreach ($aParentOfLines as $aAddressLine) { $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber']; $sOSMType = formatOSMType($aAddressLine['osm_type'], false); @@ -142,7 +128,7 @@ if (sizeof($aParentOfLines)) echo ''; } } - if (sizeof($aParentOfLines) >= 500) { + if (count($aParentOfLines) >= 500) { echo '

There are more child objects which are not shown.

'; } echo '';