[wcs] improve CRS handling when parsing DescribeCoverage responce (refs #21045)

alexbruy · alexbruy · commit 8b5d50cec9dc · 2019-02-05T08:32:43.000+02:00
(cherry picked from commit 2f7550d)
diff --git a/src/providers/wcs/qgswcscapabilities.cpp b/src/providers/wcs/qgswcscapabilities.cpp
@@ -790,9 +790,16 @@ bool QgsWcsCapabilities::parseDescribeCoverageDom10( QByteArray const &xml, QgsW
   QDomElement supportedCRSsElement = firstChild( coverageOfferingElement, QStringLiteral( "supportedCRSs" ) );
 
   // requestResponseCRSs and requestCRSs + responseCRSs are alternatives
+  // we try to parse one or the other
   coverage->supportedCrs = domElementsTexts( coverageOfferingElement, QStringLiteral( "supportedCRSs.requestResponseCRSs" ) );
+  if ( coverage->supportedCrs.isEmpty() )
+  {
+    coverage->supportedCrs = domElementsTexts( coverageOfferingElement, QStringLiteral( "supportedCRSs.requestCRSs" ) );
+    coverage->supportedCrs << domElementsTexts( coverageOfferingElement, QStringLiteral( "supportedCRSs.responseCRSs" ) );
+  }
+
   // TODO: requestCRSs, responseCRSs - must be then implemented also in provider
-  //QgsDebugMsg( "supportedCrs = " + coverage->supportedCrs.join( "," ) );
+  QgsDebugMsg( "supportedCrs = " + coverage->supportedCrs.join( "," ) );
 
   coverage->nativeCrs = domElementText( coverageOfferingElement, QStringLiteral( "supportedCRSs.nativeCRSs" ) );
 
diff --git a/src/providers/wcs/qgswcssourceselect.cpp b/src/providers/wcs/qgswcssourceselect.cpp
@@ -226,7 +226,6 @@ QStringList QgsWCSSourceSelect::selectedLayersFormats()
 
 QStringList QgsWCSSourceSelect::selectedLayersCrses()
 {
-
   QString identifier = selectedIdentifier();
   if ( identifier.isEmpty() ) { return QStringList(); }
 

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,6 @@ QStringList QgsWCSSourceSelect::selectedLayersFormats()`
`226`	`226`
`227`	`227`	`QStringList QgsWCSSourceSelect::selectedLayersCrses()`
`228`	`228`	`{`
`229`		`-`
`230`	`229`	`QString identifier = selectedIdentifier();`
`231`	`230`	`if ( identifier.isEmpty() ) { return QStringList(); }`
`232`	`231`