Skip to content

Commit 6bbe3b9

Browse files
author
Hugo Mercier
committed
Fix DependencySorter.sortedLayerIds. Fixes #14281
1 parent 0c478d0 commit 6bbe3b9

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/core/qgslayerdefinition.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ void QgsLayerDefinition::DependencySorter::init( const QDomDocument& doc )
230230
{
231231
sortedLayers << id;
232232
mSortedLayerNodes << node;
233+
mSortedLayerIds << id;
233234
}
234235
else
235236
layersToSort << qMakePair( id, node );

tests/src/python/test_qgslayerdefinition.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,13 @@ def testDependency(self):
5252
doc.setContent(inDoc)
5353
dep = QgsLayerDefinition.DependencySorter(doc)
5454
nodes = dep.sortedLayerNodes()
55+
nodeIds = dep.sortedLayerIds()
5556
self.assertTrue(not dep.hasCycle())
5657
self.assertTrue(not dep.hasMissingDependency())
5758
self.assertEqual(nodes[0].firstChildElement("id").text(), "layerA")
5859
self.assertEqual(nodes[1].firstChildElement("id").text(), "layerB")
60+
self.assertEqual(nodeIds[0], "layerA")
61+
self.assertEqual(nodeIds[1], "layerB")
5962

6063
def testMissingDependency(self):
6164
inDoc = """
@@ -76,7 +79,6 @@ def testMissingDependency(self):
7679
doc = QDomDocument("testdoc")
7780
doc.setContent(inDoc)
7881
dep = QgsLayerDefinition.DependencySorter(doc)
79-
nodes = dep.sortedLayerNodes()
8082
self.assertTrue(not dep.hasCycle())
8183
self.assertTrue(dep.hasMissingDependency())
8284

@@ -99,7 +101,6 @@ def testCyclicDependency(self):
99101
doc = QDomDocument("testdoc")
100102
doc.setContent(inDoc)
101103
dep = QgsLayerDefinition.DependencySorter(doc)
102-
nodes = dep.sortedLayerNodes()
103104
self.assertTrue(dep.hasCycle())
104105

105106
def testVectorAndRaster(self):

0 commit comments

Comments
 (0)