Adds check for queryable layer before handling link (#395)

Maps4HTML · Apr 14, 2021 · 4ef236d · 4ef236d
1 parent dbfdb31
commit 4ef236d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/mapml/features/feature.js b/src/mapml/features/feature.js
@@ -60,8 +60,16 @@ export var Feature = L.Path.extend({
     L.DomEvent.on(path, 'mousedown', () =>{ drag = false;}, this);
     L.DomEvent.on(path, 'mousemove', () =>{ drag = true;}, this);
     L.DomEvent.on(path, "mouseup", (e) => {
-      L.DomEvent.stop(e);
-      if(!drag) M.handleLink(link, leafletLayer);
+      let onTop = true, nextLayer = this.options._leafletLayer._layerEl.nextElementSibling;
+      while(nextLayer){
+        if(nextLayer.tagName && nextLayer.tagName.toUpperCase() === "LAYER-")
+          onTop = !(nextLayer.checked && nextLayer._layer.queryable);
+        nextLayer = nextLayer.nextElementSibling;
+      }
+      if(onTop) {
+        L.DomEvent.stop(e);
+        if (!drag) M.handleLink(link, leafletLayer);
+      }
     }, this);
     L.DomEvent.on(path, "keypress", (e) => {
       L.DomEvent.stop(e);

diff --git a/test/e2e/core/featureLinks.test.js b/test/e2e/core/featureLinks.test.js
@@ -8,7 +8,7 @@ jest.setTimeout(50000);
         beforeAll(async () => {
           browser = await playwright[browserType].launch({
             headless: ISHEADLESS,
-            slowMo: 50,
+            slowMo: 100,
           });
           context = await browser.newContext();
           page = await context.newPage();