X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/45bc511955022f15fd621d04f52cadd258b75e8a..4e2fe6427ce03a0ed3c5fdfe384f7867ef52fcca:/website/details.php?ds=sidebyside diff --git a/website/details.php b/website/details.php index 7f26c6ee..81d643f0 100755 --- a/website/details.php +++ b/website/details.php @@ -5,11 +5,13 @@ 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/output.php'); +require_once(CONST_BasePath.'/lib/AddressDetails.php'); ini_set('memory_limit', '200M'); $oParams = new Nominatim\ParameterParser(); $sOutputFormat = $oParams->getSet('format', array('html', 'json'), 'html'); +set_exception_handler_by_format($sOutputFormat); $aLangPrefOrder = $oParams->getPreferredLanguages(); $sLanguagePrefArraySQL = 'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']'; @@ -19,11 +21,12 @@ $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R')); $iOsmId = $oParams->getInt('osmid', -1); $sClass = $oParams->getString('class'); -$bIncludeKeywords = $oParams->getBool('keywords'); +$bIncludeKeywords = $oParams->getBool('keywords', false); $bIncludeAddressDetails = $oParams->getBool('addressdetails', $sOutputFormat == 'html'); -$bIncludeLinkedPlaces = $oParams->getBool('linkedplaces', $sOutputFormat == 'html'); -$bIncludeChildPlaces = $oParams->getBool('childplaces', $sOutputFormat == 'html'); -$bGroupParents = $oParams->getBool('group_parents', false); +$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(); @@ -101,24 +104,29 @@ $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_searchrank_label(rank_search) AS rank_search_label,'; // only used in HTML output $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"; @@ -129,22 +137,14 @@ if (!$aPointDetails) { } $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); // Get all alternative names (languages, etc) $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'] = []; + $aPointDetails['aNames'] = array(); } // Address tags @@ -152,7 +152,7 @@ $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'] = []; + $aPointDetails['aAddressTags'] = array(); } // Extra tags @@ -160,20 +160,14 @@ $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'] = []; + $aPointDetails['aExtraTags'] = array(); } // Address $aAddressLines = false; if ($bIncludeAddressDetails) { - $aAddressLines = getAddressDetails( - $oDB, - $sLanguagePrefArraySQL, - $iPlaceID, - $aPointDetails['country_code'], - -1, - true - ); + $oDetails = new Nominatim\AddressDetails($oDB, $iPlaceID, -1, $sLanguagePrefArraySQL); + $aAddressLines = $oDetails->getAddressDetails(true); } // Linked places @@ -200,13 +194,13 @@ if ($bIncludeLinkedPlaces) { $sSQL .= ' housenumber'; $aLinkedLines = $oDB->getAll($sSQL); if (PEAR::isError($aLinkedLines)) { // possible timeout - $aLinkedLines = []; + $aLinkedLines = array(); } } // All places this is an imediate parent of -$aParentOfLines = false; -if ($bIncludeChildPlaces) { +$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, "; @@ -232,9 +226,9 @@ if ($bIncludeChildPlaces) { $sSQL .= ' rank_search ASC, '; $sSQL .= ' localname, '; $sSQL .= ' housenumber'; - $aParentOfLines = $oDB->getAll($sSQL); - if (PEAR::isError($aParentOfLines)) { // possible timeout - $aParentOfLines = []; + $aHierarchyLines = $oDB->getAll($sSQL); + if (PEAR::isError($aHierarchyLines)) { // possible timeout + $aHierarchyLines = array(); } } @@ -244,20 +238,20 @@ 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 = array(); } 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 = []; + $aPlaceSearchNameKeywords = array(); } $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 = []; + $aPlaceSearchAddressKeywords = array(); } } }