From 6d47b5d8476b7f9f5548acf453735791fc2bcf0e Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 17 Oct 2019 14:41:07 +0200 Subject: [PATCH] [OAPIF] Rename WFS_VERSION_API_FEATURES to WFS_VERSION_API_FEATURES_1_0 --- python/gui/auto_generated/qgsnewhttpconnection.sip.in | 2 +- src/gui/qgsnewhttpconnection.cpp | 8 ++++---- src/gui/qgsnewhttpconnection.h | 2 +- src/providers/wfs/qgswfsnewconnection.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/gui/auto_generated/qgsnewhttpconnection.sip.in b/python/gui/auto_generated/qgsnewhttpconnection.sip.in index 466d5ba4b87..be7e04c2e12 100644 --- a/python/gui/auto_generated/qgsnewhttpconnection.sip.in +++ b/python/gui/auto_generated/qgsnewhttpconnection.sip.in @@ -84,7 +84,7 @@ Returns the current connection url. WFS_VERSION_1_0, WFS_VERSION_1_1, WFS_VERSION_2_0, - WFS_VERSION_API_FEATURES, + WFS_VERSION_API_FEATURES_1_0, }; virtual bool validate(); diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp index 0d54e85320f..2fe905a9c52 100644 --- a/src/gui/qgsnewhttpconnection.cpp +++ b/src/gui/qgsnewhttpconnection.cpp @@ -170,8 +170,8 @@ void QgsNewHttpConnection::wfsVersionCurrentIndexChanged( int index ) cbxWfsFeaturePaging->setEnabled( index == WFS_VERSION_MAX || index >= WFS_VERSION_2_0 ); lblPageSize->setEnabled( cbxWfsFeaturePaging->isChecked() && ( index == WFS_VERSION_MAX || index >= WFS_VERSION_1_1 ) ); txtPageSize->setEnabled( cbxWfsFeaturePaging->isChecked() && ( index == WFS_VERSION_MAX || index >= WFS_VERSION_1_1 ) ); - cbxWfsIgnoreAxisOrientation->setEnabled( index != WFS_VERSION_1_0 && index != WFS_VERSION_API_FEATURES ); - cbxWfsInvertAxisOrientation->setEnabled( index != WFS_VERSION_API_FEATURES ); + cbxWfsIgnoreAxisOrientation->setEnabled( index != WFS_VERSION_1_0 && index != WFS_VERSION_API_FEATURES_1_0 ); + cbxWfsInvertAxisOrientation->setEnabled( index != WFS_VERSION_API_FEATURES_1_0 ); } void QgsNewHttpConnection::wfsFeaturePagingStateChanged( int state ) @@ -322,7 +322,7 @@ void QgsNewHttpConnection::updateServiceSpecificSettings() else if ( version == QLatin1String( "2.0.0" ) ) versionIdx = WFS_VERSION_2_0; else if ( version == QLatin1String( "OGC_API_FEATURES" ) ) - versionIdx = WFS_VERSION_API_FEATURES; + versionIdx = WFS_VERSION_API_FEATURES_1_0; cmbVersion->setCurrentIndex( versionIdx ); // Enable/disable these items per WFS versions @@ -446,7 +446,7 @@ void QgsNewHttpConnection::accept() case WFS_VERSION_2_0: version = QStringLiteral( "2.0.0" ); break; - case WFS_VERSION_API_FEATURES: + case WFS_VERSION_API_FEATURES_1_0: version = QStringLiteral( "OGC_API_FEATURES" ); break; } diff --git a/src/gui/qgsnewhttpconnection.h b/src/gui/qgsnewhttpconnection.h index 4926f956d2f..75ae9ffb06f 100644 --- a/src/gui/qgsnewhttpconnection.h +++ b/src/gui/qgsnewhttpconnection.h @@ -110,7 +110,7 @@ class GUI_EXPORT QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpCo WFS_VERSION_1_0 = 1, WFS_VERSION_1_1 = 2, WFS_VERSION_2_0 = 3, - WFS_VERSION_API_FEATURES = 4, + WFS_VERSION_API_FEATURES_1_0 = 4, }; /** diff --git a/src/providers/wfs/qgswfsnewconnection.cpp b/src/providers/wfs/qgswfsnewconnection.cpp index fddb7cccde6..f55fe5e3f0e 100644 --- a/src/providers/wfs/qgswfsnewconnection.cpp +++ b/src/providers/wfs/qgswfsnewconnection.cpp @@ -152,7 +152,7 @@ void QgsWFSNewConnection::oapifLandingPageReplyFinished() return; } - wfsVersionComboBox()->setCurrentIndex( WFS_VERSION_API_FEATURES ); + wfsVersionComboBox()->setCurrentIndex( WFS_VERSION_API_FEATURES_1_0 ); wfsPagingEnabledCheckBox()->setChecked( true ); mCapabilities.reset();