@geogirafe/lib-geoportal 1.0.2217896135 → 1.0.2221886306

package/components/search/component.d.ts

@@ -1,6 +1,5 @@
+import Feature from 'ol/Feature';
 import GirafeHTMLElement from '../../base/GirafeHTMLElement';
-import type { AllSearchResults } from '../../models/searchresult';
-import SearchResult from '../../models/searchresult';
 declare class SearchComponent extends GirafeHTMLElement {
     template: () => import("uhtml").Hole;
     searchIcon: string;
@@ -10,9 +9,10 @@ declare class SearchComponent extends GirafeHTMLElement {
     private previewLayers;
     private previewGeoLayer;
     private maxExtent?;
+    private readonly geoJsonFormatter;
     private ignoreBlur;
-    groupedResults: Record<string, SearchResult[]>;
-    protected allResults: SearchResult[];
+    groupedResults: Record<string, Feature[]>;
+    protected allResults: Feature[];
     protected forceHide: boolean;
     private readonly searchTermPlaceholder;
     private readonly searchLangPlaceholder;
@@ -39,7 +39,7 @@ declare class SearchComponent extends GirafeHTMLElement {
     protected connectedCallback(): void;
     protected clearSearch(purge?: boolean): void;
     doSearch(e: Event): Promise<void>;
-    protected fetchSearch(term: string): Promise<AllSearchResults>;
+    protected fetchSearch(term: string): Promise<Feature[]>;
     /**
      * Debounce the fetch call to API to prevent sending request at every stroke.
      * @param e
@@ -52,14 +52,14 @@ declare class SearchComponent extends GirafeHTMLElement {
     private displayCoordinates;
     private displayResults;
     getIcon(searchGroup: string): any;
-    onMouseOver(result: SearchResult): void;
+    onMouseOver(result: Feature): void;
     onMouseLeave(): void;
     private focusResultFromIndex;
     private focusResult;
     private preview;
     private addFeatureToPreview;
     clearPreview(): void;
-    onSelect(result: SearchResult): void;
+    onSelect(feature: Feature): void;
     private addResultToTreeView;
     private zoomTo;
     onMouseMove(): void;

package/components/search/component.js

@@ -1,9 +1,10 @@
 import { html as uHtml } from 'uhtml';
 import Collection from 'ol/Collection';
 import Feature from 'ol/Feature';
+import GeoJSON from 'ol/format/GeoJSON';
 import VectorSource from 'ol/source/Vector';
 import VectorLayer from 'ol/layer/Vector';
-import { LineString, MultiLineString, MultiPolygon, Point, MultiPoint, Polygon } from 'ol/geom';
+import { Point } from 'ol/geom';
 import { Style, Icon, Stroke, Fill } from 'ol/style';
 import { buffer, getWidth, getHeight, getCenter, containsExtent } from 'ol/extent';
 import GirafeColorPicker from '../../tools/utils/girafecolorpicker';
@@ -21,7 +22,7 @@ class SearchComponent extends GirafeHTMLElement {
 </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}#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}.result,.title{width:34rem;padding:.3rem 1rem;line-height:1.3rem;display:inline-block}.title{color:var(--text-color);padding-top:1.5rem;font-size:1.3rem;font-weight:600;line-height:2.5rem}.result{cursor:pointer;text-align:left;width:100%;color:var(--text-color);background:0 0;border:none;border-top:1px solid #ccc}.title img{width:14px;margin-right:1rem}.title span{text-transform:uppercase}.result.selected{color:var(--text-color);background-color:#aaa!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}
 </style>
-<link rel="stylesheet" href="lib/vanilla-picker/vanilla-picker.csp.css"><link rel="stylesheet" href="styles/girafecolorpicker.css"><div id="searchbox"><input tip="search_tip" id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search..." placeholder="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="${Object.keys(this.groupedResults).length === 0 || this.forceHide ? 'hidden' : ''}" onmousemove="${() => this.onMouseMove()}">${Object.keys(this.groupedResults).map(group => uHtml `<div class="title"><img alt="result icon" src="${this.getIcon(group)}"> <span i18n="${group}"></span></div>${this.groupedResults[group].map(result => uHtml ` <button class="${result.selected ? 'result selected' : 'result'}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}" onmouseover="${() => this.onMouseOver(result)}" onmouseleave="${() => this.onMouseLeave()}">${result.properties?.label}</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"><input tip="search_tip" id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search..." placeholder="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="${Object.keys(this.groupedResults).length === 0 || this.forceHide ? 'hidden' : ''}" onmousemove="${() => this.onMouseMove()}">${Object.keys(this.groupedResults).map(group => uHtml `<div class="title"><img alt="result icon" src="${this.getIcon(group)}"> <span i18n="${group}"></span></div>${this.groupedResults[group].map(result => uHtml ` <button class="${result.get('selected') ? 'result selected' : 'result'}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}" onmouseover="${() => this.onMouseOver(result)}" onmouseleave="${() => this.onMouseLeave()}">${result.get('label')}</button> `)} `)}</div><div id="no-result" class="${this.showNoResultWarning ? 'shown-then-fadeout' : ''}"><span i18n="${'No match found'}"></span></div></div>`;
     };
     searchIcon = SearchIcon;
     paintbrushIcon = PaintbrushIcon;
@@ -32,6 +33,7 @@ class SearchComponent extends GirafeHTMLElement {
     previewLayers = [];
     previewGeoLayer = null;
     maxExtent;
+    geoJsonFormatter = new GeoJSON();
     ignoreBlur = false;
     groupedResults = {};
     allResults = [];
@@ -56,9 +58,9 @@ class SearchComponent extends GirafeHTMLElement {
     async initialSearch() {
         const searchTerm = this.context.permalinkManager.getSearchTerm();
         const results = await this.fetchSearch(searchTerm);
-        if (results.features.length > 0) {
+        if (results.length > 0) {
             // Apply the first search result in the list
-            const firstResult = results.features[0];
+            const firstResult = results[0];
             this.preview(firstResult);
             this.onSelect(firstResult);
         }
@@ -149,13 +151,13 @@ class SearchComponent extends GirafeHTMLElement {
         }
         if (term.length > 0) {
             try {
-                const data = await this.fetchSearch(term);
+                const features = await this.fetchSearch(term);
                 // If the search term is at least two charecter but yieds no result, a warning
                 // box is displayed for 2 seconds and then fades out (CSS)
-                if (data.features.length === 0 && term.length >= 2) {
+                if (features.length === 0 && term.length >= 2) {
                     this.showNoResultWarning = true;
                 }
-                this.displayResults(data);
+                this.displayResults(features);
             }
             catch (error) {
                 if (error instanceof DOMException && error.name === 'AbortError') {
@@ -172,7 +174,11 @@ class SearchComponent extends GirafeHTMLElement {
             .replace(this.searchLangPlaceholder, this.state.language);
         const response = await fetch(url, { signal: this.abortController.signal });
         const data = await response.json();
-        return data;
+        const features = this.geoJsonFormatter.readFeatures(data, {
+            dataProjection: this.context.configManager.getDefaultConfigValue('search.resultsSrid'),
+            featureProjection: this.map.getView().getProjection()
+        });
+        return features;
     }
     /**
      * Debounce the fetch call to API to prevent sending request at every stroke.
@@ -206,40 +212,32 @@ class SearchComponent extends GirafeHTMLElement {
         if (!east_coord || !north_coord) {
             return;
         }
-        const result = {
-            bbox: [east_coord, north_coord, east_coord, north_coord],
-            geometry: {
-                type: 'Point',
-                coordinates: [east_coord, north_coord]
-            },
-            properties: {
-                label: `${coord1} ${coord2}`,
-                layer_name: 'recenter_map'
-            }
-        };
-        this.allResults = [result];
-        this.groupedResults.recenter_map = [result];
+        const feature = new Feature({
+            geometry: new Point([east_coord, north_coord]),
+            label: `${coord1} ${coord2}`,
+            layer_name: 'recenter_map'
+        });
+        this.allResults = [feature];
+        this.groupedResults.recenter_map = [feature];
         super.render();
         super.girafeTranslate();
     }
-    displayResults(results) {
+    displayResults(features) {
         // First, group the results
-        for (const result of results.features) {
+        for (const result of features) {
             // results.features.forEach((result) => {
             let type = 'Unknown layer type';
-            if (result.properties) {
-                if (result.properties.layer_name) {
-                    type = result.properties.layer_name;
-                }
-                else if (result.properties.actions[0].action.startsWith('add_theme')) {
-                    type = 'add_theme';
-                }
-                else if (result.properties.actions[0].action.startsWith('add_group')) {
-                    type = 'add_group';
-                }
-                else if (result.properties.actions[0].action.startsWith('add_layer')) {
-                    type = 'add_layer';
-                }
+            if (result.get('layer_name')) {
+                type = result.get('layer_name');
+            }
+            else if (result.get('actions')[0].action.startsWith('add_theme')) {
+                type = 'add_theme';
+            }
+            else if (result.get('actions')[0].action.startsWith('add_group')) {
+                type = 'add_group';
+            }
+            else if (result.get('actions')[0].action.startsWith('add_layer')) {
+                type = 'add_layer';
             }
             let resultList;
             if (type in this.groupedResults) {
@@ -284,12 +282,12 @@ class SearchComponent extends GirafeHTMLElement {
         // Clear old selection and preview
         this.clearPreview();
         if (this.focusedResult) {
-            this.focusedResult.selected = false;
+            this.focusedResult.set('selected', false);
         }
         // Set new selected object, and activate preview
         this.focusedResultIndex = this.allResults.findIndex((r) => r === result);
         this.focusedResult = this.allResults[this.focusedResultIndex];
-        this.focusedResult.selected = true;
+        this.focusedResult.set('selected', true);
         this.render();
         this.preview(result);
         // Scroll to selected div
@@ -297,14 +295,12 @@ class SearchComponent extends GirafeHTMLElement {
         resultHtmlElement.scrollIntoView({ block: 'nearest' });
     }
     preview(result) {
-        if (result.bbox && this.context.configManager.Config.search.objectPreview) {
+        if (result.getGeometry() && this.context.configManager.Config.search.objectPreview) {
             // Result with geometry
-            if (result.geometry) {
-                this.addFeatureToPreview(result.geometry);
-                this.updatePreviewLayerStyle();
-            }
+            this.addFeatureToPreview(result);
+            this.updatePreviewLayerStyle();
         }
-        const firstAction = result.properties?.actions?.[0];
+        const firstAction = result.get('actions')?.[0];
         if (firstAction?.action.startsWith('add_layer') && this.context.configManager.Config.search.layerPreview) {
             const layer = this.context.themesHelper.findLayerByName(firstAction.data);
             if (layer) {
@@ -317,47 +313,8 @@ class SearchComponent extends GirafeHTMLElement {
             }
         }
     }
-    addFeatureToPreview(geometry) {
-        switch (geometry.type) {
-            case 'Point': {
-                const feature = new Feature(new Point(geometry.coordinates));
-                this.previewFeaturesCollection.push(feature);
-                return;
-            }
-            case 'MultiPoint': {
-                const feature = new Feature(new MultiPoint(geometry.coordinates));
-                this.previewFeaturesCollection.push(feature);
-                return;
-            }
-            case 'MultiLineString': {
-                const feature = new Feature(new MultiLineString(geometry.coordinates));
-                this.previewFeaturesCollection.push(feature);
-                return;
-            }
-            case 'LineString': {
-                const feature = new Feature(new LineString(geometry.coordinates));
-                this.previewFeaturesCollection.push(feature);
-                return;
-            }
-            case 'Polygon': {
-                const feature = new Feature(new Polygon(geometry.coordinates));
-                this.previewFeaturesCollection.push(feature);
-                return;
-            }
-            case 'MultiPolygon': {
-                const feature = new Feature(new MultiPolygon(geometry.coordinates));
-                this.previewFeaturesCollection.push(feature);
-                return;
-            }
-            case 'GeometryCollection': {
-                for (const geom of geometry.geometries) {
-                    this.addFeatureToPreview(geom);
-                }
-                return;
-            }
-            default:
-                throw new Error('Geometry type of search result is not being supported.');
-        }
+    addFeatureToPreview(feature) {
+        this.previewFeaturesCollection.push(feature);
     }
     clearPreview() {
         // Clear preview search result
@@ -366,46 +323,48 @@ class SearchComponent extends GirafeHTMLElement {
         this.context.themesHelper.removeLayersFromLayerTree(this.previewLayers);
         this.previewLayers = [];
     }
-    onSelect(result) {
-        this.selectedResult = result;
+    onSelect(feature) {
+        this.selectedResult = feature;
         this.ignoreBlur = false;
         this.forceHide = true;
         this.previewLayers = [];
         super.render();
-        if (result.bbox) {
+        const geom = feature.getGeometry();
+        if (geom) {
             // Result with geometry
-            this.zoomTo(result.bbox);
+            this.zoomTo(geom.getExtent());
         }
         else {
-            this.addResultToTreeView(result);
+            this.addResultToTreeView(feature);
         }
         this.onFocusOut();
         // Update searchbox with result
-        if (this.searchInput && result.properties) {
-            this.searchInput.value = result.properties.label;
+        if (this.searchInput && feature.get('label')) {
+            this.searchInput.value = feature.get('label');
         }
     }
-    addResultToTreeView(result) {
+    addResultToTreeView(feature) {
         let clonedTheme;
-        if (!result.properties || result.properties.actions.length === 0) {
+        const actions = feature.get('actions');
+        if (!actions || actions.length === 0) {
             // Nothing to add
             return;
         }
         let activate = false;
-        if (result.properties.actions[0].action.startsWith('add_theme')) {
-            const theme = this.context.themesHelper.findThemeByName(result.properties.actions[0].data);
+        if (actions[0].action.startsWith('add_theme')) {
+            const theme = this.context.themesHelper.findThemeByName(actions[0].data);
             if (theme) {
                 clonedTheme = theme.clone();
             }
         }
-        else if (result.properties.actions[0].action.startsWith('add_group')) {
-            const group = this.context.themesHelper.findGroupByName(result.properties.actions[0].data);
+        else if (actions[0].action.startsWith('add_group')) {
+            const group = this.context.themesHelper.findGroupByName(actions[0].data);
             if (group) {
                 clonedTheme = this.context.themesHelper.getMinimalClonedThemeForLayer(group);
             }
         }
-        else if (result.properties.actions[0].action.startsWith('add_layer')) {
-            const layer = this.context.themesHelper.findLayerByName(result.properties.actions[0].data);
+        else if (actions[0].action.startsWith('add_layer')) {
+            const layer = this.context.themesHelper.findLayerByName(actions[0].data);
             if (layer) {
                 clonedTheme = this.context.themesHelper.getMinimalClonedThemeForLayer(layer);
                 activate = true;

package/components/search-mobile/component.js

@@ -7,7 +7,7 @@ class MobileSearchComponent extends SearchComponent {
 </style><style>
 .hidden{display:none}#searchbox{background-color:var(--bkg-color);z-index:101;border:none;border-radius:4px;flex-direction:row;width:100%;display:flex;position:absolute;box-shadow:0 0 10px 1px #0003}#search{z-index:2;-webkit-appearance:none;width:100%;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:1.8em;line-height:1.8em}#search::placeholder{color:inherit;opacity:.4}#search:focus::placeholder{opacity:0;color:#0000;transition:opacity .3s}.search-icon,.close-icon,.select-color-icon{width:17px;color:var(--text-color);opacity:.7;padding:0 1rem}.close-button,.select-color-button{cursor:pointer;background-color:#0000;border:none;padding:0}#results{z-index:100;background-color:var(--bkg-color);scrollbar-width:thin;padding-top:7vh;position:fixed;inset:0;overflow-x:hidden}.result,.title{width:34rem;padding:.3rem 1rem;line-height:1.3rem;display:inline-block}.title{color:var(--text-color);padding-top:1.5rem;font-size:1.3rem;font-weight:600;line-height:2.5rem}.result{cursor:pointer;text-align:left;width:100%;color:var(--text-color);background:0 0;border:none;border-top:1px solid #ccc}.title img{width:14px;margin-right:1rem}.title span{text-transform:uppercase}.result.selected{color:var(--text-color);background-color:#aaa!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:3rem;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>
-<link rel="stylesheet" href="lib/vanilla-picker/vanilla-picker.csp.css"><div id="searchbox"><input id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search" placeholder="Search..." oninput="${(e) => this.doSearchDebounced(e)}" 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></div><div id="results" class="${Object.keys(this.groupedResults).length === 0 || this.forceHide ? 'hidden' : ''}">${Object.keys(this.groupedResults).map(group => uHtml `<div class="title"><img alt="result icon" src="${this.getIcon(group)}"> <span i18n="${group}"></span></div>${this.groupedResults[group].map(result => uHtml ` <button class="${result.selected ? 'result selected' : 'result'}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}">${result.properties?.label}</button> `)} `)}</div><div id="no-result" class="${this.showNoResultWarning ? 'shown-then-fadeout' : ''}"><span i18n="${'No match found'}"></span></div>`;
+<link rel="stylesheet" href="lib/vanilla-picker/vanilla-picker.csp.css"><div id="searchbox"><input id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search" placeholder="Search..." oninput="${(e) => this.doSearchDebounced(e)}" 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></div><div id="results" class="${Object.keys(this.groupedResults).length === 0 || this.forceHide ? 'hidden' : ''}">${Object.keys(this.groupedResults).map(group => uHtml `<div class="title"><img alt="result icon" src="${this.getIcon(group)}"> <span i18n="${group}"></span></div>${this.groupedResults[group].map(result => uHtml ` <button class="${result.get('selected') ? 'result selected' : 'result'}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}">${result.get('label')}</button> `)} `)}</div><div id="no-result" class="${this.showNoResultWarning ? 'shown-then-fadeout' : ''}"><span i18n="${'No match found'}"></span></div>`;
     };
 }
 export default MobileSearchComponent;

package/models/main.d.ts

@@ -31,8 +31,7 @@ export { default as ThemeLayer } from './layers/themelayer';
 export { default as ThemeLayerExternal } from './layers/themelayerexternal';
 export type { TimeAwareLayer } from './layers/timeawarelayer';
 export { isTimeAwareLayer } from './layers/timeawarelayer';
-export type { GeometryResult, GeometryCollectionResult, AllSearchResults } from './searchresult';
-export { default as SearchResult } from './searchresult';
+export type { SearchResultsActions } from './searchresult';
 export type { SelectionTool, SelectionMode } from './selection';
 export { default as SelectionParam } from './selectionparam';
 export { default as ServerOgc } from './serverogc';

package/models/main.js

@@ -21,7 +21,6 @@ export { isSnappableLayer } from './layers/snappablelayer';
 export { default as ThemeLayer } from './layers/themelayer';
 export { default as ThemeLayerExternal } from './layers/themelayerexternal';
 export { isTimeAwareLayer } from './layers/timeawarelayer';
-export { default as SearchResult } from './searchresult';
 export { default as SelectionParam } from './selectionparam';
 export { default as ServerOgc } from './serverogc';
 export { default as ServerOgcApi, OgcApiDefaultEncoding } from './serverogcapi';

package/models/searchresult.d.ts

@@ -1,27 +1,4 @@
-import { Coordinate } from 'ol/coordinate';
-import { Extent } from 'ol/extent';
-export type GeometryResult = {
-    type: 'Point' | 'MultiPoint' | 'LineString' | 'MultiLineString' | 'Polygon' | 'MultiPolygon';
-    coordinates: Coordinate | Coordinate[] | Coordinate[][] | Coordinate[][][];
+export type SearchResultsActions = {
+    action: string;
+    data: string;
 };
-export type GeometryCollectionResult = {
-    type: 'GeometryCollection';
-    geometries: GeometryCollectionResult[] | GeometryResult[];
-};
-export type AllSearchResults = {
-    type: string;
-    features: SearchResult[];
-};
-export default class SearchResult {
-    bbox?: Extent;
-    geometry?: GeometryResult | GeometryCollectionResult;
-    properties?: {
-        label: string;
-        layer_name: string;
-        actions: {
-            action: string;
-            data: string;
-        }[];
-    };
-    selected: boolean;
-}

package/models/searchresult.js

@@ -1,6 +1 @@
-export default class SearchResult {
-    bbox;
-    geometry;
-    properties;
-    selected = false;
-}
+export {};

package/package.json

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

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.0.2217896135", "build":"2217896135", "date":"16/12/2025"}
+{"version":"1.0.2221886306", "build":"2221886306", "date":"18/12/2025"}

package/tools/auth/abstractconnectmanager.js

@@ -20,6 +20,7 @@ export default class AbstractConnectManager {
         this.state.oauth.status = 'loginFailed';
     }
     loggedOut() {
+        this.context.sessionManager.saveStateToSession();
         this.state.oauth.status = 'loggedOut';
         this.state.oauth.tokens = undefined;
         this.state.oauth.userInfo = undefined;

package/tools/auth/authmanager.js

@@ -81,8 +81,12 @@ export default class AuthManager extends GirafeSingleton {
                     await this.gmfManager.loginWithToken();
                 }
                 // And then we get the UserInfos
+                const previousUsername = this.state.oauth.userInfo?.username;
                 await this.gmfManager.getUserInfo();
                 if (this.state.oauth.userInfo?.username) {
+                    // TODO REG : At the moment we just test if the username has changed,
+                    // but actually we should test if some of the rights have changed
+                    this.state.oauth.somethingChanged = this.state.oauth.userInfo.username !== previousUsername;
                     this.state.oauth.status = 'loggedIn';
                 }
                 else {

package/tools/auth/gmfmanager.js

@@ -33,7 +33,6 @@ export default class GMFManager {
                 throw new Error(gmfLoginResponse.statusText);
             }
         }
-        this.state.oauth.status = 'loggedIn';
     }
     async logout() {
         console.debug('Auth: 4. Backend logout');

package/tools/auth/openidconnectmanager.js

@@ -178,7 +178,9 @@ export default class OpenIdConnectManager extends AbstractConnectManager {
         this.state.oauth.tokens = tokens;
         // Prepare refresh token
         if (this.state.oauth.tokens.expires_in) {
-            const expiresInMs = this.state.oauth.tokens.expires_in * 1000;
+            // Refresh the token 1 minutes before its expiration,
+            // to be sure that it will still be valid when using it.
+            const expiresInMs = (this.state.oauth.tokens.expires_in - 60) * 1000;
             setTimeout(() => this.refreshToken(), expiresInMs);
         }
         this.state.oauth.status = 'issuer.loggedIn';

package/tools/configuration/girafeconfig.d.ts

@@ -38,6 +38,7 @@ declare class GirafeConfig {
     };
     search: {
         url: string;
+        resultsSrid: string;
         objectPreview?: boolean;
         layerPreview?: boolean;
         minResolution?: number;

package/tools/configuration/girafeconfig.js

@@ -73,7 +73,8 @@ class GirafeConfig {
             // We just display a warning in the console
             console.warn(e);
             this.search = {
-                url: ''
+                url: '',
+                resultsSrid: config.map.srid
             };
         }
         try {
@@ -192,6 +193,7 @@ class GirafeConfig {
         }
         return {
             url: config.search.url,
+            resultsSrid: config.search.resultsSrid ?? config.map.srid,
             objectPreview: config.search.objectPreview ?? false,
             layerPreview: config.search.layerPreview ?? false,
             minResolution: config.search.minResolution ?? 0.5,

package/tools/state/state.d.ts

@@ -65,6 +65,7 @@ type LoginState = {
     userInfo?: UserInfo;
     audience: string[];
     error?: string;
+    somethingChanged: boolean;
 };
 export type InfoWindow = {
     title: string | null;

package/tools/state/state.js

@@ -99,7 +99,8 @@ export default class State {
     isOffline = false;
     oauth = {
         status: 'not-initialized',
-        audience: []
+        audience: [],
+        somethingChanged: true
     };
     // The State object is defined as <not extensible> by the StateManager.
     // This property can be used by third-parts components or extensions

package/tools/themes/themesmanager.js

@@ -30,7 +30,8 @@ class ThemesManager extends GirafeSingleton {
         // This is for the next change in the oAuth status.
         this.context.stateManager.subscribe('oauth.status', async () => {
             if (this.state.themes.isLoaded &&
-                (this.state.oauth.status === 'loggedIn' || this.state.oauth.status === 'loggedOut')) {
+                ((this.state.oauth.somethingChanged && this.state.oauth.status === 'loggedIn') ||
+                    this.state.oauth.status === 'loggedOut')) {
                 await this.initialize();
             }
         });