Merge pull request #5136 from 3liz/backport-5135-to-release_3_9

[Backport release_3_9] Fix: order popups following layers order
3liz · Dec 18, 2024 · 328e2ab · 328e2ab
2 parents 91b4782 + 6c2f6fa
commit 328e2ab
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 65 deletions.
diff --git a/assets/src/modules/Popup.js b/assets/src/modules/Popup.js
@@ -107,7 +107,8 @@ export default class Popup {
         const xCoord = evt?.xy?.x || evt?.pixel?.[0];
         const yCoord = evt?.xy?.y || evt?.pixel?.[1];
 
-        let candidateLayers = this._lizmapState.rootMapGroup.findMapLayers().reverse();
+        // Order popups following layers order
+        let candidateLayers = this._lizmapState.rootMapGroup.findMapLayers().toSorted((a, b) => b.layerOrder - a.layerOrder);
 
         // Only request visible layers
         candidateLayers = candidateLayers.filter(layer => layer.visibility);

diff --git a/tests/end2end/playwright/layer_order.spec.js b/tests/end2end/playwright/layer_order.spec.js
@@ -0,0 +1,33 @@
+// @ts-check
+import { test, expect } from '@playwright/test';
+import { gotoMap } from './globals';
+
+test.describe('Layer order', () => {
+
+    test('Layer order in map and popups', async ({ page }) => {
+        const url = '/index.php/view/map/?repository=testsrepository&project=layer_order';
+        await gotoMap(url, page);
+
+        // Assert layers order is as defined in QGIS
+        expect(await page.evaluate(() => lizMap.mainLizmap.map.getLayerByName('quartiers').getZIndex())).toEqual(0);
+        expect(await page.evaluate(() => lizMap.mainLizmap.map.getLayerByName('sousquartiers').getZIndex())).toEqual(1);
+        expect(await page.evaluate(() => lizMap.mainLizmap.map.getLayerByName('tramway_lines').getZIndex())).toEqual(2);
+        expect(await page.evaluate(() => lizMap.mainLizmap.map.getLayerByName('tramway_stops').getZIndex())).toEqual(3);
+
+        // Assert popups order is as defined in QGIS
+        await page.locator('#newOlMap').click({
+            position: {
+                x: 428,
+                y: 260
+            }
+        });
+
+        let popups = page.locator(".lizmapPopupSingleFeature");
+        await expect(popups).toHaveCount(4);
+
+        await expect(popups.nth(0)).toHaveAttribute("data-layer-id", "tramway_stops_437c64d6_adbb_4018_95d6_1f8f8cd6a81c");
+        await expect(popups.nth(1)).toHaveAttribute("data-layer-id", "tramway_lines_684f9541_dd3a_4f2d_9233_89f379413a18");
+        await expect(popups.nth(2)).toHaveAttribute("data-layer-id", "sousquartiers_274734f2_9aee_4acd_abaf_ba5692d1fd20");
+        await expect(popups.nth(3)).toHaveAttribute("data-layer-id", "quartiers_9226ee56_fa1c_44f8_8447_5be0815dd424");
+    });
+});