Skip to content

No query for hidden layer #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/mapml/handlers/QueryHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ export var QueryHandler = L.Handler.extend({
// work backwards in document order (top down)
for (var l = layers.length - 1; l >= 0; l--) {
var mapmlLayer = layers[l]._layer;
if (layers[l].checked && mapmlLayer && mapmlLayer.queryable) {
if (
layers[l].checked &&
mapmlLayer &&
mapmlLayer.queryable &&
!mapmlLayer._layerEl.hidden
) {
return mapmlLayer;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/layers/multipleExtents.test.js

This comment was marked as resolved.

Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ test.describe('Multiple Extents Bounds Tests', () => {
const alabamaExtentItem = page.getByText('alabama_feature');
await expect(alabamaExtentItem).toHaveCount(1);
await expect(alabamaExtentItem).toHaveCSS('font-style', 'normal');

const alabamaMapExtent = page.locator('map-extent[label=alabama_feature]');
await expect(alabamaMapExtent).toHaveCount(1);
await expect(alabamaMapExtent).not.toHaveAttribute('disabled');
Expand Down
44 changes: 44 additions & 0 deletions test/e2e/layers/queryLink.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,5 +328,49 @@ test.describe('Playwright Query Link Tests', () => {
expect(endBottomRight.vertical).toBe(-2238133.096266195);
expect(endZoomLevel).toBe(6);
});
test("hidden layer is not queryable, hidden map-extent doesn't matter", async () => {
const viewer = await page.locator('mapml-viewer');
// query the layer when it's not hidden
await page.click('mapml-viewer');
let popupPane = await page.locator('.leaflet-popup-pane');
let popups = await popupPane.evaluate((pane) => pane.childElementCount);
// expect results
expect(popups).toBe(1);
const layer = await page.locator('layer-');
// dismiss the popup
await page.keyboard.press('Escape');
// hide the layer
await layer.evaluate((layer) => {
layer.hidden = true;
});
await page.waitForTimeout(500);
// query the layer when hidden
// expect no results
await page.click('mapml-viewer');
popups = await popupPane.evaluate((pane) => pane.childElementCount);
expect(popups).toBe(0);

// unhide the layer
await layer.evaluate((layer) => {
layer.hidden = false;
});

let ext = await page.locator('map-extent');
// hide the map-extent
await ext.evaluate((ext) => {
ext.hidden = true;
});
// query the layer when map-extent is hidden
// expect no results
await page.click('mapml-viewer');
popups = await popupPane.evaluate((pane) => pane.childElementCount);
// expect results - hidden map-extent has no effect on queryability
expect(popups).toBe(1);

// unhide the map-extent
await ext.evaluate((ext) => {
ext.hidden = false;
});
});
});
});