X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/78a29b5a876d0c7d4c8b9ccab9f45b15780b4a22..d45524cbfb299f5004a03c52802c64749c5ad212:/website/hierarchy.php?ds=sidebyside diff --git a/website/hierarchy.php b/website/hierarchy.php index de83ca44..e0e960bc 100755 --- a/website/hierarchy.php +++ b/website/hierarchy.php @@ -1,31 +1,30 @@ 0) { - $_GET['place_id'] = $oDB->getOne("select place_id from placex where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by type = 'postcode' asc"); + $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 (!$_GET['place_id']) + if (!$sPlaceId) { - $aPointDetails = $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 = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by updated desc limit 1"); + $aPointDetails = $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 (!PEAR::isError($aPointDetails) && $aPointDetails) { if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) { @@ -38,21 +37,17 @@ } } - if (!isset($_GET['place_id'])) - { - echo "Please select a place id"; - exit; - } + if (!$sPlaceId) userError("Please select a place id"); - $iPlaceID = (int)$_GET['place_id']; + $iPlaceID = (int)$sPlaceId; - $sAuxHouseNumber = false; - $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID); - if ($iParentPlaceID) + if (CONST_Use_US_Tiger_Data) { - $iPlaceID = $iParentPlaceID; + $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID); + if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; } - else + + 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; @@ -65,11 +60,7 @@ $aPlaceAddress = array_reverse($oPlaceLookup->getAddressDetails()); - if (!sizeof($aPlaceAddress)) - { - echo "Unknown place id."; - exit; - } + if (!sizeof($aPlaceAddress)) userError("Unknown place id."); $aBreadcrums = array(); foreach($aPlaceAddress as $i => $aPlace) @@ -83,12 +74,12 @@ if ($sOutputFormat == 'html') echo ''.$aPlace['localname'].' (osm)'; } - $aDetails = array(); - $aDetails['breadcrumbs'] = $aBreadcrums; if ($sOutputFormat == 'json') { header("content-type: application/json; charset=UTF-8"); + $aDetails = array(); + $aDetails['breadcrumbs'] = $aBreadcrums; javascript_renderData($aDetails); exit; } @@ -148,74 +139,3 @@ } echo ''; } -exit; - - - $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder); - - // Make sure the point we are reporting on is fully indexed - //$sSQL = "UPDATE placex set indexed = true where indexed = false and place_id = $iPlaceID"; - //$oDB->query($sSQL); - - // Get the details for this point - $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,"; - $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, "; - $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, "; - //$sSQL .= " ST_Area(geometry::geography) as area, "; - $sSQL .= " ST_y(centroid) as lat, ST_x(centroid) as lon,"; - $sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, "; - $sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring"; - $sSQL .= " from placex where place_id = $iPlaceID"; - $aPointDetails = $oDB->getRow($sSQL); - if (PEAR::IsError($aPointDetails)) - { - failInternalError("Could not get details of place object.", $sSQL, $aPointDetails); - } - $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber']; - - $aClassType = getClassTypesWithImportance(); - $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon']; - - // Get all alternative names (languages, etc) - $sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key"; - $aPointDetails['aNames'] = $oDB->getAssoc($sSQL); - - // Extra tags - $sSQL = "select (each(extratags)).key,(each(extratags)).value from placex where place_id = $iPlaceID order by (each(extratags)).key"; - $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL); - - // Address - $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true); - - // Linked places - $sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, "; - $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength "; - $sSQL .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x"; - $sSQL .= " where linked_place_id = $iPlaceID"; - $sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber"; - $aLinkedLines = $oDB->getAll($sSQL); - - // All places this is an imediate parent of - $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_distance(geometry, placegeometry) as distance, "; - $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 = $iPlaceID order by rank_address asc,rank_search asc limit 500) as obj,"; - $sSQL .= " (select geometry as placegeometry from placex where place_id = $iPlaceID) as x"; - $sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber"; - $aParentOfLines = $oDB->getAll($sSQL); - - $aPlaceSearchNameKeywords = false; - $aPlaceSearchAddressKeywords = false; - if (isset($_GET['keywords']) && $_GET['keywords']) - { - $sSQL = "select * from search_name where place_id = $iPlaceID"; - $aPlaceSearchName = $oDB->getRow($sSQL); - $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")"; - $aPlaceSearchNameKeywords = $oDB->getAll($sSQL); - $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")"; - $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL); - } - - logEnd($oDB, $hLog, 1); - - include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');