@geogirafe/lib-geoportal 1.2.0-dev.2893241744 → 1.2.0-dev.2897830140

package/components/geolocation-mobile/component.d.ts

@@ -1,6 +1,7 @@
 import Geolocation from 'ol/Geolocation.js';
 import GirafeHTMLElement from '../../base/GirafeHTMLElement.js';
 type GeolocationStatus = 'off' | 'error' | 'searching' | 'tracking' | 'headlock';
+export type GeolocationIcons = Record<GeolocationStatus, string>;
 export default class GeolocationMobile extends GirafeHTMLElement {
     protected templateUrl: string | null;
     protected styleUrls: string[] | null;
@@ -8,6 +9,7 @@ export default class GeolocationMobile extends GirafeHTMLElement {
     geolocation: Geolocation | null;
     status: GeolocationStatus;
     statusBeforeError: GeolocationStatus;
+    icons: GeolocationIcons;
     private readonly positionFeature;
     private readonly accuracyFeature;
     private readonly headingFeature;
@@ -21,7 +23,7 @@ export default class GeolocationMobile extends GirafeHTMLElement {
     protected connectedCallback(): void;
     private pauseTracking;
     private updateIconIfTrackingOutside;
-    getIconForStatus(): any;
+    getIconForStatus(): string | undefined;
     pointerUp(e: PointerEvent): void;
     pointerDown(e: PointerEvent): void;
     preventContextMenu(e: PointerEvent): boolean;

package/components/geolocation-mobile/component.js

@@ -11,10 +11,6 @@ import Stroke from 'ol/style/Stroke.js';
 import Style from 'ol/style/Style.js';
 import { RegularShape } from 'ol/style.js';
 import GirafeHTMLElement from '../../base/GirafeHTMLElement.js';
-import locationDisabledIcon from '../../assets/icons/location_disabled.svg';
-import locationSearchingIcon from '../../assets/icons/location_searching.svg';
-import locationHeadingIcon from '../../assets/icons/location_heading.svg';
-import myLocationIcon from '../../assets/icons/my_location.svg';
 export default class GeolocationMobile extends GirafeHTMLElement {
     templateUrl = null;
     styleUrls = null;
@@ -31,6 +27,13 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
     geolocation = null;
     status = 'off';
     statusBeforeError = 'off';
+    icons = {
+        off: 'icons/location_disabled.svg',
+        error: 'icons/location_disabled.svg',
+        searching: 'icons/location_searching.svg',
+        tracking: 'icons/my_location.svg',
+        headlock: 'icons/location_heading.svg'
+    };
     positionFeature;
     accuracyFeature;
     headingFeature;
@@ -241,20 +244,7 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         if (!this.geolocation) {
             return;
         }
-        switch (this.status) {
-            case 'searching':
-                return locationSearchingIcon;
-            case 'tracking':
-                return myLocationIcon;
-            case 'off':
-                return locationDisabledIcon;
-            case 'error':
-                return locationDisabledIcon;
-            case 'headlock':
-                return locationHeadingIcon;
-            default:
-                return locationDisabledIcon;
-        }
+        return this.icons[this.status] ?? this.icons.off;
     }
     pointerUp(e) {
         e.stopPropagation();

package/components/main.d.ts

@@ -22,6 +22,7 @@ export { default as EditComponent } from './edit/component.js';
 export { default as EditFromComponent } from './edit/editform/component.js';
 export { default as ExternalLayersComponent } from './extlayers/component.js';
 export { default as FeedbackButtonComponent } from './feedbackbutton/component.js';
+export type { GeolocationIcons } from './geolocation-mobile/component.js';
 export { default as GeolocationMobile } from './geolocation-mobile/component.js';
 export { default as GetDirectionsArtifact } from './getdirections/component.js';
 export { default as HeaderComponent } from './header/component.js';

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geogirafe.org"
   },
-  "version": "1.2.0-dev.2893241744",
+  "version": "1.2.0-dev.2897830140",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.2.0-dev.2893241744", "build":"2893241744", "date":"29/09/2026"}
+{"version":"1.2.0-dev.2897830140", "build":"2897830140", "date":"30/09/2026"}

package/tools/app/geogirafeapp.d.ts

@@ -13,5 +13,5 @@ export default class GeoGirafeApp {
     protected addCustomSerializers(): void;
     protected defineCoreComponents(): void;
     private initializeServiceWorker;
-    private waitForServiceWorkerActivation;
+    private waitForServiceWorkerControl;
 }

package/tools/app/geogirafeapp.js

@@ -175,7 +175,7 @@ export default class GeoGirafeApp {
             }
             let sw;
             try {
-                sw = await this.waitForServiceWorkerActivation();
+                sw = await this.waitForServiceWorkerControl();
             }
             catch (err) {
                 throw new Error(`Service worker registration failed. ${err}`, { cause: err });
@@ -213,22 +213,36 @@ export default class GeoGirafeApp {
             this.context.stateManager.state.application.isAuthInitialized = true;
         }
     }
-    async waitForServiceWorkerActivation() {
-        const registration = await navigator.serviceWorker.register('service-worker.js', { type: 'module' });
-        if (registration.active) {
-            return registration.active;
+    async waitForServiceWorkerControl() {
+        const sw = navigator.serviceWorker;
+        const registration = await sw.register('service-worker.js', { type: 'module' });
+        // If a service worker already controls the current page, everything is ready.
+        // `registration.active` only tells us that a service worker is active for the registration;
+        // `sw.controller` tells us that it actually controls this page.
+        if (sw.controller) {
+            return sw.controller;
         }
-        const sw = registration.installing || registration.waiting;
-        if (!sw) {
-            throw new Error('No service worker is installing or waiting.');
+        // The page is not currently controlled by a service worker.
+        // This can happen, for example, after a force refresh (Ctrl+F5), even though
+        // an active service worker already exists. In that case, the service worker's
+        // `activate` event is not triggered again, so the `clients.claim()` call from
+        // the activation phase cannot take control of this newly loaded page.
+        // If an active service worker already exists, explicitly ask it to claim the
+        // current page. The service worker handles this message by calling `clients.claim()`.
+        const active = registration.active;
+        if (active) {
+            active.postMessage({ type: 'claim' });
         }
+        // Wait until the service worker takes control of the current page.
+        // Once `clients.claim()` succeeds, the browser updates `sw.controller` and
+        // dispatches the `controllerchange` event.
         return new Promise((resolve) => {
-            sw.addEventListener('statechange', function onStateChange() {
-                if (sw.state === 'activated') {
-                    sw.removeEventListener('statechange', onStateChange);
-                    resolve(sw);
+            sw.addEventListener('controllerchange', () => {
+                const controller = navigator.serviceWorker.controller;
+                if (controller) {
+                    resolve(controller);
                 }
-            });
+            }, { once: true });
         });
     }
 }

package/tools/sw/service-worker.js

@@ -37,6 +37,10 @@ sw.addEventListener('fetch', (event) => {
     event.respondWith(handleFetchEvent(event));
 });
 function handleMessage(event) {
+    if (event.data?.type === 'claim') {
+        event.waitUntil(sw.clients.claim());
+        return;
+    }
     if (!swHelper.isOriginAllowed(self.location.origin, event.origin)) {
         console.warn(`Message ignored: origin not allowed (${event.origin})`);
         return;
@@ -64,11 +68,6 @@ function handleActivate(event) {
         if ('clients' in sw) {
             await swHelperReady;
             await sw.clients.claim();
-            const clientsList = await sw.clients.matchAll({ type: 'window' });
-            for (const client of clientsList) {
-                client.navigate(client.url);
-                log('Page reloaded by the service worker.');
-            }
         }
     })());
 }