Add WFS3 (experimental) to supported OGR protocols

elpaso · elpaso · commit b554b74deb28 · 2019-05-13T14:48:53.000+02:00
Quickest way to implement a test client.
diff --git a/src/gui/ogr/qgsogrhelperfunctions.cpp b/src/gui/ogr/qgsogrhelperfunctions.cpp
@@ -269,6 +269,10 @@ QString createProtocolURI( const QString &type, const QString &url,  const QStri
   {
     uri = QStringLiteral( "DODS:%1" ).arg( url );
   }
+  else if ( type == QLatin1String( "WFS3" ) )
+  {
+    uri = QStringLiteral( "WFS3:%1" ).arg( url );
+  }
   QgsDebugMsg( "Connection type is=" + type + " and uri=" + uri );
   // Update URI with authentication information
   if ( ! configId.isEmpty() )
diff --git a/src/providers/gdal/qgsgdalsourceselect.cpp b/src/providers/gdal/qgsgdalsourceselect.cpp
@@ -36,9 +36,9 @@ QgsGdalSourceSelect::QgsGdalSourceSelect( QWidget *parent, Qt::WindowFlags fl, Q
   whileBlocking( radioSrcFile )->setChecked( true );
   protocolGroupBox->hide();
 
-  QStringList protocolTypes = QString( "HTTP/HTTPS/FTP,vsicurl;AWS S3,vsis3;Google Cloud Storage,vsigs;" ).split( ';' );
+  QStringList protocolTypes = QStringLiteral( "HTTP/HTTPS/FTP,vsicurl;AWS S3,vsis3;Google Cloud Storage,vsigs" ).split( ';' );
 #if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(2,3,0)
-  protocolTypes += QString( "Microsoft Azure Blob,vsiaz;Alibaba Cloud OSS,vsioss;OpenStack Swift Object Storage,vsiswift;" ).split( ';' );
+  protocolTypes += QStringLiteral( "Microsoft Azure Blob,vsiaz;Alibaba Cloud OSS,vsioss;OpenStack Swift Object Storage,vsiswift" ).split( ';' );
 #endif
   for ( int i = 0; i < protocolTypes.count(); i++ )
   {
diff --git a/src/providers/ogr/qgsogrsourceselect.cpp b/src/providers/ogr/qgsogrsourceselect.cpp
@@ -100,9 +100,9 @@ QgsOgrSourceSelect::QgsOgrSourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs
   }
 
   //add protocol drivers
-  QStringList protocolTypes = QString( "HTTP/HTTPS/FTP,vsicurl;AWS S3,vsis3;Google Cloud Storage,vsigs;" ).split( ';' );
+  QStringList protocolTypes = QStringLiteral( "HTTP/HTTPS/FTP,vsicurl;AWS S3,vsis3;Google Cloud Storage,vsigs;" ).split( ';' );
 #if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(2,3,0)
-  protocolTypes += QString( "Microsoft Azure Blob,vsiaz;Alibaba Cloud OSS,vsioss;OpenStack Swift Object Storage,vsiswift;" ).split( ';' );
+  protocolTypes += QStringLiteral( "Microsoft Azure Blob,vsiaz;Alibaba Cloud OSS,vsioss;OpenStack Swift Object Storage,vsiswift;WFS3 (experimental),WFS3" ).split( ';' );
 #endif
   protocolTypes += QgsProviderRegistry::instance()->protocolDrivers().split( ';' );
   for ( int i = 0; i < protocolTypes.count(); i++ )

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,10 @@ QString createProtocolURI( const QString &type, const QString &url, const QStri`
`269`	`269`	`{`
`270`	`270`	`uri = QStringLiteral( "DODS:%1" ).arg( url );`
`271`	`271`	`}`
	`272`	`+ else if ( type == QLatin1String( "WFS3" ) )`
	`273`	`+ {`
	`274`	`+ uri = QStringLiteral( "WFS3:%1" ).arg( url );`
	`275`	`+ }`
`272`	`276`	`QgsDebugMsg( "Connection type is=" + type + " and uri=" + uri );`
`273`	`277`	`// Update URI with authentication information`
`274`	`278`	`if ( ! configId.isEmpty() )`