Skip to content
Permalink
Browse files

WCS GeoServer fixes

  • Loading branch information
blazek committed Aug 13, 2012
1 parent bef2458 commit 76bef757c1b20519947b9610b0be4ca45ea3fbeb
@@ -211,7 +211,10 @@ bool QgsWcsCapabilities::retrieveServerCapabilities( )
{
// 1.0.0 - VERSION
// 1.1.0 - AcceptVersions (not supported by UMN Mapserver 6.0.3 - defaults to latest 1.1
versions << "AcceptVersions=1.1,1.0" << "VERSION=1.0";
// We prefer 1.0 because 1.1 has many issues, each server implements it in defferent
// way with various particularities
// It may happen that server supports 1.1.0 but gives error for 1.1
versions << "VERSION=1.0.0" << "AcceptVersions=1.1.0,1.0.0";
}

foreach ( QString v, versions )
@@ -271,8 +274,18 @@ bool QgsWcsCapabilities::describeCoverage( QString const &identifier, bool force

if ( coverage->described && ! forceRefresh ) return true;

QString url = prepareUri( mUri.param( "url" ) ) + "SERVICE=WCS&REQUEST=DescribeCoverage&COVERAGE=" + coverage->identifier;
url += "&VERSION=" + mVersion;
QString url = prepareUri( mUri.param( "url" ) ) + "SERVICE=WCS&REQUEST=DescribeCoverage&VERSION=" + mVersion;

if ( mVersion.startsWith( "1.0" ) )
{
url += "&COVERAGE=" + coverage->identifier;
}
else if ( mVersion.startsWith( "1.1" ) )
{
// in 1.1.0, 1.1.1, 1.1.2 the name of param is 'identifier'
// but in KVP 'identifiers'
url += "&IDENTIFIERS=" + coverage->identifier;
}

if ( ! sendRequest( url ) ) { return false; }

@@ -384,12 +397,21 @@ bool QgsWcsCapabilities::parseCapabilitiesDom( QByteArray const &xml, QgsWcsCapa
tagName != "Capabilities" // 1.1, tags seen: Capabilities, wcs:Capabilities
)
{
mErrorTitle = tr( "Dom Exception" );
mErrorFormat = "text/plain";
mError = tr( "Could not get WCS capabilities in the expected format (DTD): no %1 found.\nThis might be due to an incorrect WCS Server URL.\nTag:%3\nResponse was:\n%4" )
.arg( "Capabilities" )
.arg( docElem.tagName() )
.arg( QString( xml ) );
if ( tagName == "ExceptionReport" )
{
mErrorTitle = tr( "Exception" );
mErrorFormat = "text/plain";
mError = tr( "Could not get WCS capabilities: %1" ).arg( domElementText( docElem, "Exception.ExceptionText" ) );
}
else
{
mErrorTitle = tr( "Dom Exception" );
mErrorFormat = "text/plain";
mError = tr( "Could not get WCS capabilities in the expected format (DTD): no %1 found.\nThis might be due to an incorrect WCS Server URL.\nTag:%3\nResponse was:\n%4" )
.arg( "Capabilities" )
.arg( docElem.tagName() )
.arg( QString( xml ) );
}

QgsLogger::debug( "Dom Exception: " + mError );

@@ -570,7 +592,7 @@ QList<double> QgsWcsCapabilities::parseDoubles( const QString &text )

QString QgsWcsCapabilities::crsUrnToAuthId( const QString &text )
{
QString authid;
QString authid = text; // may be also non URN, for example 'EPSG:4326'

// URN format: urn:ogc:def:objectType:authority:version:code
// URN example: urn:ogc:def:crs:EPSG::4326
@@ -926,6 +948,25 @@ bool QgsWcsCapabilities::parseDescribeCoverageDom11( QByteArray const &xml, QgsW
}
}

QStringList formats = domElementsTexts( docElem, "CoverageDescription.SupportedFormat" );
// There could be formats from GetCapabilities
if ( formats.size() > 0 )
{
coverage->supportedFormat = formats;
}


QStringList crss = domElementsTexts( docElem, "CoverageDescription.SupportedCRS" );
QSet<QString> authids; // Set, in case one CRS is in more formats (URN, non URN)
foreach ( QString crs, crss )
{
authids.insert( crsUrnToAuthId( crs ) );
}
if ( authids.size() > 0 )
{
coverage->supportedCrs = authids.toList();
}

coverage->described = true;

return true;
@@ -952,6 +993,7 @@ void QgsWcsCapabilities::parseCoverageSummary( QDomElement const & e, QgsWcsCove
if ( tagName == "SupportedFormat" )
{
// image/tiff, ...
// Formats may be here (UMN Mapserver) or may not (GeoServer)
coverageSummary.supportedFormat << el.text();
}
else if ( tagName == "SupportedCRS" )

0 comments on commit 76bef75

Please sign in to comment.
You can’t perform that action at this time.