[fix] fixed losing WFS Get/Post DCP endpoints upon cloning WFS datasource URI

andreassteffens · nyalldawson · commit c4afd27d3b5a · 2023-04-22T09:55:30.000+10:00
diff --git a/src/providers/wfs/qgswfsdatasourceuri.cpp b/src/providers/wfs/qgswfsdatasourceuri.cpp
@@ -469,7 +469,17 @@ void QgsWFSDataSourceURI::setGetEndpoints( const QgsStringMap &map )
   mGetEndpoints = map;
 }
 
+QgsStringMap QgsWFSDataSourceURI::getGetEndpoints() const
+{
+  return mGetEndpoints;
+}
+
 void QgsWFSDataSourceURI::setPostEndpoints( const QgsStringMap &map )
 {
   mPostEndpoints = map;
 }
+
+QgsStringMap QgsWFSDataSourceURI::getPostEndpoints() const
+{
+  return mPostEndpoints;
+}
diff --git a/src/providers/wfs/qgswfsdatasourceuri.h b/src/providers/wfs/qgswfsdatasourceuri.h
@@ -140,9 +140,15 @@ class QgsWFSDataSourceURI
     //! Sets Get DCP endpoints
     void setGetEndpoints( const QgsStringMap &map );
 
+    //! Return Get DCP endpoints
+    QgsStringMap getGetEndpoints() const;
+
     //! Sets Post DCP endpoints
     void setPostEndpoints( const QgsStringMap &map );
 
+    //! Return Post DCP endpoints
+    QgsStringMap getPostEndpoints() const;
+
     //! Return set of unknown parameter keys in the URI.
     QSet<QString> unknownParamKeys() const;
 
diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp
@@ -49,6 +49,8 @@ bool QgsWFSSharedData::isRestrictedToRequestBBOX() const
 QgsWFSSharedData *QgsWFSSharedData::clone() const
 {
   QgsWFSSharedData *copy = new QgsWFSSharedData( mURI.uri( true ) );
+  copy->mURI.setGetEndpoints(mURI.getGetEndpoints());
+  copy->mURI.setPostEndpoints(mURI.getPostEndpoints());	
   copy->mWFSVersion = mWFSVersion;
   copy->mGeometryAttribute = mGeometryAttribute;
   copy->mLayerPropertiesList = mLayerPropertiesList;

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,17 @@ void QgsWFSDataSourceURI::setGetEndpoints( const QgsStringMap &map )`
`469`	`469`	`mGetEndpoints = map;`
`470`	`470`	`}`
`471`	`471`
	`472`	`+QgsStringMap QgsWFSDataSourceURI::getGetEndpoints() const`
	`473`	`+{`
	`474`	`+ return mGetEndpoints;`
	`475`	`+}`
	`476`	`+`
`472`	`477`	`void QgsWFSDataSourceURI::setPostEndpoints( const QgsStringMap &map )`
`473`	`478`	`{`
`474`	`479`	`mPostEndpoints = map;`
`475`	`480`	`}`
	`481`	`+`
	`482`	`+QgsStringMap QgsWFSDataSourceURI::getPostEndpoints() const`
	`483`	`+{`
	`484`	`+ return mPostEndpoints;`
	`485`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ bool QgsWFSSharedData::isRestrictedToRequestBBOX() const`
`49`	`49`	`QgsWFSSharedData *QgsWFSSharedData::clone() const`
`50`	`50`	`{`
`51`	`51`	`QgsWFSSharedData *copy = new QgsWFSSharedData( mURI.uri( true ) );`
	`52`	`+ copy->mURI.setGetEndpoints(mURI.getGetEndpoints());`
	`53`	`+ copy->mURI.setPostEndpoints(mURI.getPostEndpoints());`
`52`	`54`	`copy->mWFSVersion = mWFSVersion;`
`53`	`55`	`copy->mGeometryAttribute = mGeometryAttribute;`
`54`	`56`	`copy->mLayerPropertiesList = mLayerPropertiesList;`