X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/49dc62201c1960f0d4279a440c1c29919b3d21b8..c148b768f4926d578c499d24d93dbf6ea5b0b7e2:/website/details.php?ds=sidebyside diff --git a/website/details.php b/website/details.php old mode 100755 new mode 100644 index e2a8a031..cb371e6b --- a/website/details.php +++ b/website/details.php @@ -1,31 +1,43 @@ getSet('format', array('html', 'json'), 'html'); +set_exception_handler_by_format($sOutputFormat); + $aLangPrefOrder = $oParams->getPreferredLanguages(); -$sLanguagePrefArraySQL = 'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']'; $sPlaceId = $oParams->getString('place_id'); $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R')); $iOsmId = $oParams->getInt('osmid', -1); +$sClass = $oParams->getString('class'); + +$bIncludeKeywords = $oParams->getBool('keywords', false); +$bIncludeAddressDetails = $oParams->getBool('addressdetails', $sOutputFormat == 'html'); +$bIncludeLinkedPlaces = $oParams->getBool('linkedplaces', true); +$bIncludeHierarchy = $oParams->getBool('hierarchy', $sOutputFormat == 'html'); +$bGroupHierarchy = $oParams->getBool('group_hierarchy', false); +$bIncludePolygonAsGeoJSON = $oParams->getBool('polygon_geojson', $sOutputFormat == 'html'); -$oDB =& getDB(); +$oDB = new Nominatim\DB(); +$oDB->connect(); + +$sLanguagePrefArraySQL = $oDB->getArraySQL($oDB->getDBQuotedList($aLangPrefOrder)); if ($sOsmType && $iOsmId > 0) { - $sSQL = sprintf( - "SELECT place_id FROM placex WHERE osm_type='%s' AND osm_id=%d ORDER BY type='postcode' ASC", - $sOsmType, - $iOsmId - ); - $sPlaceId = chksql($oDB->getOne($sSQL)); + $sSQL = 'SELECT place_id FROM placex WHERE osm_type = :type AND osm_id = :id'; + // osm_type and osm_id are not unique enough + if ($sClass) { + $sSQL .= " AND class='".$sClass."'"; + } + $sSQL .= ' ORDER BY class ASC'; + $sPlaceId = $oDB->getOne($sSQL, array(':type' => $sOsmType, ':id' => $iOsmId)); // Be nice about our error messages for broken geometry @@ -40,12 +52,12 @@ if ($sOsmType && $iOsmId > 0) { $sSQL .= ' ST_AsText(prevgeometry) AS prevgeom, '; $sSQL .= ' ST_AsText(newgeometry) AS newgeom'; $sSQL .= ' FROM import_polygon_error '; - $sSQL .= " WHERE osm_type = '".$sOsmType."'"; - $sSQL .= ' AND osm_id = '.$iOsmId; + $sSQL .= ' WHERE osm_type = :type'; + $sSQL .= ' AND osm_id = :id'; $sSQL .= ' ORDER BY updated DESC'; $sSQL .= ' LIMIT 1'; - $aPointDetails = chksql($oDB->getRow($sSQL)); - if (!PEAR::isError($aPointDetails) && $aPointDetails) { + $aPointDetails = $oDB->getRow($sSQL, array(':type' => $sOsmType, ':id' => $iOsmId)); + if ($aPointDetails) { if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) { $aPointDetails['error_x'] = $aMatches[1]; $aPointDetails['error_y'] = $aMatches[2]; @@ -60,25 +72,25 @@ if ($sOsmType && $iOsmId > 0) { } -if (!$sPlaceId) userError('Please select a place id'); +if ($sPlaceId === false) userError('Please select a place id'); $iPlaceID = (int)$sPlaceId; if (CONST_Use_US_Tiger_Data) { - $iParentPlaceID = chksql($oDB->getOne('SELECT parent_place_id FROM location_property_tiger WHERE place_id = '.$iPlaceID)); + $iParentPlaceID = $oDB->getOne('SELECT parent_place_id FROM location_property_tiger WHERE place_id = '.$iPlaceID); if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; } // interpolated house numbers -$iParentPlaceID = chksql($oDB->getOne('SELECT parent_place_id FROM location_property_osmline WHERE place_id = '.$iPlaceID)); +$iParentPlaceID = $oDB->getOne('SELECT parent_place_id FROM location_property_osmline WHERE place_id = '.$iPlaceID); if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; // artificial postcodes -$iParentPlaceID = chksql($oDB->getOne('SELECT parent_place_id FROM location_postcode WHERE place_id = '.$iPlaceID)); +$iParentPlaceID = $oDB->getOne('SELECT parent_place_id FROM location_postcode WHERE place_id = '.$iPlaceID); if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; if (CONST_Use_Aux_Location_data) { - $iParentPlaceID = chksql($oDB->getOne('SELECT parent_place_id FROM location_property_aux WHERE place_id = '.$iPlaceID)); + $iParentPlaceID = $oDB->getOne('SELECT parent_place_id FROM location_property_aux WHERE place_id = '.$iPlaceID); if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; } @@ -88,144 +100,136 @@ $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder); $sSQL = 'SELECT place_id, osm_type, osm_id, class, type, name, admin_level,'; $sSQL .= ' housenumber, postcode, country_code,'; $sSQL .= ' importance, wikipedia,'; -$sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') AS indexed_date,"; +$sSQL .= ' ROUND(EXTRACT(epoch FROM indexed_date)) AS indexed_epoch,'; $sSQL .= ' parent_place_id, '; $sSQL .= ' rank_address, '; $sSQL .= ' rank_search, '; -$sSQL .= ' get_searchrank_label(rank_search) AS rank_search_label,'; $sSQL .= " 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, '; -$sSQL .= ' ST_x(centroid) AS lon,'; +$sSQL .= ' ST_x(centroid) AS lon, '; $sSQL .= ' CASE '; -$sSQL .= ' WHEN importance = 0 OR importance IS NULL THEN 0.75-(rank_search::float/40) '; +$sSQL .= ' WHEN importance = 0 OR importance IS NULL '; +$sSQL .= ' THEN 0.75-(rank_search::float/40) '; $sSQL .= ' ELSE importance '; $sSQL .= ' END as calculated_importance, '; -$sSQL .= ' ST_AsGeoJSON(CASE '; -$sSQL .= ' WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) '; -$sSQL .= ' ELSE geometry '; -$sSQL .= ' END) as asgeojson'; +if ($bIncludePolygonAsGeoJSON) { + $sSQL .= ' ST_AsGeoJSON(CASE '; + $sSQL .= ' WHEN ST_NPoints(geometry) > 5000 '; + $sSQL .= ' THEN ST_SimplifyPreserveTopology(geometry, 0.0001) '; + $sSQL .= ' ELSE geometry '; + $sSQL .= ' END) as asgeojson'; +} else { + $sSQL .= ' ST_AsGeoJSON(centroid) as asgeojson'; +} $sSQL .= ' FROM placex '; $sSQL .= " WHERE place_id = $iPlaceID"; -$aPointDetails = chksql($oDB->getRow($sSQL), 'Could not get details of place object.'); +$aPointDetails = $oDB->getRow($sSQL, null, 'Could not get details of place object.'); if (!$aPointDetails) { userError('Unknown place id.'); } $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber']; - -$aClassType = getClassTypesWithImportance(); - -$sPointClassType = $aPointDetails['class'].':'.$aPointDetails['type']; -if (isset($aClassType[$sPointClassType]) && $aClassType[$sPointClassType]['icon']) { - $aPointDetails['icon'] = $aClassType[$sPointClassType]['icon']; -} else { - $aPointDetails['icon'] = false; -} +$aPointDetails['icon'] = Nominatim\ClassTypes\getProperty($aPointDetails, 'icon', false); +$aPointDetails['rank_search_label'] = getSearchRankLabel($aPointDetails['rank_search']); // only used in HTML format // 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"; +$sSQL = 'SELECT (each(name)).key,(each(name)).value FROM placex '; +$sSQL .= "WHERE place_id = $iPlaceID ORDER BY (each(name)).key"; $aPointDetails['aNames'] = $oDB->getAssoc($sSQL); -if (PEAR::isError($aPointDetails['aNames'])) { // possible timeout - $aPointDetails['aNames'] = []; -} // Address tags -$sSQL = "SELECT (each(address)).key as key,(each(address)).value FROM placex WHERE place_id = $iPlaceID ORDER BY key"; +$sSQL = 'SELECT (each(address)).key as key,(each(address)).value FROM placex '; +$sSQL .= "WHERE place_id = $iPlaceID ORDER BY key"; $aPointDetails['aAddressTags'] = $oDB->getAssoc($sSQL); -if (PEAR::isError($aPointDetails['aAddressTags'])) { // possible timeout - $aPointDetails['aAddressTags'] = []; -} // Extra tags -$sSQL = "SELECT (each(extratags)).key,(each(extratags)).value FROM placex WHERE place_id = $iPlaceID ORDER BY (each(extratags)).key"; +$sSQL = 'SELECT (each(extratags)).key,(each(extratags)).value FROM placex '; +$sSQL .= "WHERE place_id = $iPlaceID ORDER BY (each(extratags)).key"; $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL); -if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout - $aPointDetails['aExtraTags'] = []; -} // Address -$aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], -1, true); +$aAddressLines = false; +if ($bIncludeAddressDetails) { + $oDetails = new Nominatim\AddressDetails($oDB, $iPlaceID, -1, $sLanguagePrefArraySQL); + $aAddressLines = $oDetails->getAddressDetails(true); +} // Linked places -$sSQL = 'SELECT placex.place_id, osm_type, osm_id, class, type, housenumber,'; -$sSQL .= ' admin_level, rank_address, '; -$sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,"; -$sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, "; -$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, "; -$sSQL .= ' length(name::text) AS namelength '; -$sSQL .= ' FROM '; -$sSQL .= ' placex, '; -$sSQL .= ' ( '; -$sSQL .= ' SELECT centroid AS placegeometry '; -$sSQL .= ' FROM placex '; -$sSQL .= " WHERE place_id = $iPlaceID "; -$sSQL .= ' ) AS x'; -$sSQL .= " WHERE linked_place_id = $iPlaceID"; -$sSQL .= ' ORDER BY '; -$sSQL .= ' rank_address ASC, '; -$sSQL .= ' rank_search ASC, '; -$sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL), "; -$sSQL .= ' housenumber'; -$aLinkedLines = $oDB->getAll($sSQL); -if (PEAR::isError($aLinkedLines)) { // possible timeout - $aLinkedLines = []; +$aLinkedLines = false; +if ($bIncludeLinkedPlaces) { + $sSQL = 'SELECT placex.place_id, osm_type, osm_id, class, type, housenumber,'; + $sSQL .= ' admin_level, rank_address, '; + $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,"; + $sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, "; + $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, "; + $sSQL .= ' length(name::text) AS namelength '; + $sSQL .= ' FROM '; + $sSQL .= ' placex, '; + $sSQL .= ' ( '; + $sSQL .= ' SELECT centroid AS placegeometry '; + $sSQL .= ' FROM placex '; + $sSQL .= " WHERE place_id = $iPlaceID "; + $sSQL .= ' ) AS x'; + $sSQL .= " WHERE linked_place_id = $iPlaceID"; + $sSQL .= ' ORDER BY '; + $sSQL .= ' rank_address ASC, '; + $sSQL .= ' rank_search ASC, '; + $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL), "; + $sSQL .= ' 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,'; -$sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,"; -$sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, "; -$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, "; -$sSQL .= ' length(name::text) AS namelength '; -$sSQL .= ' FROM '; -$sSQL .= ' ( '; -$sSQL .= ' SELECT placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name '; -$sSQL .= ' FROM placex '; -$sSQL .= " WHERE parent_place_id = $iPlaceID "; -$sSQL .= ' ORDER BY '; -$sSQL .= ' rank_address ASC, '; -$sSQL .= ' rank_search ASC '; -$sSQL .= ' LIMIT 500 '; -$sSQL .= ' ) AS obj,'; -$sSQL .= ' ( '; -$sSQL .= ' SELECT centroid AS placegeometry '; -$sSQL .= ' FROM placex '; -$sSQL .= " WHERE place_id = $iPlaceID "; -$sSQL .= ' ) AS x'; -$sSQL .= ' ORDER BY '; -$sSQL .= ' rank_address ASC, '; -$sSQL .= ' rank_search ASC, '; -$sSQL .= ' localname, '; -$sSQL .= ' housenumber'; -$aParentOfLines = $oDB->getAll($sSQL); -if (PEAR::isError($aParentOfLines)) { // possible timeout - $aParentOfLines = []; +$aHierarchyLines = false; +if ($bIncludeHierarchy) { + $sSQL = 'SELECT obj.place_id, osm_type, osm_id, class, type, housenumber,'; + $sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,"; + $sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, "; + $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, "; + $sSQL .= ' length(name::text) AS namelength '; + $sSQL .= ' FROM '; + $sSQL .= ' ( '; + $sSQL .= ' SELECT placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name '; + $sSQL .= ' FROM placex '; + $sSQL .= " WHERE parent_place_id = $iPlaceID "; + $sSQL .= ' ORDER BY '; + $sSQL .= ' rank_address ASC, '; + $sSQL .= ' rank_search ASC '; + $sSQL .= ' LIMIT 500 '; + $sSQL .= ' ) AS obj,'; + $sSQL .= ' ( '; + $sSQL .= ' SELECT centroid AS placegeometry '; + $sSQL .= ' FROM placex '; + $sSQL .= " WHERE place_id = $iPlaceID "; + $sSQL .= ' ) AS x'; + $sSQL .= ' ORDER BY '; + $sSQL .= ' rank_address ASC, '; + $sSQL .= ' rank_search ASC, '; + $sSQL .= ' localname, '; + $sSQL .= ' housenumber'; + $aHierarchyLines = $oDB->getAll($sSQL); } $aPlaceSearchNameKeywords = false; $aPlaceSearchAddressKeywords = false; -if ($oParams->getBool('keywords')) { +if ($bIncludeKeywords) { $sSQL = "SELECT * FROM search_name WHERE place_id = $iPlaceID"; - $aPlaceSearchName = $oDB->getRow($sSQL); // can be null - if (!$aPlaceSearchName || PEAR::isError($aPlaceSearchName)) { // possible timeout - $aPlaceSearchName = []; - } + $aPlaceSearchName = $oDB->getRow($sSQL); if (!empty($aPlaceSearchName)) { - $sSQL = 'SELECT * FROM word WHERE word_id in ('.substr($aPlaceSearchName['name_vector'], 1, -1).')'; - $aPlaceSearchNameKeywords = $oDB->getAll($sSQL); - if (PEAR::isError($aPlaceSearchNameKeywords)) { // possible timeout - $aPlaceSearchNameKeywords = []; + $sWordIds = substr($aPlaceSearchName['name_vector'], 1, -1); + if (!empty($sWordIds)) { + $sSQL = 'SELECT * FROM word WHERE word_id in ('.$sWordIds.')'; + $aPlaceSearchNameKeywords = $oDB->getAll($sSQL); } - $sSQL = 'SELECT * FROM word WHERE word_id in ('.substr($aPlaceSearchName['nameaddress_vector'], 1, -1).')'; - $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL); - if (PEAR::isError($aPlaceSearchAddressKeywords)) { // possible timeout - $aPlaceSearchAddressKeywords = []; + $sWordIds = substr($aPlaceSearchName['nameaddress_vector'], 1, -1); + if (!empty($sWordIds)) { + $sSQL = 'SELECT * FROM word WHERE word_id in ('.$sWordIds.')'; + $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL); } } } @@ -234,7 +238,7 @@ logEnd($oDB, $hLog, 1); if ($sOutputFormat=='html') { $sSQL = "SELECT TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' FROM import_status LIMIT 1"; - $sDataDate = chksql($oDB->getOne($sSQL)); + $sDataDate = $oDB->getOne($sSQL); $sTileURL = CONST_Map_Tile_URL; $sTileAttribution = CONST_Map_Tile_Attribution; }