Skip to content
Permalink
Browse files

Merge pull request #9989 from elpaso/wfs3-ogr-client

Add WFS3 (experimental) to supported OGR protocols
  • Loading branch information
elpaso committed May 13, 2019
2 parents e693e81 + b554b74 commit 56a6edf3acdcf584974240439393f1f951e3a087
@@ -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() )
@@ -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++ )
{
@@ -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++ )

0 comments on commit 56a6edf

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