@geogirafe/lib-geoportal 1.1.0-dev.2595141271 → 1.1.0-dev.2596776001

package/assets/i18n/de.json

@@ -243,6 +243,8 @@
     "help-themes": "Entdecken Sie die verfügbaren Themen. Nach der Auswahl werden die zugehörigen Karten automatisch geladen.",
     "help-user-preferences": "Verwalten Sie Ihre Benutzereinstellungen, einschließlich Sprache, Anzeigemodus und Kartenoptionen.",
     "Hide Swiper": "Swiper ausblenden",
+    "highlight-all": "Alles markieren",
+    "highlight-per-layer": "Markierung pro Layer",
     "info": "Information",
     "Information without public faith": "Informationen ohne öffentliche Glaubwürdigkeit",
     "Intensity": "Intensität",
@@ -450,14 +452,15 @@
     "Select none": "Nichts auswählen",
     "Select operator...": "Operator auswählen...",
     "Select to change appearance": "Auswählen, um das Aussehen zu ändern",
-    "selectFillColor": "Auswahl Füllfarbe",
-    "selectHighlightFillColor": "Auswahl Highlight Füllfarbe",
-    "selectHighlightStrokeColor": "Auswahl Highlight Strichfarbe",
+    "selectFillColor": "Abfrage Füllfarbe",
+    "selectHighlightFillColor": "Abfrageauswahl Füllfarbe",
+    "selectHighlightMode": "Abfragemarkierung in der Karte",
+    "selectHighlightStrokeColor": "Abfrageauswahl Strichfarbe",
     "Selection": "Auswahl",
     "selection-mode": "Selektionsmodus",
-    "selection-tool-panel": "Selektions-Tool",
-    "selectionComponent": "Komponente für Kartenauswahl",
-    "selectStrokeColor": "Auswahl Strichfarbe",
+    "selection-tool-panel": "Abfragetool",
+    "selectionComponent": "Komponente für Abfrageresultate",
+    "selectStrokeColor": "Abfrage Strichfarbe",
     "Send": "Senden",
     "Send message": "Nachricht senden",
     "Settings": "Einstellungen",

package/assets/i18n/en.json

@@ -454,6 +454,9 @@
     "Select to change appearance": "Select to change appearance",
     "selectFillColor": "Selection fill color",
     "selectHighlightFillColor": "Selection highlight fill color",
+    "selectHighlightMode": "Selection highlight mode",
+    "highlight-all": "Highlight all",
+    "highlight-per-layer": "Highlight per layer",
     "selectHighlightStrokeColor": "Selection highlight stroke color",
     "Selection": "Selection",
     "selection-mode": "Selection Mode",

package/assets/i18n/fr.json

@@ -243,6 +243,8 @@
     "help-themes": "Explorez les thèmes disponibles. Une fois un thème sélectionné, les cartes associées s'affichent automatiquement.",
     "help-user-preferences": "Gérez vos préférences, notamment la langue, le mode d'affichage et les options de la carte.",
     "Hide Swiper": "Masquer le swiper",
+    "highlight-all": "Tout mettre en surbrillance",
+    "highlight-per-layer": "Surbrillance par couche",
     "info": "Information",
     "Information without public faith": "Informations dépourvues de foi publique",
     "Intensity": "Intensité",
@@ -452,6 +454,7 @@
     "Select to change appearance": "Sélectionner pour changer l'apparence",
     "selectFillColor": "Couleur de remplissage des sélections",
     "selectHighlightFillColor": "Couleur de remplissage de surbrillance",
+    "selectHighlightMode": "Mode de surbrillance de la sélection",
     "selectHighlightStrokeColor": "Couleur du trait de surbrillance",
     "Selection": "Sélection",
     "selection-mode": "Mode de Sélection",

package/assets/i18n/it.json

@@ -243,6 +243,8 @@
     "help-themes": "Scopri i temi disponibili. Selezionando un tema, le mappe correlate vengono caricate automaticamente.",
     "help-user-preferences": "Gestisci le preferenze utente, inclusa la lingua, la modalità di visualizzazione e le opzioni mappa.",
     "Hide Swiper": "Nascondi Swiper",
+    "highlight-all": "Evidenzia tutto",
+    "highlight-per-layer": "Evidenzia per livello",
     "info": "Informazione",
     "Information without public faith": "Informazioni prive di fede pubblica",
     "Intensity": "Intensità",
@@ -452,6 +454,7 @@
     "Select to change appearance": "Seleziona per cambiare aspetto",
     "selectFillColor": "Colore di riempimento per le selezioni",
     "selectHighlightFillColor": "Colore di riempimento dell'evidenziazione",
+    "selectHighlightMode": "Modalità evidenziazione selezione",
     "selectHighlightStrokeColor": "Colore del tratto di evidenziazione della selezione",
     "Selection": "Selezione",
     "selection-mode": "Modalità di Selezione",

package/components/map/component.d.ts

@@ -1,4 +1,5 @@
 import { Collection, Feature, Map, MapBrowserEvent, MapEvent } from 'ol';
+import { Style } from 'ol/style.js';
 import { ProjectionLike } from 'ol/proj.js';
 import VectorSource from 'ol/source/Vector.js';
 import VectorLayer from 'ol/layer/Vector.js';
@@ -23,6 +24,7 @@ import XyzManager from './tools/xyzmanager.js';
 import SelectionParam from '../../models/selectionparam.js';
 import { CameraConfig } from '../../tools/state/globe.js';
 import { Callback } from '../../tools/state/statemanager.js';
+import { StyleFunction } from 'ol/style/Style.js';
 declare global {
     interface Window {
         Cesium: unknown;
@@ -69,6 +71,8 @@ export default class MapComponent extends GirafeHTMLElement {
     selectedFeaturesCollection: Collection<Feature<Geometry>>;
     highlightedFeaturesCollection: Collection<Feature<Geometry>>;
     selectionLayer: VectorLayer<VectorSource>;
+    selectionLayerStyle: Style;
+    selectionLayerStyleFunc: StyleFunction;
     highlightLayer: VectorLayer<VectorSource>;
     pixelTolerance: number;
     dragbox: DragBox;
@@ -163,4 +167,5 @@ export default class MapComponent extends GirafeHTMLElement {
     private clearAllMarkers;
     private addMarker;
     private showCrosshair;
+    private onFeaturesTypeChanged;
 }

package/components/map/component.js

@@ -43,6 +43,7 @@ import WfsFilterCondition from '../../tools/wfs/wfsfiltercondition.js';
 import { applyFeaturesToSelection, applyOpacityToLayers } from '../../tools/utils/utils.js';
 import { SelectionMode } from '../../models/selection.js';
 import { platformModifierKeyOnly } from 'ol/events/condition.js';
+import { HighlightMode } from '../../tools/configuration/girafeconfig.js';
 export default class MapComponent extends GirafeHTMLElement {
     templateUrl = null;
     styleUrls = null;
@@ -101,6 +102,20 @@ export default class MapComponent extends GirafeHTMLElement {
     selectedFeaturesCollection = new Collection();
     highlightedFeaturesCollection = new Collection();
     selectionLayer;
+    selectionLayerStyle;
+    selectionLayerStyleFunc = (feature) => {
+        const shouldApplyCheck = this.config.selection.defaultHighlightMode === HighlightMode.HighlightPerLayer &&
+            this.config.interface.defaultSelectionComponent === 'grid';
+        if (shouldApplyCheck) {
+            const selectedFeaturesType = this.state.selection.selectedFeaturesType;
+            if (selectedFeaturesType && feature.getId().startsWith(selectedFeaturesType)) {
+                return this.selectionLayerStyle;
+            }
+        }
+        else {
+            return this.selectionLayerStyle;
+        }
+    };
     highlightLayer;
     pixelTolerance = 10;
     dragbox;
@@ -134,6 +149,7 @@ export default class MapComponent extends GirafeHTMLElement {
         this.subscribe('interface.darkMapMode', () => this.onChangeDarkMode());
         this.subscribe('selection.selectionParameters', (_, newParams) => this.onSelectFeatures(newParams));
         this.subscribe('selection.selectedFeatures', (_oldFeatures, newFeatures) => this.onFeaturesSelected(newFeatures));
+        this.subscribe('selection.selectedFeaturesType', (_oldFeaturesType, newFeaturesType) => this.onFeaturesTypeChanged(newFeaturesType));
         this.subscribe('selection.highlightedFeatures', (_oldFeatures, newFeatures) => this.onFeatureHighlighted(newFeatures));
         this.subscribe('selection.focusedFeatures', (_oldFeature, newFeature) => this.focusFeature.setFocusedFeatures(newFeature));
         this.subscribe('position.markers', () => {
@@ -284,7 +300,8 @@ export default class MapComponent extends GirafeHTMLElement {
             properties: {
                 addToPrintedLayers: true
             },
-            source: selectionSource
+            source: selectionSource,
+            style: this.selectionLayerStyleFunc
         });
         this.highlightLayer = new VectorLayer({
             source: highlightSource
@@ -531,7 +548,7 @@ export default class MapComponent extends GirafeHTMLElement {
         this.closeSwiperButton.style.left = `${offset}px`;
     }
     setSelectLayerStyle() {
-        this.selectionLayer.setStyle(new Style({
+        this.selectionLayerStyle = new Style({
             stroke: new Stroke({
                 color: this.config.selection.defaultStrokeColor,
                 width: this.config.selection.defaultStrokeWidth
@@ -545,7 +562,7 @@ export default class MapComponent extends GirafeHTMLElement {
                     width: this.config.selection.defaultStrokeWidth
                 })
             })
-        }));
+        });
     }
     setHighlightLayerStyle() {
         this.highlightLayer.setStyle(new Style({
@@ -1091,4 +1108,8 @@ export default class MapComponent extends GirafeHTMLElement {
         this.setCrosshairStyle();
         this.olMap.addLayer(this.crosshairLayer);
     }
+    onFeaturesTypeChanged(_newFeaturesType) {
+        console.log('Features type changed: ' + _newFeaturesType);
+        this.selectionLayer.changed();
+    }
 }

package/components/selectiongrid/tools/selectiontabulatormanager.js

@@ -54,6 +54,7 @@ export default class SelectionTabulatorManager {
             return;
         }
         visibleTabHeader.active = true;
+        this.context.stateManager.state.selection.selectedFeaturesType = id;
     }
     /**
      * Creates (replace) the Tabulator grid based on the provided tab id and related data and features.

package/components/userpreferences/component.js

@@ -6,6 +6,7 @@ import { PreferenceGroups, UserPreference } from './userPreference.js';
 import { getPropertyByPath, setPropertyByPath } from '../../tools/utils/pathUtils.js';
 import GirafeColorPicker from '../../tools/utils/girafecolorpicker.js';
 import { applyOpacityToLayers, systemIsInDarkMode } from '../../tools/utils/utils.js';
+import { HighlightMode } from '../../tools/configuration/girafeconfig.js';
 /**
  Lets the user override default configuration values and saves them as user data.
  */
@@ -53,6 +54,7 @@ export default class UserPreferencesComponent extends GirafeHTMLElement {
             darkFrontendMode: new UserPreference('interface.darkFrontendMode', 'interface.darkFrontendMode', 'visual', 'select'),
             darkMapMode: new UserPreference('interface.darkMapMode', 'interface.darkMapMode', 'visual', 'checkbox'),
             selectionComponent: new UserPreference('interface.defaultSelectionComponent', 'interface.selectionComponent', 'visual', 'select'),
+            selectHighlightMode: new UserPreference('selection.defaultHighlightMode', null, 'visual', 'select'),
             selectFillColor: new UserPreference('selection.defaultFillColor', null, 'visual', 'color'),
             selectStrokeColor: new UserPreference('selection.defaultStrokeColor', null, 'visual', 'color'),
             selectHighlightFillColor: new UserPreference('selection.highlightFillColor', null, 'visual', 'color'),
@@ -143,6 +145,10 @@ export default class UserPreferencesComponent extends GirafeHTMLElement {
             { label: 'dark', value: true },
             { label: 'light', value: false }
         ];
+        this.preferences.selectHighlightMode.options = [
+            { label: 'highlight-all', value: HighlightMode.HighlightAll },
+            { label: 'highlight-per-layer', value: HighlightMode.HighlightPerLayer }
+        ];
     }
     /**
      * Collect all possible options for the default theme preference. This has to be repeatable, since the user

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geomapfish.dev"
   },
-  "version": "1.1.0-dev.2595141271",
+  "version": "1.1.0-dev.2596776001",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2595141271", "build":"2595141271", "date":"11/06/2026"}
+{"version":"1.1.0-dev.2596776001", "build":"2596776001", "date":"12/06/2026"}

package/tools/configuration/girafeconfig.d.ts

@@ -1,3 +1,7 @@
+export declare enum HighlightMode {
+    HighlightAll = "highlight-all",
+    HighlightPerLayer = "highlight-per-layer"
+}
 import { Config as SanitizeConfig } from 'dompurify';
 declare class GirafeConfig {
     general: {
@@ -73,6 +77,7 @@ declare class GirafeConfig {
         defaultStrokeWidth: number;
         highlightFillColor: string;
         highlightStrokeColor: string;
+        defaultHighlightMode: HighlightMode;
     };
     drawing: {
         defaultFillColor: string;

package/tools/configuration/girafeconfig.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+export var HighlightMode;
+(function (HighlightMode) {
+    HighlightMode["HighlightAll"] = "highlight-all";
+    HighlightMode["HighlightPerLayer"] = "highlight-per-layer";
+})(HighlightMode || (HighlightMode = {}));
 import { defaultNewsSanitizeConfig, defaultPermalinkSanitizeConfig, defaultQuerySanitizeConfig } from './sanitizeconfig.defaults';
 class GirafeConfig {
     general;
@@ -190,7 +196,8 @@ class GirafeConfig {
             defaultStrokeColor: config.selection?.defaultStrokeColor ?? '#ff3333',
             defaultStrokeWidth: config.selection?.defaultStrokeWidth ?? 4,
             highlightFillColor: config.selection?.highlightFillColor ?? '#00ff227f',
-            highlightStrokeColor: config.selection?.highlightStrokeColor ?? '#00ff22'
+            highlightStrokeColor: config.selection?.highlightStrokeColor ?? '#00ff22',
+            defaultHighlightMode: config.selection?.defaultHighlightMode ?? HighlightMode.HighlightAll
         };
     }
     initConfigPrint(config) {

package/tools/main.d.ts

@@ -9,6 +9,7 @@ export { default as GMFManager } from './auth/gmfmanager.js';
 export { default as OpenIdConnectManager } from './auth/openidconnectmanager.js';
 export { default as PluginManager } from './auth/pluginmanager.js';
 export { default as ConfigManager } from './configuration/configmanager.js';
+export type { HighlightMode } from './configuration/girafeconfig.js';
 export { default as GirafeConfig } from './configuration/girafeconfig.js';
 export { defaultNewsSanitizeConfig, defaultPermalinkSanitizeConfig, defaultQuerySanitizeConfig } from './configuration/sanitizeconfig.defaults';
 export { default as GirafeContext } from './context/context.js';

package/tools/state/objectselection.d.ts

@@ -8,6 +8,7 @@ export default class ObjectSelection {
     initialSelectionQuery?: InitialSelectionQuery;
     selectionParameters: SelectionParam[];
     selectedFeatures: Feature[];
+    selectedFeaturesType?: string;
     focusedFeatures: Feature[] | null;
     highlightedFeatures: Feature[];
     gridSelected: boolean;

package/tools/state/objectselection.js

@@ -4,6 +4,7 @@ export default class ObjectSelection {
     initialSelectionQuery;
     selectionParameters = [];
     selectedFeatures = [];
+    selectedFeaturesType;
     focusedFeatures = null;
     highlightedFeatures = [];
     gridSelected = false;