sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

[OAPIF] Rename WFS_VERSION_API_FEATURES to WFS_VERSION_API_FEATURES_1_0

Browse Source
This commit is contained in:
Even Rouault 2019-10-17 14:41:07 +02:00 committed by Nyall Dawson
parent 77013db8ca
commit 6d47b5d847
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/gui/auto_generated/qgsnewhttpconnection.sip.in
View File

@ -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();

8
src/gui/qgsnewhttpconnection.cpp
View File

@ -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;
}

2
src/gui/qgsnewhttpconnection.h
View File

@ -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,
};
/**

2
src/providers/wfs/qgswfsnewconnection.cpp
View File

@ -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();