From 96ae0faf8d906c3d65084a5135a051a1be6d0141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Giovanni=20Borella?= Date: Wed, 25 Jun 2025 08:31:15 +0000 Subject: [PATCH 1/2] Add filter icon on layers with filter --- CHANGELOG.md | 5 +++++ browser/i18n/da_DK.js | 3 ++- browser/i18n/en_US.js | 3 ++- browser/modules/layerTree/MarkupGenerator.js | 4 +++- browser/modules/switchLayer.js | 12 ++++++++++-- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 312c40d86..28df1819a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [CalVer](https://calver.org/). +## [unreleased] + +### Added +- Added an icon to the layer if the layer has an active filter. + ## [2025.6.2] - 2025-19-6 ### Added diff --git a/browser/i18n/da_DK.js b/browser/i18n/da_DK.js index 8a02dc94d..4831e9be4 100644 --- a/browser/i18n/da_DK.js +++ b/browser/i18n/da_DK.js @@ -235,6 +235,7 @@ module.exports = { "Reset filter": "Nulstil", "Filter editor": "Filter editor", "Layer is visible": "Laget er synligt", + "Layer has filter": "Laget har filter", "Parents": "Forældre", "Children": "Børn", "Back": "Tilbage", @@ -493,4 +494,4 @@ module.exports = { "Sign out": "Log ud" } -}; +}; \ No newline at end of file diff --git a/browser/i18n/en_US.js b/browser/i18n/en_US.js index 182235d6d..e597874b2 100644 --- a/browser/i18n/en_US.js +++ b/browser/i18n/en_US.js @@ -235,6 +235,7 @@ module.exports = { "Reset filter": "Reset filter", "Filter editor": "Filter editor", "Layer is visible": "Layer is visible", + "Layer has filter": "Layer has filter", "Parents": "Parents", "Children": "Children", "Back": "Back", @@ -493,4 +494,4 @@ module.exports = { "Not signed in": "Not signed in", "Sign out": "Sign out" } -}; +}; \ No newline at end of file diff --git a/browser/modules/layerTree/MarkupGenerator.js b/browser/modules/layerTree/MarkupGenerator.js index 3df80d02d..faf80404d 100644 --- a/browser/modules/layerTree/MarkupGenerator.js +++ b/browser/modules/layerTree/MarkupGenerator.js @@ -115,6 +115,8 @@ class MarkupGenerator { ${lockedLayer} + { const status = _self.getLayersEnabledStatus(); - if (!status?.[l] || !status[l].enabled) { + if (!status?.[l] || !status?.[l]?.enabled) { _self.init(l, true); } } api.turnOff = (l) => { const status = _self.getLayersEnabledStatus(); - if (status[l].enabled) { + if (status?.[l]?.enabled) { _self.init(l, false); } } @@ -691,6 +691,14 @@ module.exports = module.exports = { }) } + + // Show or hide the "has filter" icon + if (activeFilters.length > 0) { + $(`[data-gc2-layer-key^="${layerKey}"]`).find('.js-tiles-has-filter').show(); + } else { + $(`[data-gc2-layer-key^="${layerKey}"]`).find('.js-tiles-has-filter').hide(); + } + if (parsedMeta?.referenced_by && activeFilters.length === 0) { JSON.parse(parsedMeta.referenced_by).forEach((i) => { let parsedMetaChildLayer = meta.parseLayerMeta(i.rel); From 67566b2ecbf0c2c81f644e022ce2cec886c2d078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Giovanni=20Borella?= Date: Wed, 25 Jun 2025 08:33:29 +0000 Subject: [PATCH 2/2] revert unrelated change --- browser/modules/switchLayer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/modules/switchLayer.js b/browser/modules/switchLayer.js index 9250113c5..1f95bdc53 100644 --- a/browser/modules/switchLayer.js +++ b/browser/modules/switchLayer.js @@ -67,13 +67,13 @@ module.exports = module.exports = { // Expose init in global scope api.turnOn = (l) => { const status = _self.getLayersEnabledStatus(); - if (!status?.[l] || !status?.[l]?.enabled) { + if (!status?.[l] || !status[l].enabled) { _self.init(l, true); } } api.turnOff = (l) => { const status = _self.getLayersEnabledStatus(); - if (status?.[l]?.enabled) { + if (status[l].enabled) { _self.init(l, false); } }