From 49885167927176c5664214c5e2f43de0ba244ed1 Mon Sep 17 00:00:00 2001 From: Felix Schmenger Date: Mon, 11 May 2026 14:10:50 +0200 Subject: [PATCH 1/2] Do not reverse the list of map layers. --- src/components/attributeTable/AttributeTableWin.vue | 3 +-- src/components/bglayerswitcher/BgLayerList.vue | 3 +-- src/components/layerlist/LayerList.vue | 3 +-- src/components/ol/Map.vue | 2 +- src/components/overviewmap/OverviewMapPanel.vue | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/attributeTable/AttributeTableWin.vue b/src/components/attributeTable/AttributeTableWin.vue index 8fb88fff..d1a31d8d 100644 --- a/src/components/attributeTable/AttributeTableWin.vue +++ b/src/components/attributeTable/AttributeTableWin.vue @@ -72,8 +72,7 @@ export default { layer instanceof VectorLayer && layer.get('lid') !== 'wgu-measure-layer' && layer.get('lid') !== 'wgu-geolocator-layer' - ) - .reverse(); + ); }, /** * Reactive property to return the items object to bind to the selection menu. diff --git a/src/components/bglayerswitcher/BgLayerList.vue b/src/components/bglayerswitcher/BgLayerList.vue index eaebf529..779d7438 100644 --- a/src/components/bglayerswitcher/BgLayerList.vue +++ b/src/components/bglayerswitcher/BgLayerList.vue @@ -79,8 +79,7 @@ export default { */ displayedLayers () { return this.layers - .filter(layer => layer.get('isBaseLayer')) - .reverse(); + .filter(layer => layer.get('isBaseLayer')); }, /** * Reactive property to return the currently visible OpenLayers background layer ID. diff --git a/src/components/layerlist/LayerList.vue b/src/components/layerlist/LayerList.vue index 0fb2bee8..dec3146f 100644 --- a/src/components/layerlist/LayerList.vue +++ b/src/components/layerlist/LayerList.vue @@ -41,8 +41,7 @@ export default { */ displayedLayers () { return this.layers - .filter(layer => layer.get('displayInLayerList') !== false && !layer.get('isBaseLayer')) - .reverse(); + .filter(layer => layer.get('displayInLayerList') !== false && !layer.get('isBaseLayer')); } } }; diff --git a/src/components/ol/Map.vue b/src/components/ol/Map.vue index 2127e83d..dcbc186b 100644 --- a/src/components/ol/Map.vue +++ b/src/components/ol/Map.vue @@ -203,7 +203,7 @@ export default { const layers = []; const appConfig = this.$appConfig; const mapLayersConfig = appConfig.mapLayers || []; - mapLayersConfig.reverse().forEach(function (lConf) { + mapLayersConfig.forEach(function (lConf) { // Some Layers may require a TileGrid object // Remarks: Passing null instead of undefined as parameters into the // constructor of OpenLayers sources overwrites OpenLayers defaults. diff --git a/src/components/overviewmap/OverviewMapPanel.vue b/src/components/overviewmap/OverviewMapPanel.vue index 8197bc21..a7b821da 100644 --- a/src/components/overviewmap/OverviewMapPanel.vue +++ b/src/components/overviewmap/OverviewMapPanel.vue @@ -66,7 +66,6 @@ export default { selectedBgLayer () { return this.layers .filter(layer => layer.get('isBaseLayer')) - .reverse() .find(layer => layer.getVisible()); } }, From b2dd5114531cbe13d25807940686dcdf1b8fd70f Mon Sep 17 00:00:00 2001 From: Felix Schmenger Date: Mon, 11 May 2026 16:59:12 +0200 Subject: [PATCH 2/2] Fix layer order in unit tests for PermalinkController. --- tests/unit/specs/components/ol/PermalinkController.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/specs/components/ol/PermalinkController.spec.js b/tests/unit/specs/components/ol/PermalinkController.spec.js index beadeada..c64b28d9 100644 --- a/tests/unit/specs/components/ol/PermalinkController.spec.js +++ b/tests/unit/specs/components/ol/PermalinkController.spec.js @@ -172,7 +172,7 @@ describe('ol/Map.vue', () => { } }); - expect(vm.permalinkController.getParamStr()).to.equal('#z=' + newZoom + '&c=8.9832%2C17.6789&r=0&l=ahocevar-imagewms%2Cahocevar-wms%2Cosm-bg'); + expect(vm.permalinkController.getParamStr()).to.equal('#z=' + newZoom + '&c=8.9832%2C17.6789&r=0&l=osm-bg%2Cahocevar-wms%2Cahocevar-imagewms'); }); afterEach(() => {