X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/cb40aa41d5b0efefdb2b9263e87ed016cce96277..bc27cb2bd87379422fa56e51b6523b2bed8a8f20:/website/details.php diff --git a/website/details.php b/website/details.php index 6eaa4adb..ceba8581 100755 --- a/website/details.php +++ b/website/details.php @@ -1,21 +1,43 @@ 3) - { - echo "Page temporarily blocked due to high server load\n"; - exit; - } - + @define('CONST_ConnectionBucket_PageType', 'Details'); + + require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); + require_once(CONST_BasePath.'/lib/log.php'); + + $sOutputFormat = 'html'; + /* + $fLoadAvg = getLoadAverage(); + if ($fLoadAvg > 3) + { + echo "Page temporarily blocked due to high server load\n"; + exit; + } + */ ini_set('memory_limit', '200M'); $oDB =& getDB(); + $aLangPrefOrder = getPreferredLanguages(); + $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]"; + if (isset($_GET['osmtype']) && isset($_GET['osmid']) && (int)$_GET['osmid'] && ($_GET['osmtype'] == 'N' || $_GET['osmtype'] == 'W' || $_GET['osmtype'] == 'R')) { $_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"); + + // Be nice about our error messages for broken geometry + if (!$_GET['place_id']) + { + $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"); + if (!PEAR::isError($aPointDetails) && $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 (!isset($_GET['place_id'])) @@ -26,8 +48,10 @@ $iPlaceID = (int)$_GET['place_id']; - $aLangPrefOrder = getPrefferedLangauges(); - $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]"; + $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID); + if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; + $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID); + if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder); @@ -36,103 +60,64 @@ //$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, country_code, "; - $sSQL .= " 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,ST_GeometryType(geometry) as geotype, ST_Y(ST_Centroid(geometry)) as lat,ST_X(ST_Centroid(geometry)) as lon "; + $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)) + if (PEAR::IsError($aPointDetails)) { - var_dump($aPointDetails); - exit; + failInternalError("Could not get details of place object.", $sSQL, $aPointDetails); } - $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber']; - $fLon = $aPointDetails['lon']; - $fLat = $aPointDetails['lat']; - $iZoom = 14; + $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber']; $aClassType = getClassTypesWithImportance(); $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon']; // Get all alternative names (languages, etc) - $aPointDetails['aNames'] = array(); -/* - for($i = 1; $i <= $aPointDetails['numnames']; $i++) - { - $sSQL = "select name[$i].key, name[$i].value from placex where place_id = $iPlaceID limit 1"; - $aNameItem = $oDB->getRow($sSQL); - if (substr($aNameItem['key'],0,5) == 'name:') $aNameItem['key'] = substr($aNameItem['key'],5); - $aPointDetails['aNames'][$aNameItem['key']] = $aNameItem['value']; - } -*/ - // Get the bounding box and outline polygon - $sSQL = "select *,ST_AsText(outline) as outlinestring from get_place_boundingbox($iPlaceID)"; - $aPointPolygon = $oDB->getRow($sSQL); - IF (PEAR::IsError($aPointPolygon)) - { - var_dump($aPointPolygon); - exit; - } - if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch)) - { - preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER); - } - elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['outlinestring'],$aMatch)) - { - $fRadius = 0.01; - $iSteps = ($fRadius * 40000)^2; - $fStepSize = (2*pi())/$iSteps; - $aPolyPoints = array(); - for($f = 0; $f < 2*pi(); $f += $fStepSize) - { + $sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key"; + $aPointDetails['aNames'] = $oDB->getAssoc($sSQL); - $aPolyPoints[] = array('',$aMatch[1]+($fRadius*sin($f)),$aMatch[2]+($fRadius*cos($f))); - } - $aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius; - $aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius; - $aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius; - $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius; - } + // 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); - // If it is a road then force all nearby buildings to be indexed (so we can show then in the list) -/* - if ($aPointDetails['rank_address'] == 26) - { - $sSQL = "UPDATE placex set indexed = true from placex as srcplace where placex.indexed = false"; - $sSQL .= " and ST_DWithin(placex.geometry, srcplace.geometry, 0.0005) and srcplace.place_id = $iPlaceID"; - $oDB->query($sSQL); - } -*/ // Address $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true); -/* - $sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, "; - $sSQL .= "get_searchrank_label(rank_search) as rank_search_label, fromarea, distance, "; + + // 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 place_addressline join placex on (address_place_id = placex.place_id)"; - $sSQL .= " where place_addressline.place_id = $iPlaceID and ((rank_address > 0 AND rank_address < ".$aPointDetails['rank_address'].") OR address_place_id = $iPlaceID) and placex.place_id != $iPlaceID"; - if ($aPointDetails['country_code']) - { - $sSQL .= " and (placex.country_code IS NULL OR placex.country_code = '".$aPointDetails['country_code']."' OR rank_address < 4)"; - } - $sSQL .= " order by cached_rank_address desc,rank_search desc,fromarea desc,distance asc,namelength desc"; - $aAddressLines = $oDB->getAll($sSQL); - IF (PEAR::IsError($aAddressLines)) - { - var_dump($aAddressLines); - exit; - } -*/ - // All places this is a parent of - $iMaxRankAddress = $aPointDetails['rank_address']+13; - $sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, cached_rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, distance, "; + $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 * from place_addressline where address_place_id = $iPlaceID and cached_rank_address < $iMaxRankAddress) as place_addressline join placex on (place_addressline.place_id = placex.place_id)"; - $sSQL .= " where place_addressline.address_place_id = $iPlaceID and placex.rank_address < $iMaxRankAddress and cached_rank_address > 0 and placex.place_id != $iPlaceID"; - $sSQL .= " and type != 'postcode'"; - $sSQL .= " order by cached_rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber limit 1000"; + $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('.htlib/output/details-html.php'); + include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');