Merge branch 'develop' into hstd-main

hajkmap · Aug 16, 2023 · 4e0eaed · 4e0eaed
2 parents c18085e + 6d388b2
commit 4e0eaed
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/new-client/src/plugins/LayerSwitcher/components/LayerGroupItem.js b/new-client/src/plugins/LayerSwitcher/components/LayerGroupItem.js
@@ -101,6 +101,7 @@ class LayerGroupItem extends Component {
     const { layer } = props;
     const layerInfo = props.layer.get("layerInfo");
     this.state = {
+      subLayers: props.layer.subLayers,
       caption: layerInfo.caption,
       visible: props.layer.get("visible"),
       // If layer is to be shown, check if there are some specified sublayers (if yes, we'll
@@ -575,6 +576,12 @@ class LayerGroupItem extends Component {
       );
     } else {
       visibleSubLayers.push(subLayer);
+      // Restore order to its former glory. Sort using original sublayer array.
+      visibleSubLayers.sort((a, b) => {
+        return (
+          this.state.subLayers.indexOf(a) - this.state.subLayers.indexOf(b)
+        );
+      });
       isNewSubLayer = true;
     }