From b838f66dd7d43826057650c63fe62c4d69fd6682 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 27 Oct 2020 10:38:08 +0100 Subject: [PATCH] remove hierarchy endpoint This endpoint was never maintained and most of the information can be obtained via the details endpoint. --- CMakeLists.txt | 1 - website/hierarchy.php | 134 ------------------------------------------ 2 files changed, 135 deletions(-) delete mode 100644 website/hierarchy.php diff --git a/CMakeLists.txt b/CMakeLists.txt index 43721cc4..cb137341 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,6 @@ if (BUILD_API) set(WEBSITESCRIPTS website/deletable.php website/details.php - website/hierarchy.php website/lookup.php website/polygons.php website/reverse.php diff --git a/website/hierarchy.php b/website/hierarchy.php deleted file mode 100644 index 66699f55..00000000 --- a/website/hierarchy.php +++ /dev/null @@ -1,134 +0,0 @@ -getSet('format', array('html', 'json'), 'html'); -$aLangPrefOrder = $oParams->getPreferredLanguages(); - - -$sPlaceId = $oParams->getString('place_id'); -$sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R')); -$iOsmId = $oParams->getInt('osmid', -1); - -$oDB = new Nominatim\DB(); -$oDB->connect(); - -$sLanguagePrefArraySQL = $oDB->getArraySQL($oDB->getDBQuotedList($aLangPrefOrder)); - -if ($sOsmType && $iOsmId > 0) { - $sPlaceId = $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) { - $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 = $oDB->getRow($sSQL); - if ($aPointDetails) { - if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) { - $aPointDetails['error_x'] = $aMatches[1]; - $aPointDetails['error_y'] = $aMatches[2]; - } - include(CONST_BasePath.'/lib/template/details-error-'.$sOutputFormat.'.php'); - exit; - } - } -} - -if (!$sPlaceId) userError('Please select a place id'); - -$iPlaceID = (int)$sPlaceId; - -if (CONST_Use_US_Tiger_Data) { - $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID); - if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; -} - -if (CONST_Use_Aux_Location_data) { - $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID); - if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; -} - - -$oAddressLookup = new Nominatim\AddressDetails($oDB, $iPlaceID, -1, $aLangPrefOrder); -$aPlaceAddress = array_reverse($oAddressLookup->getAddressDetails()); - -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'] - ); - - if ($sOutputFormat == 'html') { - $sPlaceUrl = 'hierarchy.php?place_id='.$aPlace['place_id']; - if ($i) echo ' > '; - echo ''.$aPlace['localname'].' ('.osmLink($aPlace).')'; - } -} - - -if ($sOutputFormat == 'json') { - header('content-type: application/json; charset=UTF-8'); - $aDetails = array(); - $aDetails['breadcrumbs'] = $aBreadcrums; - javascript_renderData($aDetails); - exit; -} - -$aRelatedPlaceIDs = $oDB->getCol("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,'; -$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'; -$aParentOfLines = $oDB->getAll($sSQL); - -if (!empty($aParentOfLines)) { - echo '

Parent Of:

'; - $aGroupedAddressLines = array(); - foreach ($aParentOfLines as $aAddressLine) { - $aAddressLine['label'] = Nominatim\ClassTypes\getLabel($aAddressLine) - ?? ucwords($aAddressLine['type']); - - if (!isset($aGroupedAddressLines[$aAddressLine['label']])) $aGroupedAddressLines[$aAddressLine['label']] = array(); - $aGroupedAddressLines[$aAddressLine['label']][] = $aAddressLine; - } - - foreach ($aGroupedAddressLines as $sGroupHeading => $aParentOfLines) { - echo "

$sGroupHeading

"; - foreach ($aParentOfLines as $aAddressLine) { - $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber']; - $sOSMType = formatOSMType($aAddressLine['osm_type'], false); - - echo '
'; - echo ''.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'No Name').''; - echo ' ('; - echo ''.($aAddressLine['isarea']?'Polygon':'Point').''; - if ($sOSMType) echo ', '.$sOSMType.' '.osmLink($aAddressLine).''; - echo ', GOTO'; - echo ', '.$aAddressLine['area']; - echo ')'; - echo '
'; - } - } - if (count($aParentOfLines) >= 500) { - echo '

There are more child objects which are not shown.

'; - } - echo ''; -} -- 2.45.1