File tree 1 file changed +14
-3
lines changed
1 file changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -167,9 +167,19 @@ QStringList QgsWmsRenderContext::flattenedQueryLayers() const
167
167
QStringList _result;
168
168
if ( mLayerGroups .contains ( name ) )
169
169
{
170
- for ( const auto &l : mLayerGroups [ name ] )
170
+ const auto &layers { mLayerGroups [ name ] };
171
+ for ( const auto &l : layers )
171
172
{
172
- _result.append ( findLeaves ( l->shortName ().isEmpty () ? l->name () : l->shortName () ) );
173
+ const auto nick { layerNickname ( *l ) };
174
+ // This handles the case for root (fake) group
175
+ if ( mLayerGroups .contains ( nick ) )
176
+ {
177
+ _result.append ( name );
178
+ }
179
+ else
180
+ {
181
+ _result.append ( findLeaves ( nick ) );
182
+ }
173
183
}
174
184
}
175
185
else
@@ -178,7 +188,8 @@ QStringList QgsWmsRenderContext::flattenedQueryLayers() const
178
188
}
179
189
return _result;
180
190
};
181
- for ( const auto &name : mParameters .queryLayersNickname () )
191
+ const auto constNicks { mParameters .queryLayersNickname () };
192
+ for ( const auto &name : constNicks )
182
193
{
183
194
result.append ( findLeaves ( name ) );
184
195
}
You can’t perform that action at this time.
0 commit comments