[WFS provider] Use QgsOgcCrsUtils::parseCrsName() to be able to handl…

…e OGC HTTP URIs (fixes #29391)
qgis · Sep 28, 2022 · c065728 · c065728
1 parent c1e4cf5
commit c065728
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/providers/wfs/qgswfscapabilities.cpp b/src/providers/wfs/qgswfscapabilities.cpp
@@ -657,16 +657,12 @@ void QgsWfsCapabilities::capabilitiesReplyFinished()
 
 QString QgsWfsCapabilities::NormalizeSRSName( const QString &crsName )
 {
-  const QRegularExpression re( QRegularExpression::anchoredPattern( QStringLiteral( "urn:ogc:def:crs:([^:]+).+?([^:]+)" ) ), QRegularExpression::CaseInsensitiveOption );
-  if ( const QRegularExpressionMatch match = re.match( crsName ); match.hasMatch() )
+  QString authority;
+  QString code;
+  const QgsOgcCrsUtils::CRSFlavor crsFlavor = QgsOgcCrsUtils::parseCrsName( crsName, authority, code );
+  if ( crsFlavor !=  QgsOgcCrsUtils::CRSFlavor::UNKNOWN )
   {
-    return match.captured( 1 ) + ':' + match.captured( 2 );
-  }
-  // urn:x-ogc:def:crs:EPSG:xxxx as returned by http://maps.warwickshire.gov.uk/gs/ows? in WFS 1.1
-  const QRegularExpression re2( QRegularExpression::anchoredPattern( QStringLiteral( "urn:x-ogc:def:crs:([^:]+).+?([^:]+)" ) ), QRegularExpression::CaseInsensitiveOption );
-  if ( const QRegularExpressionMatch match = re2.match( crsName ); match.hasMatch() )
-  {
-    return match.captured( 1 ) + ':' + match.captured( 2 );
+    return authority + ':' + code;
   }
   return crsName;
 }