@geogirafe/lib-geoportal 1.1.0-dev.2605752849 → 1.1.0-dev.2623495582

package/components/search-mobile/style.css

@@ -5,6 +5,7 @@
 
 #searchbox {
   background-color: var(--bkg-color);
+  height: 3rem;
   border-right: none;
   border-radius: 4px;
   border: none;
@@ -71,23 +72,35 @@
   overflow-x: hidden;
   scrollbar-width: thin;
   bottom: 0;
-  padding-top: 7vh;
+  /* padding-top = top-position of search field + height of search field + gap */
+  padding-top: calc(max(2.5em, calc(env(safe-area-inset-top) + 0.5rem)) + 3rem + 1rem);
 }
 
-.result,
-.title {
+.entry {
   display: inline-block;
   padding: 0.3rem 1rem;
-  width: Calc(36rem - 2rem);
+  width: calc(36rem - 2rem);
   line-height: 1.3rem;
+  color: var(--text-color);
 }
 
-.title {
-  color: var(--text-color);
+.provider,
+.group {
   font-weight: 600;
-  line-height: 2.5rem;
+  line-height: 3rem;
   font-size: 1.3rem;
-  padding-top: 1.5rem;
+}
+
+.provider {
+  font-size: 1.5rem;
+  margin-top: 1rem;
+  background-color: color-mix(in srgb, var(--bkg-color-grad1) 75%, transparent);
+  border: 0 solid var(--bkg-color-grad2);
+  border-width: 1px 0;
+}
+
+#results > .provider:first-child {
+  margin-top: 0;
 }
 
 .result {
@@ -97,20 +110,19 @@
   background: transparent;
   text-align: left;
   width: 100%;
-  color: var(--text-color);
 }
 
-.title img {
+.entry img {
   margin-right: 1rem;
-  width: 14px;
+  width: 0.8em;
 }
 
-.title span {
+.entry span {
   text-transform: uppercase;
 }
 
 .result.selected {
-  background-color: #aaa !important;
+  background-color: var(--bkg-color-grad2) !important;
   color: var(--text-color);
 }
 

package/components/treeview/treeviewroot/style.css

@@ -91,4 +91,4 @@ img:-moz-loading {
 .no-data span {
   display: block;
   flex-grow: 1;
-}
+}

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geogirafe.org"
   },
-  "version": "1.1.0-dev.2605752849",
+  "version": "1.1.0-dev.2623495582",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"
@@ -83,6 +83,7 @@
     "cross-env": "10.1.0",
     "eslint": "10.2.0",
     "eslint-plugin-es-x": "9.6.0",
+    "fake-indexeddb": "6.2.5",
     "fast-glob": "3.3.3",
     "fs-extra": "11.3.4",
     "globals": "17.4.0",

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2605752849", "build":"2605752849", "date":"16/06/2026"}
+{"version":"1.1.0-dev.2623495582", "build":"2623495582", "date":"23/06/2026"}

package/templates/tsconfig.json

@@ -27,5 +27,5 @@
     "types": ["node"]
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "src/service-worker.ts", "src/service-worker.js"]
+  "exclude": ["node_modules", "src/tools/sw"]
 }

package/templates/vite.config.js

@@ -120,7 +120,7 @@ export default defineConfig(({ command, mode }) => {
           { src: `${cesiumSource}/Workers`, dest: cesiumBaseUrl },
           { src: `${cesiumSource}/Assets`, dest: cesiumBaseUrl },
           { src: `${cesiumSource}/Widgets`, dest: cesiumBaseUrl },
-          { src: `${geogirafeSource}/service-worker.js`, dest: '' },
+          { src: `${geogirafeSource}/tools/sw/*.js`, dest: '' },
           { src: `${geogirafeSource}/styles/*.css`, dest: 'styles/' },
           { src: `${geogirafeSource}/assets/*`, dest: '' },
           { src: `${geogirafeSource}/tools/auth/silentlogincallback.html`, dest: '' },

package/tools/app/geogirafeapp.js

@@ -50,6 +50,7 @@ import SelectionToolComponent from '../../components/selectiontool/component.js'
 import AdvancedFilterComponent from '../../components/advancedfilter/component.js';
 import FixedDimensionComponent from '../../components/drawing/fixed-dimension/component.js';
 import GetDirectionsArtifact from '../../components/getdirections/component.js';
+import ServiceWorkerHelper from '../utils/swhelper.js';
 import FeedbackButtonComponent from '../../components/feedbackbutton/component.js';
 import AddBookmarkComponent from '../../components/addbookmark/component.js';
 import DrawingToolbarComponent from '../../components/drawing-toolbar/component.js';
@@ -168,21 +169,29 @@ export default class GeoGirafeApp {
             catch (err) {
                 throw new Error(`Service worker registration failed. ${err}`, { cause: err });
             }
-            // Communicate logging configuration to service-worker
             const config = this.context.configManager.Config;
-            sw.postMessage({ logLevel: config.general.logLevel });
-            // Communicate oauth configuration to service-worker
+            const serviceWorkerHelper = new ServiceWorkerHelper(sw);
+            // Communicate configuration to service-worker
+            // NOTE REG : Important : we have to wait that the config has been correctly sent to the SW
+            // Otherwise the first requests can be sent without the correct auhentication.
             const issuerConfig = config.oauth?.issuer ?? config.gmfauth;
             const gmfConfig = config.oauth?.geomapfish ?? config.gmfauth;
             if (issuerConfig && gmfConfig) {
                 const issuerHostname = new URL(issuerConfig.url).hostname;
                 const audience = [...issuerConfig.audience, issuerHostname];
-                sw.postMessage({
+                const swConfig = {
+                    logLevel: config.general.logLevel,
                     audience: audience,
                     audienceExcludedPaths: issuerConfig.audienceExcludedPaths,
                     authMode: gmfConfig.authMode,
+                    alwaysSendCookies: issuerConfig.alwaysSendCookies,
                     refererPolicy: gmfConfig.refererPolicy
-                });
+                };
+                await serviceWorkerHelper.sendMessageToServiceWorker(swConfig);
+            }
+            else {
+                // If no auth, we just update the log level, but we do not have to wait
+                sw.postMessage({ logLevel: config.general.logLevel });
             }
             await this.context.offlineManager.setServiceWorker(sw, storeVersion, dbCacheName);
             await this.context.authManager.initialize(sw);
@@ -194,7 +203,7 @@ export default class GeoGirafeApp {
         }
     }
     async waitForServiceWorkerActivation() {
-        const registration = await navigator.serviceWorker.register('service-worker.js');
+        const registration = await navigator.serviceWorker.register('service-worker.js', { type: 'module' });
         if (registration.active) {
             return registration.active;
         }

package/tools/configuration/girafeconfig.d.ts

@@ -43,8 +43,17 @@ declare class GirafeConfig {
         };
     };
     search: {
-        url: string;
-        resultsSrid: string;
+        providers: ({
+            type: 'geomapfish';
+            url: string;
+            resultSrid: string;
+            providerName?: string;
+        } | {
+            type: 'geoadminch';
+            bbox?: string;
+            locationOrigins?: string;
+            providerName?: string;
+        })[];
         objectPreview?: boolean;
         layerPreview?: boolean;
         minResolution?: number;
@@ -191,6 +200,7 @@ declare class GirafeConfig {
         checkSessionOnLoad: boolean;
         audience: string[];
         authMode: 'cookie';
+        alwaysSendCookies: boolean;
         refererPolicy: ReferrerPolicy;
         audienceExcludedPaths: string[];
     };
@@ -205,6 +215,7 @@ declare class GirafeConfig {
             checkSessionOnLoad: boolean;
             audience: string[];
             audienceExcludedPaths: string[];
+            alwaysSendCookies: boolean;
         };
         geomapfish: {
             userInfoUrl: string;

package/tools/configuration/girafeconfig.js

@@ -87,10 +87,7 @@ class GirafeConfig {
             // The application can be started even if the search is not correctly configured
             // We just display a warning in the console
             console.warn(e);
-            this.search = {
-                url: '',
-                resultsSrid: config.map.srid
-            };
+            this.search = { providers: [{ type: 'geomapfish', url: '', resultSrid: this.map.srid }] };
         }
         try {
             this.share = this.initConfigShare(config);
@@ -211,15 +208,36 @@ class GirafeConfig {
         return config.print;
     }
     initConfigSearch(config) {
-        if (!config.search?.url) {
-            throw new Error(`Configuration for search.url is required. See https://doc.geogirafe.org/docs/configuration`);
-        }
-        if (!config.search.url.includes('###SEARCHTERM###')) {
-            throw new Error(`search.url is missing the expected pattern. See https://doc.geogirafe.org/docs/configuration`);
+        if (!config.search) {
+            throw new Error('Configuration for search is required. See  https://doc.geogirafe.org/docs/configuration');
+        }
+        const providers = [];
+        for (const provider of config.search.providers ?? []) {
+            if (provider.type === 'geomapfish') {
+                if (!provider.url.includes('###SEARCHTERM###')) {
+                    throw new Error(`Search provider url of type "geomapfish" is missing the expected pattern. See https://doc.geogirafe.org/docs/configuration`);
+                }
+                providers.push({
+                    type: provider.type,
+                    providerName: provider.providerName ?? provider.type,
+                    url: provider.url,
+                    resultSrid: provider.resultSrid ?? config.map.srid
+                });
+            }
+            else if (provider.type === 'geoadminch') {
+                providers.push({
+                    type: provider.type,
+                    providerName: provider.providerName ?? provider.type,
+                    bbox: provider.bbox,
+                    locationOrigins: provider.locationOrigins
+                });
+            }
+            else {
+                console.warn(`Provider type is missing or not valid: ${provider['type']}`);
+            }
         }
         return {
-            url: config.search.url,
-            resultsSrid: config.search.resultsSrid ?? config.map.srid,
+            providers: providers,
             objectPreview: config.search.objectPreview ?? false,
             layerPreview: config.search.layerPreview ?? false,
             minResolution: config.search.minResolution ?? 0.5,
@@ -358,6 +376,7 @@ class GirafeConfig {
             loginRequired: config.gmfauth.loginRequired ?? false,
             checkSessionOnLoad: config.gmfauth.checkSessionOnLoad ?? true,
             authMode: 'cookie',
+            alwaysSendCookies: config.gmfauth.alwaysSendCookies ?? false,
             refererPolicy: config.gmfauth.refererPolicy ?? 'strict-origin-when-cross-origin',
             audienceExcludedPaths: config.gmfauth.audienceExcludedPaths ?? []
         };
@@ -388,7 +407,8 @@ class GirafeConfig {
             loginRequired: config.oauth.issuer.loginRequired ?? false,
             checkSessionOnLoad: config.oauth.issuer.checkSessionOnLoad ?? false,
             audience: config.oauth.issuer.audience,
-            audienceExcludedPaths: config.oauth.issuer.audienceExcludedPaths ?? []
+            audienceExcludedPaths: config.oauth.issuer.audienceExcludedPaths ?? [],
+            alwaysSendCookies: config.oauth.issuer.alwaysSendCookies ?? false
         };
         const geomapfishConfig = {
             userInfoUrl: config.oauth.geomapfish.userInfoUrl,

package/tools/context/context.d.ts

@@ -31,6 +31,7 @@ import WfsManager from '../wfs/wfsmanager.js';
 import WmsManager from '../wms/wmsmanager.js';
 import IGirafeContext from './icontext.js';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager.js';
+import SearchManager from '../search/searchmanager.js';
 import FeedbackManager from '../feedback/feedbackmanager.js';
 export default class GirafeContext implements IGirafeContext {
     readonly userDataManager: UserDataManager;
@@ -65,6 +66,7 @@ export default class GirafeContext implements IGirafeContext {
     readonly localFileManager: LocalFileManager;
     readonly onBoardingManager: OnBoardingManager;
     readonly themeFavoritesManager: ThemeFavoritesManager;
+    readonly searchManager: SearchManager;
     readonly feedbackManager: FeedbackManager;
     constructor();
     initialize(): Promise<void>;

package/tools/context/context.js

@@ -31,6 +31,7 @@ import UserDataManager from '../userdata/userdatamanager.js';
 import WfsManager from '../wfs/wfsmanager.js';
 import WmsManager from '../wms/wmsmanager.js';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager.js';
+import SearchManager from '../search/searchmanager.js';
 import FeedbackManager from '../feedback/feedbackmanager.js';
 export default class GirafeContext {
     userDataManager;
@@ -65,6 +66,7 @@ export default class GirafeContext {
     localFileManager;
     onBoardingManager;
     themeFavoritesManager;
+    searchManager;
     feedbackManager;
     constructor() {
         this.componentManager = new ComponentManager(this);
@@ -99,6 +101,7 @@ export default class GirafeContext {
         this.ogcApiFeaturesManager = new OgcApiFeaturesManager(this);
         this.onBoardingManager = new OnBoardingManager(this);
         this.themeFavoritesManager = new ThemeFavoritesManager(this);
+        this.searchManager = new SearchManager(this);
         this.feedbackManager = new FeedbackManager(this);
     }
     async initialize() {
@@ -137,6 +140,7 @@ export default class GirafeContext {
         this.ogcApiFeaturesManager.initializeSingleton();
         this.onBoardingManager.initializeSingleton();
         this.themeFavoritesManager.initializeSingleton();
+        this.searchManager.initializeSingleton();
         this.feedbackManager.initializeSingleton();
     }
 }

package/tools/context/icontext.d.ts

@@ -30,6 +30,7 @@ import UserDataManager from '../userdata/userdatamanager.js';
 import WfsManager from '../wfs/wfsmanager.js';
 import WmsManager from '../wms/wmsmanager.js';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager.js';
+import SearchManager from '../search/searchmanager.js';
 import FeedbackManager from '../feedback/feedbackmanager.js';
 export default interface IGirafeContext {
     readonly userDataManager: UserDataManager;
@@ -64,6 +65,7 @@ export default interface IGirafeContext {
     readonly localFileManager: LocalFileManager;
     readonly onBoardingManager: OnBoardingManager;
     readonly themeFavoritesManager: ThemeFavoritesManager;
+    readonly searchManager: SearchManager;
     readonly feedbackManager: FeedbackManager;
     initialize(): Promise<void>;
 }

package/tools/i18n/i18nmanager.js

@@ -42,7 +42,7 @@ class I18nManager extends GirafeSingleton {
         this.loadingLanguagePromise = this.context.configManager.loadConfig().then(async () => {
             if (this.context.configManager.Config?.languages.translations &&
                 language in this.context.configManager.Config.languages.translations) {
-                let mergedTranslations = {};
+                let mergedTranslations = this.translations[language] ?? {};
                 // Translations are loaded in the order defined in the list of files
                 // If an element is present in both results, the last value overwrite all the others
                 for (const url of this.context.configManager.Config.languages.translations[language]) {

package/tools/main.d.ts

@@ -58,6 +58,13 @@ export { default as OrderingManager, LayerTreeStartOrder } from './ordering/orde
 export type { GeoTransform } from './raster/rasterutils.js';
 export { extractGeoTransform, mapToPixel, pixelToMap, getImage, getPixelValue } from './raster/rasterutils.js';
 export { default as ResizeWindow } from './resizewindow.js';
+export { default as AbstractSearchClient, SEARCH_PROVIDER_DEFAULT, SEARCH_GROUP_DEFAULT, SEARCH_GROUP_RECENTER_MAP } from './search/abstractsearchclient.js';
+export type { GeoAdminChSearchConfig } from './search/geoadminchsearchclient.js';
+export { default as GeoAdminChSearchClient } from './search/geoadminchsearchclient.js';
+export type { GmfSearchConfig } from './search/gmfsearchclient.js';
+export { default as GmfSearchClient } from './search/gmfsearchclient.js';
+export type { SearchProviderConfig } from './search/searchmanager.js';
+export { default as SearchManager } from './search/searchmanager.js';
 export type { default as ISessionManager } from './share/isessionmanager.js';
 export type { UrlShortenerResponse, IUrlShortener } from './share/iurlshortener.js';
 export { default as ActiveBasemapsSerializer } from './share/serializers/activebasemapsserializer.js';
@@ -104,6 +111,8 @@ export type { GgUserInteractionListener } from './state/userInteractionManager.j
 export { default as UserInteractionManager } from './state/userInteractionManager.js';
 export type { GgUserInteractionEvent } from './state/userinteractionevent.js';
 export { gGEventDependencies, isPrimaryPointerAction, isAlternateMouseClick, isMouseWheelClick } from './state/userinteractionevent.js';
+export type { SwState } from './sw/service-worker.tools';
+export { swLog, SwHelper, IndexedDbHelper, CacheHelper } from './sw/service-worker.tools';
 export { default as CustomThemesManager } from './themes/customthemesmanager.js';
 export { default as ThemeFavoritesManager } from './themes/themefavoritesmanager.js';
 export { DEFAULT_OPACITY, OPACITY_FOR_DEFAULT_BASEMAP } from './themes/themes-config.js';

package/tools/main.js

@@ -48,6 +48,10 @@ export { default as OnBoardingManager } from './onboarding/onboardingmanager.js'
 export { default as OrderingManager, LayerTreeStartOrder } from './ordering/orderingmanager.js';
 export { extractGeoTransform, mapToPixel, pixelToMap, getImage, getPixelValue } from './raster/rasterutils.js';
 export { default as ResizeWindow } from './resizewindow.js';
+export { default as AbstractSearchClient, SEARCH_PROVIDER_DEFAULT, SEARCH_GROUP_DEFAULT, SEARCH_GROUP_RECENTER_MAP } from './search/abstractsearchclient.js';
+export { default as GeoAdminChSearchClient } from './search/geoadminchsearchclient.js';
+export { default as GmfSearchClient } from './search/gmfsearchclient.js';
+export { default as SearchManager } from './search/searchmanager.js';
 export { default as ActiveBasemapsSerializer } from './share/serializers/activebasemapsserializer.js';
 export { default as CustomLayersSerializer } from './share/serializers/customlayersserializer.js';
 export { default as GlobeSerializer } from './share/serializers/globeserializer.js';
@@ -77,6 +81,7 @@ export { default as StateToggleManager } from './state/stateToggleManager.js';
 export { default as StateManager } from './state/statemanager.js';
 export { default as UserInteractionManager } from './state/userInteractionManager.js';
 export { gGEventDependencies, isPrimaryPointerAction, isAlternateMouseClick, isMouseWheelClick } from './state/userinteractionevent.js';
+export { swLog, SwHelper, IndexedDbHelper, CacheHelper } from './sw/service-worker.tools';
 export { default as CustomThemesManager } from './themes/customthemesmanager.js';
 export { default as ThemeFavoritesManager } from './themes/themefavoritesmanager.js';
 export { DEFAULT_OPACITY, OPACITY_FOR_DEFAULT_BASEMAP } from './themes/themes-config.js';

package/tools/offline/offlinemanager.d.ts

@@ -3,14 +3,15 @@ import LayerWmts from '../../models/layers/layerwmts.js';
 import { Extent } from 'ol/extent.js';
 declare class OfflineManager extends GirafeSingleton {
     private serviceWorker;
-    private database?;
+    private readonly indexedDbHelper;
     private get map();
     private get state();
+    private database;
     private totalLength;
     private counter;
     private progressCallback?;
-    private storeVersion?;
-    private dbCacheName?;
+    private storeVersion;
+    private dbCacheName;
     private readonly tilesStoreName;
     private readonly bboxStoreName;
     private readonly vectorLayer;
@@ -19,7 +20,7 @@ declare class OfflineManager extends GirafeSingleton {
     private registerEvents;
     /** Exports all the WMTS tiles for the layers in parameter and store them to local cache */
     exportWMTSTiles(bbox: Extent, wmtsLayers: LayerWmts[], progressCallback?: CallableFunction): Promise<void>;
-    private openIndexedDB;
+    upgradeIndexedDb(database: IDBDatabase): void;
     /** The offline manager works with a ServiceWorker in charge of intercepting
      * the fetch requests and read the data from the local cache if the application
      * is offline. This method defines the servicework object to use.