@geogirafe/lib-geoportal 1.2.0-dev.2813242211 → 1.2.0-dev.2829121016

package/components/map-3d/component.js

@@ -0,0 +1,139 @@
+import { html as uHtml } from 'uhtml';
+// SPDX-License-Identifier: Apache-2.0
+import GirafeHTMLElement from '../../base/GirafeHTMLElement.js';
+import LayerWms from '../../models/layers/layerwms.js';
+/**
+ * The 3D Map.
+ *
+ * The Component itself stays lightweight: Cesium and OLCesium are only imported when the 3D Map
+ * is displayed for the first time. Everything that needs those libraries lives in ./tools/globe.
+ * The synchronization with the 2D Map is done by OLCesium, through the OpenLayers map of the
+ * MapManager. There is therefore no direct dependency to the map-2d Component.
+ */
+export default class Map3dComponent extends GirafeHTMLElement {
+    templateUrl = null;
+    styleUrls = null;
+    template = () => {
+        return uHtml `<style>
+.hidden{display:none!important}.gg-rotate90{transform:rotate(90deg)}.gg-rotate180{transform:rotate(180deg)}.gg-rotate270{transform:rotate(270deg)}img{filter:var(--svg-filter)}img.legend-image{filter:var(--svg-map-filter);background:var(--svg-legend-bkg)}div{scrollbar-width:thin}a,a:visited{color:var(--link-color)}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}@keyframes spin-wait{0%{transform:rotate(0)}7%{transform:rotate(360deg)}to{transform:rotate(360deg)}}.gg-spin{animation-name:spin;animation-duration:2s;animation-timing-function:linear;animation-iteration-count:infinite}.gg-spin-wait{animation-name:spin-wait;animation-duration:10s;animation-timing-function:linear;animation-iteration-count:infinite}::-webkit-scrollbar{width:5px}::-webkit-scrollbar-thumb{background:#999}button,input,select,textarea{font:inherit}.gg-button,.gg-select,.gg-input,.gg-textarea{background-color:var(--bkg-color);color:var(--text-color);border:var(--app-standard-border);box-sizing:border-box;cursor:pointer;border-radius:3px;outline:0;margin:0;padding:0 0 0 .5rem;display:inline-block}.gg-label{background-color:var(--bkg-color);color:var(--text-color);border:none;align-items:center;margin:0;padding:0;display:flex}.gg-button,.gg-select,.gg-input,.gg-label{min-height:calc(var(--app-standard-height) / 1.5)}.gg-textarea{max-height:initial;resize:vertical;height:6rem;padding:.5rem;line-height:1.3rem}.gg-input{cursor:text}.gg-checkbox{accent-color:var(--text-color);width:1.2rem}.gg-range{accent-color:var(--text-color)}.gg-button{padding:0 .5rem}.gg-button.active{border:solid 1px var(--text-color-grad1);background-color:var(--bkg-color-grad2)}.gg-button:disabled{background-color:var(--bkg-color-grad1);color:var(--text-color-grad2);cursor:not-allowed;border:none}.gg-button:disabled img{filter:opacity(.6)}.gg-input:disabled,.gg-select:disabled,.gg-textarea:disabled{background-color:var(--bkg-color-grad1);color:var(--text-color-grad2);cursor:not-allowed}.gg-button>img{vertical-align:middle}.gg-icon-button{color:var(--text-color);cursor:pointer;background-color:#0000;border:none;flex-direction:column;justify-content:center;align-items:center;padding:0;display:flex}.gg-icon{justify-content:center;align-items:center;display:flex}.gg-big,.gg-big-withtext{min-width:var(--app-standard-height);min-height:var(--app-standard-height);max-height:var(--app-standard-height)}.gg-big img,.gg-big-withtext img{width:calc(var(--app-standard-height) - 1.5rem);margin:0}.gg-big-withtext span{font-variant:small-caps;padding:0 1rem;font-size:.9rem}.gg-medium,.gg-medium-withtext{min-width:calc(var(--app-standard-height) / 1.2);min-height:calc(var(--app-standard-height) / 1.2);max-height:calc(var(--app-standard-height) / 1.2);flex-direction:row}.gg-medium img{width:calc(var(--app-standard-height) / 2.4);margin:0}.gg-medium-withtext img{width:calc(var(--app-standard-height) / 2.4);margin-left:.5rem}.gg-medium-withtext span{padding:0 1rem 0 .5rem;font-size:.9rem}.gg-small,.gg-small-withtext{min-width:calc(var(--app-standard-height) / 2);min-height:calc(var(--app-standard-height) / 2);max-height:calc(var(--app-standard-height) / 2);flex-direction:row}.gg-small img{width:calc(var(--app-standard-height) / 3);margin:0}.gg-small-withtext img{width:calc(var(--app-standard-height) / 3);margin-left:.5rem}.gg-small-withtext span{padding:0 .5rem 0 .3rem;font-size:.9rem}.gg-button:hover:not(:disabled),.gg-select:hover:not(:disabled),.gg-input:hover:not(:disabled),.gg-textarea:hover:not(:disabled),.gg-icon-button:hover:not(:disabled){background-color:var(--bkg-color-grad1)}.gg-opacity{opacity:.5}.gg-opacity:hover{opacity:1;background-color:#0000}.gg-tabs{cursor:pointer;grid-auto-flow:column;padding-bottom:1rem;font-size:1rem;display:grid}.gg-tab{border:none;border-bottom:var(--app-standard-border);cursor:pointer;color:var(--text-color);background:0 0;padding:.5rem}.gg-tab.active{border-bottom:solid 1px var(--text-color)}.girafe-button-big,.girafe-button-large,.girafe-button-small,.girafe-button-tiny{color:var(--text-color);background-color:#0000;border:none;flex-direction:column;display:flex}.girafe-button-big:hover,.girafe-button-large:hover,.girafe-button-small:hover,.girafe-button-tiny:hover{background-color:var(--bkg-color-grad1);cursor:pointer}.girafe-button-big.dark,.girafe-button-large.dark,.girafe-button-small.dark,.girafe-button-tiny.dark{background-color:var(--bkg-color);filter:invert()}.girafe-button-big{width:var(--app-standard-height);height:var(--app-standard-height);align-items:center;padding:1rem}.girafe-button-big img{overflow:hidden}.girafe-button-large{flex-direction:row}.girafe-button-large img{height:2rem;margin:.3rem}.girafe-button-large span{height:2rem;margin:.3rem;line-height:2rem}.girafe-button-small{min-width:calc(var(--app-standard-height) / 2);height:calc(var(--app-standard-height) / 2);align-items:center;padding:.5rem}.girafe-button-small img{overflow:hidden}.girafe-button-small span{text-align:left;text-overflow:ellipsis;width:100%;overflow:hidden}.girafe-button-tiny{align-items:center;width:1rem;height:1rem;padding:0}.girafe-button-tiny img{overflow:hidden}.girafe-onboarding-theme{background-color:var(--bkg-color)!important;color:var(--text-color)!important}.girafe-onboarding-theme button{background-color:var(--bkg-color)!important;color:var(--text-color)!important;text-shadow:none!important}.girafe-onboarding-theme button.driver-popover-close-btn{z-index:10000}.tippy-box{background-color:var(--bkg-color)!important;border:var(--app-standard-border)!important}.tippy-content{color:var(--text-color)!important}.tippy-arrow{color:var(--bkg-color)!important}.tippy-box[data-theme~=error]{background-color:var(--error-color);white-space:pre-line}div.tippy-box[data-theme=image-popup]{border:var(--app-standard-border)!important;& div.tippy-content{background-color:var(--bkg-color)!important;& img{max-width:20rem;max-height:20rem}}& div.tippy-arrow{color:var(--bkg-color)!important}}
+</style><style>
+#cs-map{background-color:var(--bkg-color);width:100%;height:100%;position:absolute;top:0;overflow:hidden}.hidden{display:none}.center{text-align:center;margin:10px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}.loading span{color:var(--text-color);margin-top:1rem;font-weight:600;display:block}.loading span.quote{font-style:italic;font-weight:300}
+</style>
+<style>${this.customStyle}</style>
+<div id="cs-map"><div class="${this.loading ? 'loading center' : 'loading hidden'}"><img alt="loading-icon" src="icons/loading.svg" class="gg-spin"> <span i18n="Loading cesium...">Loading cesium...</span> <span class="quote" i18n="cesium-loading-quote">Please be patient, like a giraffe reaching for the tastiest leaves.</span></div></div>
+${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
+    };
+    globe = null;
+    map3dTarget;
+    loading = false;
+    pixelTolerance = 10;
+    /** Promise of the currently running globe creation, to prevent creating it twice. */
+    globeCreation = null;
+    /** The OLCesium instance, once the globe has been created. */
+    get map3d() {
+        return this.globe?.olCesium;
+    }
+    get config() {
+        return this.context.configManager.Config;
+    }
+    constructor() {
+        super('map-3d');
+    }
+    subscribe(path, callback) {
+        // @ts-expect-error The call would have succeeded against this implementation,
+        // but implementation signatures of overloads are not externally visible.
+        return super.subscribe(path, callback);
+    }
+    /**
+     * The Map needs to be displayed in Fullscreen Mode.
+     */
+    get isFullscreenComponent() {
+        return true;
+    }
+    connectedCallback() {
+        super.connectedCallback();
+        this.render();
+        this.registerEvents();
+        this.onGlobeToggled();
+    }
+    render() {
+        super.render();
+        this.map3dTarget = this.shadow.getElementById('cs-map');
+    }
+    registerEvents() {
+        this.subscribe('globe.display', async () => {
+            await this.onGlobeToggled();
+            this.globe?.setCamera(this.state.globe.camera);
+        });
+        this.subscribe('globe.shadows', (_oldShadows, newShadows) => this.globe?.setShadows(newShadows));
+        this.subscribe('globe.camera', async (_oldCamera, newCamera) => {
+            await this.onGlobeToggled();
+            this.globe?.setCamera(newCamera);
+        });
+        this.subscribe('activeBasemaps', (_, newBasemaps) => this.globe?.onChangeBasemaps(newBasemaps));
+        this.subscribe(/activeBasemaps\.\d\.opacity/, (_oldOpacity, _newOpacity, basemap) => this.globe?.changeBasemapOpacity(basemap));
+        this.subscribe(/layers\.layersList\..*\.activeState/, (_oldActive, _newActive, layer) => {
+            if (layer instanceof LayerWms) {
+                this.globe?.onLayerToggled(layer);
+            }
+        });
+        this.subscribe(/layers\.layersList\..*\.opacity/, (_oldOpacity, _newOpacity, layer) => this.globe?.changeOpacity(layer));
+        this.subscribe(/layers\.layersList\..*\.filter/, (_oldFilter, _newFilter, layer) => this.globe?.changeFilter(layer));
+        this.subscribe('application.isReady', (_, isLoaded) => {
+            if (isLoaded) {
+                // The globe may not be ready when the rest of the application is initialized.
+                // The camera of a shared state can only be applied once everything is loaded.
+                this.globe?.setCamera(this.state.globe.camera);
+            }
+        });
+    }
+    /**
+     * Lazily loads Cesium/OLCesium and creates the globe. Does nothing if no 3D configuration
+     * is available or if the globe has already been created.
+     */
+    async createGlobe() {
+        if (this.globe || !this.config.map3d) {
+            return;
+        }
+        this.globeCreation ??= (async () => {
+            this.loading = true;
+            this.refreshRender();
+            const { default: Globe } = await import('./tools/globe');
+            const globe = new Globe(this.context, this.name, this.pixelTolerance);
+            await globe.initialize(this.map3dTarget);
+            this.globe = globe;
+            this.loading = false;
+            this.refreshRender();
+            this.state.globe.loaded = true;
+        })();
+        return this.globeCreation;
+    }
+    /**
+     * Shows or hides the 3D Map and sizes it depending on the current display mode.
+     * The 2D Map takes care of its own sizing.
+     */
+    async onGlobeToggled() {
+        if (this.state.globe.display === '3D') {
+            // Full screen globe has been enabled
+            this.style.display = 'block';
+            this.style.left = '0';
+            this.style.width = '100%';
+            await this.createGlobe();
+            this.globe?.setEnabled(true);
+        }
+        else if (this.state.globe.display === '2D/3D') {
+            // Side by side has been enabled
+            this.style.display = 'block';
+            this.style.left = '45%';
+            this.style.width = '55%';
+            await this.createGlobe();
+            this.globe?.setEnabled(true);
+        }
+        else {
+            // 3d map is not visible
+            this.globe?.setEnabled(false);
+            this.style.display = 'none';
+            this.unregisterInteractionListeners('globe.select');
+        }
+    }
+}

package/components/map-3d/style.css

@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+#cs-map {
+  background-color: var(--bkg-color);
+  position: absolute;
+  top: 0;
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+}
+
+.hidden {
+  display: none;
+}
+
+.center {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  margin: 10px;
+  text-align: center;
+}
+
+.loading span {
+  color: var(--text-color);
+  display: block;
+  margin-top: 1rem;
+  font-weight: 600;
+}
+
+.loading span.quote {
+  font-style: italic;
+  font-weight: 300;
+}

package/components/map-3d/tools/globe.d.ts

@@ -0,0 +1,42 @@
+import IGirafeContext from '../../../tools/context/icontext.js';
+import BaseLayer from '../../../models/layers/baselayer.js';
+import LayerWms from '../../../models/layers/layerwms.js';
+import Basemap from '../../../models/basemaps/basemap.js';
+import { CameraConfig } from '../../../tools/state/globe.js';
+declare global {
+    interface Window {
+        Cesium: unknown;
+    }
+}
+/**
+ * The 3D Globe, based on Cesium and synchronized with the OpenLayers map by OLCesium.
+ *
+ * This module is the only place where Cesium and OLCesium are used. It is loaded on demand
+ * by the map-3d Component, so that those (heavy) libraries stay out of the initial bundle
+ * as long as the 3D Map is not displayed.
+ */
+export default class Globe {
+    private readonly context;
+    private readonly toolName;
+    private readonly pixelTolerance;
+    olCesium: any;
+    private scene;
+    private wmsManager3d;
+    private get state();
+    private get config();
+    constructor(context: IGirafeContext, toolName: string, pixelTolerance: number);
+    /**
+     * Loads Cesium and OLCesium and initializes the globe on the given target element.
+     */
+    initialize(target: HTMLDivElement): Promise<void>;
+    private registerSelection;
+    setEnabled(enabled: boolean): void;
+    setShadows(shadows: boolean): void;
+    setCamera(camera: CameraConfig | null): void;
+    private addAllActiveLayers;
+    onLayerToggled(layer: LayerWms): void;
+    changeOpacity(layer: BaseLayer): void;
+    changeBasemapOpacity(basemap: Basemap): void;
+    changeFilter(layer: LayerWms): void;
+    onChangeBasemaps(basemaps: Basemap[]): void;
+}

package/components/map-3d/tools/globe.js

@@ -0,0 +1,198 @@
+import * as Cesium from 'cesium';
+import proj4 from 'proj4';
+import WmsManager3d from './wmsmanager3d.js';
+import GroupLayer from '../../../models/layers/grouplayer.js';
+import LayerWms from '../../../models/layers/layerwms.js';
+import { applyOpacityToLayers } from '../../../tools/utils/utils.js';
+/**
+ * The 3D Globe, based on Cesium and synchronized with the OpenLayers map by OLCesium.
+ *
+ * This module is the only place where Cesium and OLCesium are used. It is loaded on demand
+ * by the map-3d Component, so that those (heavy) libraries stay out of the initial bundle
+ * as long as the 3D Map is not displayed.
+ */
+export default class Globe {
+    context;
+    toolName;
+    pixelTolerance;
+    // TODO REG : Howto use the right type here without importing the whole library (it needs to be imported only on demand) ?
+    // This works but needs the library: type OLCesiumType = typeof OLCesium;
+    olCesium;
+    scene;
+    wmsManager3d;
+    get state() {
+        return this.context.stateManager.state;
+    }
+    get config() {
+        return this.context.configManager.Config.map3d;
+    }
+    constructor(context, toolName, pixelTolerance) {
+        this.context = context;
+        this.toolName = toolName;
+        this.pixelTolerance = pixelTolerance;
+    }
+    /**
+     * Loads Cesium and OLCesium and initializes the globe on the given target element.
+     */
+    async initialize(target) {
+        window.Cesium = Cesium;
+        const olcs = await import('olcs');
+        this.olCesium = new olcs.default({
+            map: this.context.mapManager.getMap(),
+            target: target,
+            time: () => {
+                const date = new Date(this.state.globe.shadowsTimestamp);
+                return Number.isNaN(date.getTime()) ? Cesium.JulianDate.now() : Cesium.JulianDate.fromDate(date);
+            }
+        });
+        const scene = this.olCesium.getCesiumScene();
+        this.scene = scene;
+        const config = this.config;
+        scene.screenSpaceCameraController.maximumZoomDistance = config.maximumZoomDistance ?? 30000;
+        // Add terrain
+        if (config.terrainUrl) {
+            scene.terrainProvider = await Cesium.CesiumTerrainProvider.fromUrl(config.terrainUrl);
+        }
+        // Add terrain imagery
+        let coverage = Cesium.Rectangle.MAX_VALUE;
+        if (config.terrainImagery) {
+            if (config.terrainImagery.coverageArea) {
+                coverage = Cesium.Rectangle.fromDegrees(...config.terrainImagery.coverageArea);
+            }
+            scene.imageryLayers.addImageryProvider(new Cesium.UrlTemplateImageryProvider({
+                url: config.terrainImagery.url,
+                minimumLevel: config.terrainImagery.minLoD ?? 0,
+                maximumLevel: config.terrainImagery.maxLoD,
+                tilingScheme: config.terrainImagery.srid === 3857
+                    ? new Cesium.WebMercatorTilingScheme()
+                    : new Cesium.GeographicTilingScheme(),
+                rectangle: coverage
+            }));
+        }
+        // Add 3D-Tiles layers
+        const tilesetOptions = {
+            // If the error of the model is higher than this, we increase the resolution
+            maximumScreenSpaceError: 0.5,
+            // Enable different level of details based on the distance from the camera
+            dynamicScreenSpaceError: true,
+            // Model error at the max distance from the camera (higher = distant models are of lower quality)
+            dynamicScreenSpaceErrorFactor: config.tilesetsMaxError ?? 7
+        };
+        config.tilesetsUrls.forEach((tilesetUrl) => {
+            Cesium.Cesium3DTileset.fromUrl(tilesetUrl, tilesetOptions).then((t) => scene.primitives.add(t));
+        });
+        // REG: ambientOcclusion was temporary deactivated because of performance impact and horizontal lines artefacts
+        // const ambientOcclusion = scene.postProcessStages.ambientOcclusion;
+        // ambientOcclusion.enabled = true;
+        // ambientOcclusion.uniforms.bias = 0.5;
+        // ambientOcclusion.uniforms.stepSize = 1;
+        // ambientOcclusion.uniforms.blurStepSize = 1;
+        // REG: Adding the following line solves the problem, but it remains a log less performatn with ambiant occlusion.
+        // So I don't know what we want to do with it.
+        // See https://github.com/CesiumGS/cesium/issues/13039#issuecomment-3583233494
+        // viewer.camera.frustum.near = 1.0;
+        this.registerSelection();
+        this.wmsManager3d = new WmsManager3d(scene, this.context);
+        this.state.layers.layersList.forEach((l) => this.addAllActiveLayers(l));
+        const camera = scene.camera;
+        camera.changed.addEventListener(() => {
+            console.debug('Cesium camera moved');
+            this.state.globe.camera = {
+                heading: camera.heading,
+                pitch: camera.pitch,
+                roll: camera.roll
+            };
+        }, 1);
+    }
+    registerSelection() {
+        const scene = this.scene;
+        const pickOnGlobe = (position) => {
+            const ray = scene.camera.getPickRay(position);
+            return ray == undefined ? undefined : scene.globe.pick(ray, scene);
+        };
+        const cesiumScreenToLocalCoord = (position) => {
+            const cart = Cesium.Cartographic.fromCartesian(pickOnGlobe(position));
+            const longLat = [Cesium.Math.toDegrees(cart.longitude), Cesium.Math.toDegrees(cart.latitude)];
+            return proj4('EPSG:4326', this.context.configManager.Config.map.srid, longLat);
+        };
+        this.context.userInteractionManager.registerListener('globe.select', true, this.toolName);
+        const eventHandler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
+        eventHandler.setInputAction((event) => {
+            // If the click is on the map and selection is allowed
+            if (Cesium.defined(event.position) &&
+                this.context.userInteractionManager.canListenerExecute('globe.select', this.toolName)) {
+                const topLeftScreen = event.position.clone();
+                topLeftScreen.x -= this.pixelTolerance;
+                topLeftScreen.y -= this.pixelTolerance;
+                const bottomRightScreen = event.position.clone();
+                bottomRightScreen.x += this.pixelTolerance;
+                bottomRightScreen.y += this.pixelTolerance;
+                const topLeft = cesiumScreenToLocalCoord(topLeftScreen);
+                const bottomRight = cesiumScreenToLocalCoord(bottomRightScreen);
+                this.context.selectionManager.select([topLeft[0], topLeft[1], bottomRight[0], bottomRight[1]]);
+            }
+        }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+    }
+    setEnabled(enabled) {
+        this.olCesium.setEnabled(enabled);
+    }
+    setShadows(shadows) {
+        this.scene.shadowMap.enabled = this.scene.globe.enableLighting = shadows;
+    }
+    setCamera(camera) {
+        if (!camera) {
+            return;
+        }
+        this.scene.camera.setView({
+            destination: this.scene.camera.position, // Keep current position
+            orientation: {
+                heading: camera.heading,
+                pitch: camera.pitch,
+                roll: camera.roll
+            }
+        });
+    }
+    addAllActiveLayers(layer) {
+        if (layer instanceof LayerWms) {
+            if (layer.active) {
+                this.wmsManager3d.addLayer(layer);
+            }
+        }
+        else if (layer instanceof GroupLayer) {
+            layer.children.forEach((l) => this.addAllActiveLayers(l));
+        }
+    }
+    onLayerToggled(layer) {
+        if (layer.active) {
+            this.wmsManager3d.addLayer(layer);
+        }
+        else {
+            this.wmsManager3d.removeLayer(layer);
+        }
+    }
+    changeOpacity(layer) {
+        if (layer instanceof LayerWms) {
+            this.wmsManager3d.changeOpacity(layer);
+        }
+    }
+    changeBasemapOpacity(basemap) {
+        applyOpacityToLayers(basemap.opacity, basemap.layersList, (layer) => this.changeOpacity(layer));
+    }
+    changeFilter(layer) {
+        this.wmsManager3d.changeFilter(layer);
+    }
+    onChangeBasemaps(basemaps) {
+        this.wmsManager3d.removeAllBasemapLayers();
+        for (const layer of basemaps.flatMap((basemap) => basemap.layersList)) {
+            if (layer instanceof LayerWms) {
+                this.wmsManager3d.addBasemapLayer(layer);
+            }
+        }
+        // Apply default opacity
+        for (const basemap of basemaps) {
+            if (!basemap.opacityDisabled) {
+                this.changeBasemapOpacity(basemap);
+            }
+        }
+    }
+}

package/components/search/component.d.ts

@@ -44,10 +44,12 @@ declare class SearchComponent extends GirafeHTMLElement {
      * @param e
      */
     doSearchDebounced(e: Event): Promise<void>;
+    addFullThemeIfNotPresent(feature: Feature): void;
     getGroupIcon(searchGroup: string): any;
     getProviderClass(provider: string): "hidden" | "provider entry";
     getGroupClass(group: string): "hidden" | "group entry";
     getLabel(result: Feature): unknown;
+    isFeatureActionThemeRelated(feature: Feature): boolean;
     onMouseOver(result: Feature): void;
     onMouseLeave(): void;
     private focusResultFromIndex;
@@ -56,6 +58,9 @@ declare class SearchComponent extends GirafeHTMLElement {
     private addFeatureToPreview;
     clearPreview(): void;
     onSelect(feature: Feature): void;
+    private closeDropdown;
+    private updateSearchboxWithResult;
+    private getFeatureFirstAction;
     private addResultToTreeView;
     private zoomTo;
     onMouseMove(): void;

package/components/search/component.js

@@ -28,10 +28,10 @@ class SearchComponent extends GirafeHTMLElement {
         return uHtml `<style>
 .hidden{display:none!important}.gg-rotate90{transform:rotate(90deg)}.gg-rotate180{transform:rotate(180deg)}.gg-rotate270{transform:rotate(270deg)}img{filter:var(--svg-filter)}img.legend-image{filter:var(--svg-map-filter);background:var(--svg-legend-bkg)}div{scrollbar-width:thin}a,a:visited{color:var(--link-color)}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}@keyframes spin-wait{0%{transform:rotate(0)}7%{transform:rotate(360deg)}to{transform:rotate(360deg)}}.gg-spin{animation-name:spin;animation-duration:2s;animation-timing-function:linear;animation-iteration-count:infinite}.gg-spin-wait{animation-name:spin-wait;animation-duration:10s;animation-timing-function:linear;animation-iteration-count:infinite}::-webkit-scrollbar{width:5px}::-webkit-scrollbar-thumb{background:#999}button,input,select,textarea{font:inherit}.gg-button,.gg-select,.gg-input,.gg-textarea{background-color:var(--bkg-color);color:var(--text-color);border:var(--app-standard-border);box-sizing:border-box;cursor:pointer;border-radius:3px;outline:0;margin:0;padding:0 0 0 .5rem;display:inline-block}.gg-label{background-color:var(--bkg-color);color:var(--text-color);border:none;align-items:center;margin:0;padding:0;display:flex}.gg-button,.gg-select,.gg-input,.gg-label{min-height:calc(var(--app-standard-height) / 1.5)}.gg-textarea{max-height:initial;resize:vertical;height:6rem;padding:.5rem;line-height:1.3rem}.gg-input{cursor:text}.gg-checkbox{accent-color:var(--text-color);width:1.2rem}.gg-range{accent-color:var(--text-color)}.gg-button{padding:0 .5rem}.gg-button.active{border:solid 1px var(--text-color-grad1);background-color:var(--bkg-color-grad2)}.gg-button:disabled{background-color:var(--bkg-color-grad1);color:var(--text-color-grad2);cursor:not-allowed;border:none}.gg-button:disabled img{filter:opacity(.6)}.gg-input:disabled,.gg-select:disabled,.gg-textarea:disabled{background-color:var(--bkg-color-grad1);color:var(--text-color-grad2);cursor:not-allowed}.gg-button>img{vertical-align:middle}.gg-icon-button{color:var(--text-color);cursor:pointer;background-color:#0000;border:none;flex-direction:column;justify-content:center;align-items:center;padding:0;display:flex}.gg-icon{justify-content:center;align-items:center;display:flex}.gg-big,.gg-big-withtext{min-width:var(--app-standard-height);min-height:var(--app-standard-height);max-height:var(--app-standard-height)}.gg-big img,.gg-big-withtext img{width:calc(var(--app-standard-height) - 1.5rem);margin:0}.gg-big-withtext span{font-variant:small-caps;padding:0 1rem;font-size:.9rem}.gg-medium,.gg-medium-withtext{min-width:calc(var(--app-standard-height) / 1.2);min-height:calc(var(--app-standard-height) / 1.2);max-height:calc(var(--app-standard-height) / 1.2);flex-direction:row}.gg-medium img{width:calc(var(--app-standard-height) / 2.4);margin:0}.gg-medium-withtext img{width:calc(var(--app-standard-height) / 2.4);margin-left:.5rem}.gg-medium-withtext span{padding:0 1rem 0 .5rem;font-size:.9rem}.gg-small,.gg-small-withtext{min-width:calc(var(--app-standard-height) / 2);min-height:calc(var(--app-standard-height) / 2);max-height:calc(var(--app-standard-height) / 2);flex-direction:row}.gg-small img{width:calc(var(--app-standard-height) / 3);margin:0}.gg-small-withtext img{width:calc(var(--app-standard-height) / 3);margin-left:.5rem}.gg-small-withtext span{padding:0 .5rem 0 .3rem;font-size:.9rem}.gg-button:hover:not(:disabled),.gg-select:hover:not(:disabled),.gg-input:hover:not(:disabled),.gg-textarea:hover:not(:disabled),.gg-icon-button:hover:not(:disabled){background-color:var(--bkg-color-grad1)}.gg-opacity{opacity:.5}.gg-opacity:hover{opacity:1;background-color:#0000}.gg-tabs{cursor:pointer;grid-auto-flow:column;padding-bottom:1rem;font-size:1rem;display:grid}.gg-tab{border:none;border-bottom:var(--app-standard-border);cursor:pointer;color:var(--text-color);background:0 0;padding:.5rem}.gg-tab.active{border-bottom:solid 1px var(--text-color)}.girafe-button-big,.girafe-button-large,.girafe-button-small,.girafe-button-tiny{color:var(--text-color);background-color:#0000;border:none;flex-direction:column;display:flex}.girafe-button-big:hover,.girafe-button-large:hover,.girafe-button-small:hover,.girafe-button-tiny:hover{background-color:var(--bkg-color-grad1);cursor:pointer}.girafe-button-big.dark,.girafe-button-large.dark,.girafe-button-small.dark,.girafe-button-tiny.dark{background-color:var(--bkg-color);filter:invert()}.girafe-button-big{width:var(--app-standard-height);height:var(--app-standard-height);align-items:center;padding:1rem}.girafe-button-big img{overflow:hidden}.girafe-button-large{flex-direction:row}.girafe-button-large img{height:2rem;margin:.3rem}.girafe-button-large span{height:2rem;margin:.3rem;line-height:2rem}.girafe-button-small{min-width:calc(var(--app-standard-height) / 2);height:calc(var(--app-standard-height) / 2);align-items:center;padding:.5rem}.girafe-button-small img{overflow:hidden}.girafe-button-small span{text-align:left;text-overflow:ellipsis;width:100%;overflow:hidden}.girafe-button-tiny{align-items:center;width:1rem;height:1rem;padding:0}.girafe-button-tiny img{overflow:hidden}.girafe-onboarding-theme{background-color:var(--bkg-color)!important;color:var(--text-color)!important}.girafe-onboarding-theme button{background-color:var(--bkg-color)!important;color:var(--text-color)!important;text-shadow:none!important}.girafe-onboarding-theme button.driver-popover-close-btn{z-index:10000}.tippy-box{background-color:var(--bkg-color)!important;border:var(--app-standard-border)!important}.tippy-content{color:var(--text-color)!important}.tippy-arrow{color:var(--bkg-color)!important}.tippy-box[data-theme~=error]{background-color:var(--error-color);white-space:pre-line}div.tippy-box[data-theme=image-popup]{border:var(--app-standard-border)!important;& div.tippy-content{background-color:var(--bkg-color)!important;& img{max-width:20rem;max-height:20rem}}& div.tippy-arrow{color:var(--bkg-color)!important}}
 </style><style>
-.hidden{display:none}#searchbox{background-color:var(--bkg-color);border:1px solid #cfd6dd;border-radius:4px;flex-direction:row;width:100%;height:2.25rem;display:flex;& slot[name=search-tooltip]{display:none}}#search{-webkit-appearance:none;width:auto;height:2.25rem;color:var(--text-color);background:0 0;border:0;outline:none;-webkit-flex:auto;-ms-flex:auto;flex:auto;margin:0 0 0 .5rem;padding-left:.8rem;font-size:1rem}.search-icon,.close-icon,.select-color-icon{width:14px;color:var(--text-color);padding:0 1rem}.close-button,.select-color-button{cursor:pointer;background-color:#0000;border:none;padding:0}#results{z-index:1000;background-color:var(--bkg-color);scrollbar-width:thin;width:36rem;max-height:31rem;margin-top:.1rem;margin-bottom:.5rem;position:absolute;top:3.5rem;overflow-x:hidden}.entry{width:34rem;color:var(--text-color);padding:.3rem 1rem;line-height:1.3rem;display:inline-block}.provider,.group{font-size:1.2rem;font-weight:600;line-height:3rem}.provider{background-color:color-mix(in srgb, var(--bkg-color-grad1) 75%, transparent);margin-top:1rem;font-size:1.5rem}#results>.provider:first-child{margin-top:0}.result{cursor:pointer;text-align:left;background:0 0;border:none;border-top:1px solid #ccc;width:100%}.entry img{width:.8em;margin-right:1rem}.entry span{text-transform:uppercase}.result.selected{color:var(--text-color);background-color:var(--bkg-color-grad2)!important}#no-result{background:var(--warning-color);opacity:.75;visibility:hidden;pointer-events:none;border-radius:6px;width:fit-content;margin:auto;padding:.5rem 0;font-size:1rem;position:absolute;top:3.5rem;left:0;right:0}#no-result>span{padding:1.3rem}@keyframes fadeOut{0%{opacity:1}80%{opacity:1}to{opacity:0}}.shown-then-fadeout{animation:2s ease-in-out forwards fadeOut;visibility:visible!important}
+.hidden{display:none}#searchbox{background-color:var(--bkg-color);border:1px solid #cfd6dd;border-radius:4px;flex-direction:row;width:100%;height:2.25rem;display:flex;& slot[name=search-tooltip]{display:none}}#search{-webkit-appearance:none;width:auto;height:2.25rem;color:var(--text-color);background:0 0;border:0;outline:none;-webkit-flex:auto;-ms-flex:auto;flex:auto;margin:0 0 0 .5rem;padding-left:.8rem;font-size:1rem}.search-icon,.close-icon,.theme-icon,.select-color-icon{width:14px;color:var(--text-color);padding:0 1rem}.close-button,.select-color-button{cursor:pointer;background-color:#0000;border:none;padding:0}#results{z-index:1000;background-color:var(--bkg-color);scrollbar-width:thin;width:36rem;max-height:31rem;margin-top:.1rem;margin-bottom:.5rem;position:absolute;top:3.5rem;overflow-x:hidden}.entry{width:34rem;color:var(--text-color);padding:.3rem 1rem;line-height:1.3rem;display:inline-block}.entry img{width:.8em;margin-right:1rem}.entry span{text-transform:uppercase}.provider,.group{font-size:1.2rem;font-weight:600;line-height:3rem}.provider{background-color:color-mix(in srgb, var(--bkg-color-grad1) 75%, transparent);margin-top:1rem;font-size:1.5rem}#results>.provider:first-child{margin-top:0}.result{background:0 0;border-top:1px solid #ccc;align-items:stretch;width:100%;padding:0;display:flex}.result button{cursor:pointer;text-align:left;width:100%;color:var(--text-color);background:0 0;border:none;padding:.3rem 1rem}.result button:hover{color:var(--text-color);background-color:var(--bkg-color-grad2)!important}.result .tools{width:1.3rem;margin:0}.result .tools button{height:-webkit-fill-available;margin:0;padding:0 .3rem}.result .tools button img{margin:0;padding:0}#no-result{background:var(--warning-color);opacity:.75;visibility:hidden;pointer-events:none;border-radius:6px;width:fit-content;margin:auto;padding:.5rem 0;font-size:1rem;position:absolute;top:3.5rem;left:0;right:0}#no-result>span{padding:1.3rem}@keyframes fadeOut{0%{opacity:1}80%{opacity:1}to{opacity:0}}.shown-then-fadeout{animation:2s ease-in-out forwards fadeOut;visibility:visible!important}
 </style>
 <style>${this.customStyle}</style>
-<link rel="stylesheet" href="lib/vanilla-picker/vanilla-picker.csp.css"><link rel="stylesheet" href="styles/girafecolorpicker.css"><div id="searchbox"><slot name="search-tooltip"></slot><input id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search..." placeholder="Search..." aria-label="Search" oninput="${(e) => this.doSearchDebounced(e)}" onfocusin="${() => this.onFocusIn()}" onfocusout="${() => this.onFocusOut()}" onkeydown="${(e) => this.onKeyDown(e)}"> <img class="${this.allResults.length > 0 ? 'hidden' : 'search-icon'}" alt="search-icon" src="${this.searchIcon}"> <button class="${this.allResults.length > 0 ? 'close-button' : 'hidden'}" onclick="${() => this.clearSearch(true)}"><img class="close-icon" alt="close-icon" src="icons/close.svg"></button> <button tip="change_search_result_color" id="colorPickerBtn" class="${this.paintSearchResults ? 'select-color-button' : 'hidden'}"><img class="select-color-icon" alt="select-color-icon" src="${this.paintbrushIcon}"></button><div id="results" class="${!this.allResults.length || this.forceHide ? 'hidden' : ''}" onmousemove="${() => this.onMouseMove()}">${(Object.keys(this.groupedResults) ?? []).map(provider => uHtml `<div class="${this.getProviderClass(provider)}"><img alt="provider icon" src="${this.searchIcon}"> <span i18n="${provider}">${provider}</span></div>${(Object.keys(this.groupedResults[provider]) ?? []).map(group => uHtml `<div class="${this.getGroupClass(group)}"><img alt="result icon" src="${this.getGroupIcon(group)}"> <span i18n="${group}">${group}</span></div>${(this.groupedResults[provider][group] ?? []).map(result => uHtml ` <button class="${result.get('selected') ? 'result entry selected' : 'result entry'}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}" onmouseover="${() => this.onMouseOver(result)}" onmouseleave="${() => this.onMouseLeave()}">${this.getLabel(result)}</button> `)} `)} `)}</div><div id="no-result" class="${this.showNoResultWarning ? 'shown-then-fadeout' : ''}"><span i18n="${'No match found'}"></span></div></div>
+<link rel="stylesheet" href="lib/vanilla-picker/vanilla-picker.csp.css"><link rel="stylesheet" href="styles/girafecolorpicker.css"><div id="searchbox"><slot name="search-tooltip"></slot><input id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search..." placeholder="Search..." aria-label="Search" oninput="${(e) => this.doSearchDebounced(e)}" onfocusin="${() => this.onFocusIn()}" onfocusout="${() => this.onFocusOut()}" onkeydown="${(e) => this.onKeyDown(e)}"> <img class="${this.allResults.length > 0 ? 'hidden' : 'search-icon'}" alt="search-icon" src="${this.searchIcon}"> <button class="${this.allResults.length > 0 ? 'close-button' : 'hidden'}" onclick="${() => this.clearSearch(true)}"><img class="close-icon" alt="close-icon" src="icons/close.svg"></button> <button tip="change_search_result_color" id="colorPickerBtn" class="${this.paintSearchResults ? 'select-color-button' : 'hidden'}"><img class="select-color-icon" alt="select-color-icon" src="${this.paintbrushIcon}"></button><div id="results" class="${!this.allResults.length || this.forceHide ? 'hidden' : ''}" onmousemove="${() => this.onMouseMove()}">${(Object.keys(this.groupedResults) ?? []).map(provider => uHtml `<div class="${this.getProviderClass(provider)}"><img alt="provider icon" src="${this.searchIcon}"> <span i18n="${provider}">${provider}</span></div>${(Object.keys(this.groupedResults[provider]) ?? []).map(group => uHtml `<div class="${this.getGroupClass(group)}"><img alt="result icon" src="${this.getGroupIcon(group)}"> <span i18n="${group}">${group}</span></div>${(this.groupedResults[provider][group] ?? []).map(result => uHtml `<div class="${result.get('selected') ? 'result entry selected' : 'result entry'}"><button onmouseover="${() => this.onMouseOver(result)}" onmouseleave="${() => this.onMouseLeave()}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}">${this.getLabel(result)}</button><div class="${this.isFeatureActionThemeRelated(result) ? 'tools' : 'hidden'}"><button class="addFullTree" onclick="${() => this.addFullThemeIfNotPresent(result)}"><img class="theme-icon" alt="theme-icon" src="icons/theme-checked.svg" tip="Complete the theme"></button></div></div>`)} `)} `)}</div><div id="no-result" class="${this.showNoResultWarning ? 'shown-then-fadeout' : ''}"><span i18n="${'No match found'}"></span></div></div>
 ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
     };
     searchIcon = SearchIcon;
@@ -205,6 +205,33 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             this.doSearch(syntheticEvent);
         }, 300);
     }
+    addFullThemeIfNotPresent(feature) {
+        this.clearPreview();
+        const action = this.getFeatureFirstAction(feature);
+        if (!action) {
+            return;
+        }
+        const layer = this.context.themesHelper.findLayerByName(action.data);
+        if (!layer) {
+            return;
+        }
+        const theme = this.context.themesHelper.getOriginalTheme(layer);
+        if (!theme) {
+            return;
+        }
+        const added = this.context.themesHelper.addThemeIfNotPresent(theme);
+        if (!added) {
+            // If it's not added because it's already in the tree, complete the theme.
+            this.context.themesHelper.completeTheme(theme);
+        }
+        const insertedLayer = this.context.themesHelper.findBaseLayerRecursiveById(this.state.layers.layersList, layer.id);
+        if (insertedLayer) {
+            insertedLayer.activeState = 'on';
+        }
+        this.closeDropdown(feature);
+        this.onFocusOut();
+        this.updateSearchboxWithResult(feature);
+    }
     getGroupIcon(searchGroup) {
         switch (searchGroup) {
             case 'Group':
@@ -230,6 +257,16 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
     getLabel(result) {
         return result.get('label_html') ? this.htmlUnsafe(result.get('label_html')) : result.get('label');
     }
+    isFeatureActionThemeRelated(feature) {
+        const action = this.getFeatureFirstAction(feature);
+        const kind = action?.action;
+        const hasThemeRelatedAction = kind?.startsWith('add_layer') || kind?.startsWith('add_group') || kind?.startsWith('add_theme') || false;
+        if (!hasThemeRelatedAction || !action) {
+            return false;
+        }
+        const layer = this.context.themesHelper.findLayerByName(action.data);
+        return !!layer;
+    }
     onMouseOver(result) {
         this.focusResult(result);
     }
@@ -249,7 +286,7 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         if (this.focusedResult) {
             this.focusedResult.set('selected', false);
         }
-        // Set new selected object, and activate preview
+        // Set the newly selected object and activate a preview.
         this.focusedResultIndex = this.allResults.indexOf(result);
         this.focusedResult = this.allResults[this.focusedResultIndex];
         this.focusedResult.set('selected', true);
@@ -265,7 +302,7 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             this.addFeatureToPreview(result);
             this.updatePreviewLayerStyle();
         }
-        const firstAction = result.get('actions')?.[0];
+        const firstAction = this.getFeatureFirstAction(result);
         if (firstAction?.action.startsWith('add_layer') && this.context.configManager.Config.search?.layerPreview) {
             const layer = this.context.themesHelper.findLayerByName(firstAction.data);
             if (layer) {
@@ -294,11 +331,7 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         }
     }
     onSelect(feature) {
-        this.selectedResult = feature;
-        this.ignoreBlur = false;
-        this.forceHide = true;
-        this.previewLayers = undefined;
-        super.render();
+        this.closeDropdown(feature);
         // If the result has a specific zoom-to extent defined or contains a geometry, zoom to it
         const zoomBbox = this.context.searchManager.getZoomToBbox(feature);
         if (zoomBbox) {
@@ -308,33 +341,46 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             this.addResultToTreeView(feature);
         }
         this.onFocusOut();
-        // Update searchbox with result
+        this.updateSearchboxWithResult(feature);
+    }
+    closeDropdown(feature) {
+        this.selectedResult = feature;
+        this.ignoreBlur = false;
+        this.forceHide = true;
+        this.previewLayers = undefined;
+        super.render();
+    }
+    updateSearchboxWithResult(feature) {
         if (this.searchInput && feature.get('label')) {
             this.searchInput.value = feature.get('label');
         }
     }
-    addResultToTreeView(feature) {
-        let clonedTheme;
+    getFeatureFirstAction(feature) {
         const actions = feature.get('actions');
-        if (!actions || actions.length === 0) {
+        return actions?.length ? actions[0] : undefined;
+    }
+    addResultToTreeView(feature) {
+        const action = this.getFeatureFirstAction(feature);
+        if (!action) {
             // Nothing to add
             return;
         }
+        let clonedTheme;
         let activate = false;
-        if (actions[0].action.startsWith('add_theme')) {
-            const theme = this.context.themesHelper.findThemeByName(actions[0].data);
+        if (action.action.startsWith('add_theme')) {
+            const theme = this.context.themesHelper.findThemeByName(action.data);
             if (theme) {
                 clonedTheme = theme.clone();
             }
         }
-        else if (actions[0].action.startsWith('add_group')) {
-            const group = this.context.themesHelper.findGroupByName(actions[0].data);
+        else if (action.action.startsWith('add_group')) {
+            const group = this.context.themesHelper.findGroupByName(action.data);
             if (group) {
                 clonedTheme = this.context.themesHelper.getMinimalClonedThemeForLayer(group);
             }
         }
-        else if (actions[0].action.startsWith('add_layer')) {
-            const layer = this.context.themesHelper.findLayerByName(actions[0].data);
+        else if (action.action.startsWith('add_layer')) {
+            const layer = this.context.themesHelper.findLayerByName(action.data);
             if (layer) {
                 clonedTheme = this.context.themesHelper.getMinimalClonedThemeForLayer(layer);
                 activate = true;
@@ -516,6 +562,9 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         return `data:image/svg+xml;utf8,${encodeURIComponent(pin)}`;
     }
 }
+__decorate([
+    UsedInTemplateOnly()
+], SearchComponent.prototype, "addFullThemeIfNotPresent", null);
 __decorate([
     UsedInTemplateOnly()
 ], SearchComponent.prototype, "getGroupIcon", null);
@@ -528,4 +577,7 @@ __decorate([
 __decorate([
     UsedInTemplateOnly()
 ], SearchComponent.prototype, "getLabel", null);
+__decorate([
+    UsedInTemplateOnly()
+], SearchComponent.prototype, "isFeatureActionThemeRelated", null);
 export default SearchComponent;