From da8695c214c13f3ce336e85caa03103768b2c831 Mon Sep 17 00:00:00 2001 From: paul lahana Date: Fri, 25 Sep 2026 08:23:33 +0200 Subject: [PATCH 1/2] feat: add analytics opt-out control AddAnalyticsOptOut component to AboutDrawer and PrivacyContent pages to allow users to disable analytics tracking. Initialize analytics opt-out functionality when about drawer loads. Update privacy policy documentation to reflect current data handling practices and service providers. --- src/app/aboutDrawer.ts | 2 + src/components/AnalyticsOptOut.astro | 69 +++++++++ src/components/PrivacyContent.astro | 220 +++++++++++++++++++-------- src/components/app/AboutDrawer.astro | 4 + src/layouts/PrivacyLayout.astro | 2 + src/lib/analyticsOptOut.js | 35 +++++ src/lib/i18n.ts | 10 ++ src/styles/main.css | 5 + tests/analyticsOptOut.test.js | 49 ++++++ tests/e2e/analytics-optout.spec.js | 81 ++++++++++ 10 files changed, 416 insertions(+), 61 deletions(-) create mode 100644 src/components/AnalyticsOptOut.astro create mode 100644 src/lib/analyticsOptOut.js create mode 100644 tests/analyticsOptOut.test.js create mode 100644 tests/e2e/analytics-optout.spec.js diff --git a/src/app/aboutDrawer.ts b/src/app/aboutDrawer.ts index 112099a..38f55d3 100644 --- a/src/app/aboutDrawer.ts +++ b/src/app/aboutDrawer.ts @@ -1,4 +1,5 @@ import { el } from './dom'; +import { initAnalyticsOptOut } from '../lib/analyticsOptOut.js'; const drawer = () => el('about-drawer'); @@ -50,4 +51,5 @@ export function initAboutDrawer() { el('about-overlay').addEventListener('click', dismissAbout); document.addEventListener('keydown', (e: KeyboardEvent) => { if (e.key === 'Escape') dismissAbout(); }); document.addEventListener('keydown', trapAboutFocus); + initAnalyticsOptOut(); } diff --git a/src/components/AnalyticsOptOut.astro b/src/components/AnalyticsOptOut.astro new file mode 100644 index 0000000..2a0d4c2 --- /dev/null +++ b/src/components/AnalyticsOptOut.astro @@ -0,0 +1,69 @@ +--- +import { translations, type Lang } from '../lib/i18n'; + +interface Props { + lang: Lang; +} + +const { lang } = Astro.props; +const t = translations[lang]; +--- + + + + diff --git a/src/components/PrivacyContent.astro b/src/components/PrivacyContent.astro index d905938..7e0ba70 100644 --- a/src/components/PrivacyContent.astro +++ b/src/components/PrivacyContent.astro @@ -1,5 +1,6 @@ --- import type { Lang } from '../lib/i18n'; +import AnalyticsOptOut from './AnalyticsOptOut.astro'; interface Props { lang: Lang; @@ -11,33 +12,48 @@ const { lang } = Astro.props; {lang === 'fr' && (

Politique de confidentialité

-

Dernière mise à jour : juin 2026

+

Dernière mise à jour : septembre 2026

Ce que MeridianWay fait (et ne fait pas)

-

MeridianWay est une application entièrement statique : elle ne possède pas de serveur propre, ne crée pas de compte utilisateur et ne stocke aucune donnée personnelle en base de données. Tout le calcul (position du soleil, score d'ombre) s'effectue directement dans votre navigateur.

+

MeridianWay ne crée pas de compte utilisateur, ne vous demande aucune information personnelle et ne tient aucun fichier de ses utilisateurs. Tout le calcul (position du soleil, score d'ombre) s'effectue directement dans votre navigateur. Le site est hébergé par Fly.io, et trois relais (Cloudflare Workers) opérés par MeridianWay transmettent une partie des requêtes et en gardent les réponses en cache.

Données transmises à des services tiers

-

Pour fonctionner, l'application envoie certaines données à des services externes. Ces services reçoivent votre adresse IP ainsi que les données listées ci-dessous.

+

Pour fonctionner, l'application envoie certaines données à des services externes. Chaque service que votre navigateur contacte directement reçoit aussi votre adresse IP. OpenRouteService et Overpass sont interrogés par un relais MeridianWay et ne la reçoivent pas.

- - - - - - - + + + + + + + + + +
ServiceDonnées transmisesFinalité
Photon (komoot GmbH, DE)Texte saisi dans les champs adresseSuggestions d'autocomplétion
Nominatim (OSM Foundation, UK)Adresse saisie ; coordonnées GPS si géolocalisation activéeGéocodage et géocodage inverse
OpenRouteService (HeiGIT, DE)Coordonnées de départ et d'arrivéeCalcul des itinéraires
Overpass API (serveurs OSM)Zone géographique de l'itinéraireDonnées bâtiments et arbres
CartoCDN (Carto Inc., USA)Zone de la carte affichéeTuiles cartographiques
UmamiPage visitée, type d'appareil, langue du navigateur — sans cookies, IP anonymiséeStatistiques d'utilisation agrégées
Sentry (serveurs EU, Allemagne)Erreurs techniques, URL de la page, type de navigateur — sans données d'identitéDétection et correction de bugs
Fly.io
hébergement		Pages demandéesMise à disposition du site
Stadia MapsZone de la carte affichéeFond de carte
Photon
komoot GmbH, DE		Texte saisi dans les champs adresse ; lieu déjà choisi dans l'autre champSuggestions d'autocomplétion
Nominatim
OSM Foundation, UK		Adresse saisie ; coordonnées GPS si vous utilisez la géolocalisationGéocodage et géocodage inverse
Open-MeteoPoint central de l'itinéraireMétéo : nébulosité et température
Relais MeridianWay
Cloudflare Workers		Coordonnées de départ et d'arrivée ; zone de l'itinéraireRelais vers OpenRouteService et Overpass, hauteurs des bâtiments suisses ; réponses gardées en cache 7 à 30 jours, sans lien avec qui les a demandées
OpenRouteService
HeiGIT, DE, via le relais		Coordonnées de départ et d'arrivéeCalcul des itinéraires
Overpass API
serveurs OSM, via le relais		Zone géographique de l'itinéraireDonnées bâtiments et arbres
UmamiAdresse de la page, site de provenance, localisation approximative (pays, région) déduite de l'adresse IP, qui n'est pas conservée ; navigateur, système, taille d'écran, langue ; actions dans l'app (recherche lancée, partage…). Sans cookieStatistiques d'utilisation agrégées, désactivables (voir plus bas)
Sentry
serveurs EU, Allemagne		Erreurs techniques, adresse de la page, type de navigateur ; sans données d'identitéDétection et correction de bugs
-

La géolocalisation est optionnelle et uniquement déclenchée si vous cliquez sur le bouton de localisation.

+

Après une recherche, l'adresse de la page contient les points de départ et d'arrivée, ainsi que le texte saisi pour les désigner : c'est ce qui rend un itinéraire partageable. Umami et Sentry reçoivent donc ces informations avec l'adresse de la page.

+ +

La géolocalisation est optionnelle : l'app n'y a accès qu'avec votre autorisation, demandée par le navigateur. Elle sert quand vous appuyez sur un bouton de localisation et, dans l'app installée sur l'écran d'accueil, à proposer votre position comme départ à l'ouverture. Si vous avez déjà donné l'autorisation, l'app s'en sert aussi pour centrer la carte au démarrage.

Cookies et stockage local

-

MeridianWay n'utilise aucun cookie. Aucune donnée n'est enregistrée dans le stockage local de votre navigateur.

+

MeridianWay n'utilise aucun cookie. L'app enregistre en revanche jusqu'à trois informations dans le stockage local de votre navigateur :

+ +

Ces informations restent sur votre appareil. La position n'en sort que lorsqu'elle est reprise comme point de départ, et suit alors le même chemin que tout point de départ. Pour tout effacer, supprimez les données du site dans les réglages de votre navigateur.

+ +

Statistiques de visite

+

MeridianWay mesure son audience avec Umami, sans cookie et sans enregistrer d'identifiant sur votre appareil. Si vous préférez que vos visites ne soient pas comptées, désactivez l'interrupteur ci-dessous, ou celui du panneau À propos de l'app : plus rien n'est envoyé à Umami depuis ce navigateur, sans rechargement. Le réglage vaut pour ce navigateur sur cet appareil. Sur iPhone, l'app installée sur l'écran d'accueil a son propre stockage et se règle séparément. Il ne coupe pas les rapports d'erreurs envoyés à Sentry.

+

Vos droits

Conformément à la loi fédérale suisse sur la protection des données (nLPD) et au RGPD pour les utilisateurs de l'Union européenne, vous pouvez à tout moment demander quelles données vous concernant ont été traitées. Les données transmises aux services tiers sont régies par leurs propres politiques de confidentialité.

@@ -50,33 +66,48 @@ const { lang } = Astro.props; {lang === 'de' && (

Datenschutzerklärung

-

Zuletzt aktualisiert: Juni 2026

+

Zuletzt aktualisiert: September 2026

Was MeridianWay tut (und nicht tut)

-

MeridianWay ist eine vollständig statische Anwendung: Sie verfügt über keinen eigenen Server, erstellt keine Benutzerkonten und speichert keine personenbezogenen Daten in einer Datenbank. Alle Berechnungen (Sonnenposition, Schattenbewertung) erfolgen direkt in Ihrem Browser.

+

MeridianWay erstellt keine Benutzerkonten, fragt keine persönlichen Angaben ab und führt keine Kartei über seine Nutzerinnen und Nutzer. Alle Berechnungen (Sonnenposition, Schattenbewertung) erfolgen direkt in Ihrem Browser. Die Website wird bei Fly.io gehostet; drei von MeridianWay betriebene Relais (Cloudflare Workers) leiten einen Teil der Anfragen weiter und speichern die Antworten zwischen.

An Drittanbieter übermittelte Daten

-

Für den Betrieb sendet die Anwendung bestimmte Daten an externe Dienste. Diese Dienste erhalten Ihre IP-Adresse sowie die nachstehend aufgeführten Daten.

+

Für den Betrieb sendet die Anwendung bestimmte Daten an externe Dienste. Jeder Dienst, den Ihr Browser direkt kontaktiert, erhält auch Ihre IP-Adresse. OpenRouteService und Overpass werden über ein MeridianWay-Relais abgefragt und erhalten sie nicht.

- - - - - - - + + + + + + + + + +
DienstÜbermittelte DatenZweck
Photon (komoot GmbH, DE)In den Adressfeldern eingegebener TextAutocomplete-Vorschläge
Nominatim (OSM Foundation, UK)Eingegebene Adresse; GPS-Koordinaten bei aktivierter StandortbestimmungGeo- und Reverse-Geocoding
OpenRouteService (HeiGIT, DE)Start- und ZielkoordinatenRoutenberechnung
Overpass API (OSM-Server)Geografischer Bereich der RouteGebäude- und Baumdaten
CartoCDN (Carto Inc., USA)Angezeigter KartenausschnittKartenkacheln
UmamiBesuchte Seite, Gerätetyp, Browsersprache — ohne Cookies, anonymisierte IPAggregierte Nutzungsstatistiken
Sentry (EU-Server, Deutschland)Technische Fehler, Seiten-URL, Browsertyp — ohne IdentitätsdatenFehlererkennung und -behebung
Fly.io
Hosting		Aufgerufene SeitenBereitstellung der Website
Stadia MapsAngezeigter KartenausschnittHintergrundkarte
Photon
komoot GmbH, DE		In den Adressfeldern eingegebener Text; im anderen Feld bereits gewählter OrtAutocomplete-Vorschläge
Nominatim
OSM Foundation, UK		Eingegebene Adresse; GPS-Koordinaten, wenn Sie die Standortbestimmung nutzenGeo- und Reverse-Geocoding
Open-MeteoMittelpunkt der RouteWetter: Bewölkung und Temperatur
MeridianWay-Relais
Cloudflare Workers		Start- und Zielkoordinaten; Bereich der RouteWeiterleitung an OpenRouteService und Overpass, Schweizer Gebäudehöhen; Antworten werden 7 bis 30 Tage zwischengespeichert, ohne Bezug zur anfragenden Person
OpenRouteService
HeiGIT, DE, über das Relais		Start- und ZielkoordinatenRoutenberechnung
Overpass API
OSM-Server, über das Relais		Geografischer Bereich der RouteGebäude- und Baumdaten
UmamiSeitenadresse, verweisende Website, ungefährer Standort (Land, Region) aus der IP-Adresse, die nicht gespeichert wird; Browser, System, Bildschirmgrösse, Sprache; Aktionen in der App (Suche gestartet, Teilen …). Ohne CookiesAggregierte Nutzungsstatistiken, abschaltbar (siehe unten)
Sentry
EU-Server, Deutschland		Technische Fehler, Seitenadresse, Browsertyp; ohne IdentitätsdatenFehlererkennung und -behebung
-

Die Standortbestimmung ist optional und wird nur aktiviert, wenn Sie auf die Standortschaltfläche klicken.

+

Nach einer Suche enthält die Seitenadresse Start- und Zielpunkt sowie den dafür eingegebenen Text: So lässt sich eine Route teilen. Umami und Sentry erhalten diese Angaben daher mit der Seitenadresse.

+ +

Die Standortbestimmung ist optional: Die App erhält nur mit Ihrer Erlaubnis Zugriff darauf, die Ihr Browser abfragt. Sie wird genutzt, wenn Sie auf eine Standortschaltfläche tippen, und in der auf dem Startbildschirm installierten App, um beim Öffnen Ihren Standort als Start vorzuschlagen. Haben Sie die Erlaubnis bereits erteilt, zentriert die App damit auch die Karte beim Start.

Cookies und lokaler Speicher

-

MeridianWay verwendet keine Cookies. Es werden keine Daten im lokalen Speicher Ihres Browsers gespeichert.

+

MeridianWay verwendet keine Cookies. Die App speichert jedoch bis zu drei Angaben im lokalen Speicher Ihres Browsers:

+
    +
  • Ihren letzten Standort, falls Sie die Standortbestimmung genutzt haben: In der installierten App dient er als Ersatzstart, wenn die Ortung fehlschlägt.
    • +
  • Dass Sie das Installationsbanner geschlossen haben, damit es nicht mehr erscheint.
    • +
  • Dass Sie die Besuchsstatistik ausgeschaltet haben, falls zutreffend (siehe unten).
    • +
+

Diese Angaben bleiben auf Ihrem Gerät. Der Standort verlässt es nur, wenn er als Startpunkt übernommen wird, und nimmt dann denselben Weg wie jeder Startpunkt. Um alles zu löschen, entfernen Sie die Websitedaten in den Einstellungen Ihres Browsers.

+ +

Besuchsstatistik

+

MeridianWay misst seine Besuche mit Umami, ohne Cookies und ohne eine Kennung auf Ihrem Gerät zu speichern. Möchten Sie nicht gezählt werden, schalten Sie den Schalter unten aus oder den im Bereich «Über die App»: Von diesem Browser wird dann nichts mehr an Umami gesendet, ohne Neuladen. Die Einstellung gilt für diesen Browser auf diesem Gerät. Auf dem iPhone hat die auf dem Startbildschirm installierte App einen eigenen Speicher und wird separat eingestellt. Fehlerberichte an Sentry werden dadurch nicht abgeschaltet.

+

Ihre Rechte

Gemäss dem Schweizer Bundesgesetz über den Datenschutz (DSG) und der DSGVO für Nutzer der Europäischen Union können Sie jederzeit anfragen, welche Daten über Sie verarbeitet wurden. Die an Drittanbieter übermittelten Daten unterliegen deren eigenen Datenschutzrichtlinien.

@@ -89,33 +120,48 @@ const { lang } = Astro.props; {lang === 'it' && (

Informativa sulla privacy

-

Ultimo aggiornamento: giugno 2026

+

Ultimo aggiornamento: settembre 2026

Cosa fa (e non fa) MeridianWay

-

MeridianWay è un'applicazione completamente statica: non dispone di un proprio server, non crea account utente e non memorizza dati personali in alcun database. Tutti i calcoli (posizione del sole, punteggio ombra) vengono eseguiti direttamente nel tuo browser.

+

MeridianWay non crea account utente, non chiede informazioni personali e non tiene alcun archivio dei suoi utenti. Tutti i calcoli (posizione del sole, punteggio ombra) vengono eseguiti direttamente nel tuo browser. Il sito è ospitato da Fly.io, e tre relay (Cloudflare Workers) gestiti da MeridianWay inoltrano parte delle richieste e ne conservano le risposte in cache.

Dati trasmessi a servizi di terze parti

-

Per funzionare, l'applicazione invia alcuni dati a servizi esterni. Questi servizi ricevono il tuo indirizzo IP e i dati elencati di seguito.

+

Per funzionare, l'applicazione invia alcuni dati a servizi esterni. Ogni servizio che il tuo browser contatta direttamente riceve anche il tuo indirizzo IP. OpenRouteService e Overpass vengono interrogati da un relay di MeridianWay e non lo ricevono.

- - - - - - - + + + + + + + + + +
ServizioDati trasmessiFinalità
Photon (komoot GmbH, DE)Testo inserito nei campi indirizzoSuggerimenti di completamento automatico
Nominatim (OSM Foundation, UK)Indirizzo inserito; coordinate GPS se la geolocalizzazione è attivataGeocodifica e geocodifica inversa
OpenRouteService (HeiGIT, DE)Coordinate di partenza e arrivoCalcolo degli itinerari
Overpass API (server OSM)Area geografica dell'itinerarioDati edifici e alberi
CartoCDN (Carto Inc., USA)Area della mappa visualizzataTile cartografiche
UmamiPagina visitata, tipo di dispositivo, lingua del browser — senza cookie, IP anonimizzatoStatistiche d'uso aggregate
Sentry (server EU, Germania)Errori tecnici, URL della pagina, tipo di browser — senza dati di identitàRilevamento e correzione dei bug
Fly.io
hosting		Pagine richiesteMessa a disposizione del sito
Stadia MapsArea della mappa visualizzataMappa di base
Photon
komoot GmbH, DE		Testo inserito nei campi indirizzo; luogo già scelto nell'altro campoSuggerimenti di completamento automatico
Nominatim
OSM Foundation, UK		Indirizzo inserito; coordinate GPS se usi la geolocalizzazioneGeocodifica e geocodifica inversa
Open-MeteoPunto centrale dell'itinerarioMeteo: nuvolosità e temperatura
Relay MeridianWay
Cloudflare Workers		Coordinate di partenza e arrivo; area dell'itinerarioInoltro a OpenRouteService e Overpass, altezze degli edifici svizzeri; risposte conservate in cache da 7 a 30 giorni, senza legame con chi le ha richieste
OpenRouteService
HeiGIT, DE, tramite il relay		Coordinate di partenza e arrivoCalcolo degli itinerari
Overpass API
server OSM, tramite il relay		Area geografica dell'itinerarioDati edifici e alberi
UmamiIndirizzo della pagina, sito di provenienza, posizione approssimativa (paese, regione) ricavata dall'indirizzo IP, che non viene conservato; browser, sistema, dimensioni dello schermo, lingua; azioni nell'app (ricerca avviata, condivisione…). Senza cookieStatistiche d'uso aggregate, disattivabili (vedi sotto)
Sentry
server EU, Germania		Errori tecnici, indirizzo della pagina, tipo di browser; senza dati di identitàRilevamento e correzione dei bug
-

La geolocalizzazione è opzionale e viene attivata solo se fai clic sul pulsante di localizzazione.

+

Dopo una ricerca, l'indirizzo della pagina contiene i punti di partenza e di arrivo e il testo inserito per indicarli: è ciò che rende condivisibile un itinerario. Umami e Sentry ricevono quindi queste informazioni insieme all'indirizzo della pagina.

+ +

La geolocalizzazione è opzionale: l'app vi accede solo con il tuo permesso, richiesto dal browser. Viene usata quando tocchi un pulsante di localizzazione e, nell'app installata sulla schermata Home, per proporre la tua posizione come partenza all'apertura. Se hai già dato il permesso, l'app la usa anche per centrare la mappa all'avvio.

Cookie e archiviazione locale

-

MeridianWay non utilizza alcun cookie. Nessun dato viene salvato nell'archiviazione locale del tuo browser.

+

MeridianWay non utilizza alcun cookie. L'app salva però fino a tre informazioni nell'archiviazione locale del tuo browser:

+
    +
  • La tua ultima posizione, se hai usato la geolocalizzazione: nell'app installata serve da partenza di riserva quando la localizzazione non riesce.
    • +
  • La chiusura del banner di installazione, per non mostrarlo più.
    • +
  • La disattivazione delle statistiche di visita, se l'hai scelta (vedi sotto).
    • +
+

Queste informazioni restano sul tuo dispositivo. La posizione ne esce solo quando viene ripresa come punto di partenza, e segue allora lo stesso percorso di qualsiasi punto di partenza. Per cancellare tutto, elimina i dati del sito nelle impostazioni del browser.

+ +

Statistiche di visita

+

MeridianWay misura le visite con Umami, senza cookie e senza salvare alcun identificativo sul tuo dispositivo. Se preferisci che le tue visite non vengano contate, disattiva l'interruttore qui sotto o quello nel pannello Informazioni dell'app: da questo browser non viene più inviato nulla a Umami, senza ricaricare la pagina. L'impostazione vale per questo browser su questo dispositivo. Su iPhone, l'app installata sulla schermata Home ha una propria memoria e si imposta a parte. Non disattiva le segnalazioni di errore inviate a Sentry.

+

I tuoi diritti

In conformità con la legge federale svizzera sulla protezione dei dati (LPD) e il RGPD per gli utenti dell'Unione europea, puoi richiedere in qualsiasi momento quali dati che ti riguardano sono stati trattati. I dati trasmessi a servizi di terze parti sono disciplinati dalle rispettive informative sulla privacy.

@@ -128,33 +174,48 @@ const { lang } = Astro.props; {lang === 'en' && (

Privacy Policy

-

Last updated: June 2026

+

Last updated: September 2026

What MeridianWay does (and doesn't do)

-

MeridianWay is a fully static application: it has no server of its own, creates no user accounts, and stores no personal data in any database. All calculations (sun position, shadow scoring) run directly in your browser.

+

MeridianWay creates no user accounts, asks for no personal information and keeps no records of its users. All calculations (sun position, shadow scoring) run directly in your browser. The site is hosted by Fly.io, and three relays (Cloudflare Workers) run by MeridianWay forward some of the requests and cache the responses.

Data sent to third-party services

-

To function, the application sends certain data to external services. These services receive your IP address along with the data listed below.

+

To function, the application sends certain data to external services. Every service your browser contacts directly also receives your IP address. OpenRouteService and Overpass are queried by a MeridianWay relay and do not receive it.

- - - - - - - + + + + + + + + + +
ServiceData sentPurpose
Photon (komoot GmbH, DE)Text typed in address fieldsAutocomplete suggestions
Nominatim (OSM Foundation, UK)Address entered; GPS coordinates if geolocation is enabledGeocoding and reverse geocoding
OpenRouteService (HeiGIT, DE)Start and end coordinatesRoute calculation
Overpass API (OSM servers)Geographic area of the routeBuilding and tree data
CartoCDN (Carto Inc., USA)Displayed map areaMap tiles
UmamiPage visited, device type, browser language — no cookies, anonymised IPAggregated usage statistics
Sentry (EU servers, Germany)Technical errors, page URL, browser type — no identity dataBug detection and fixing
Fly.io
hosting		Pages requestedServing the site
Stadia MapsDisplayed map areaBase map
Photon
komoot GmbH, DE		Text typed in address fields; place already chosen in the other fieldAutocomplete suggestions
Nominatim
OSM Foundation, UK		Address entered; GPS coordinates if you use geolocationGeocoding and reverse geocoding
Open-MeteoMidpoint of the routeWeather: cloud cover and temperature
MeridianWay relays
Cloudflare Workers		Start and end coordinates; area of the routeRelay to OpenRouteService and Overpass, Swiss building heights; responses cached for 7 to 30 days, with no link to who requested them
OpenRouteService
HeiGIT, DE, via the relay		Start and end coordinatesRoute calculation
Overpass API
OSM servers, via the relay		Geographic area of the routeBuilding and tree data
UmamiPage address, referring site, approximate location (country, region) derived from the IP address, which is not stored; browser, system, screen size, language; actions in the app (search started, share…). No cookiesAggregated usage statistics, which you can turn off (see below)
Sentry
EU servers, Germany		Technical errors, page address, browser type; no identity dataBug detection and fixing
-

Geolocation is optional and only triggered if you click the location button.

+

After a search, the page address contains the start and end points and the text typed to name them: that is what makes a route shareable. Umami and Sentry therefore receive this information with the page address.

+ +

Geolocation is optional: the app only gets access with your permission, which your browser asks for. It is used when you tap a location button and, in the app installed on your home screen, to suggest your position as the start when it opens. If you have already granted permission, the app also uses it to centre the map at start-up.

Cookies and local storage

-

MeridianWay uses no cookies. No data is saved in your browser's local storage.

+

MeridianWay uses no cookies. The app does save up to three items in your browser's local storage:

+
    +
  • Your last position, if you have used geolocation: in the installed app, it is the fallback start when locating you fails.
    • +
  • That you closed the install banner, so it is not shown again.
    • +
  • That you turned off visit statistics, if you did (see below).
    • +
+

These items stay on your device. The position only leaves it when it is used as a starting point, and then follows the same path as any starting point. To erase them all, clear this site's data in your browser settings.

+ +

Visit statistics

+

MeridianWay measures its audience with Umami, without cookies and without saving any identifier on your device. If you would rather your visits were not counted, turn off the switch below, or the one in the app's About panel: nothing more is sent to Umami from this browser, with no reload needed. The setting applies to this browser on this device. On iPhone, the app installed on your home screen has its own storage and is set separately. It does not turn off the error reports sent to Sentry.

+

Your rights

Under the Swiss Federal Act on Data Protection (FADP) and the GDPR for users in the European Union, you may at any time request details of what data concerning you has been processed. Data transmitted to third-party services is governed by their own privacy policies.

@@ -167,33 +228,48 @@ const { lang } = Astro.props; {lang === 'rm' && (

Disposiziuns davart la protecziun da datas

-

Ultima actualisaziun: zercladur 2026

+

Ultima actualisaziun: settember 2026

Tge che MeridianWay fa (e na fa)

-

MeridianWay è ina app cumplettamain statica: ella n’ha nagin agen server, na fa nagins contos d’utilisader e n’arcunescha naginas datas persunalas en ina banca da datas. Tut las calculaziuns (posiziun dal sulegl, evaluaziun da la sumbriva) vegnan fatgas directamain en Voss navigatur.

+

MeridianWay na fa nagins contos d’utilisader, na dumonda naginas indicaziuns persunalas e na maina nagina cartoteca da ses utilisaders. Tut las calculaziuns (posiziun dal sulegl, evaluaziun da la sumbriva) vegnan fatgas directamain en Voss navigatur. La website vegn ospitada da Fly.io, e trais relais (Cloudflare Workers) manads da MeridianWay transmettan ina part da las dumondas ed arcuneschan las respostas en il cache.

Datas surdadas a servetschs da terzas persunas

-

Per funcziunar tramet l’app tschertas datas a servetschs externs. Quests servetschs survegnan Vossa adressa IP sco er las datas menziunadas qua sutvart.

+

Per funcziunar tramet l’app tschertas datas a servetschs externs. Mintga servetsch che Voss navigatur contactescha directamain survegn er Vossa adressa IP. OpenRouteService ed Overpass vegnan dumandads tras in relais da MeridianWay e na la survegnan betg.

- - - - - - - + + + + + + + + + +
ServetschDatas transmessasFinamira
Photon (komoot GmbH, DE)Text endatà en ils champs d’adressasPropostas da cumplettaziun automatica
Nominatim (OSM Foundation, UK)Adressa endatada; coordinatas GPS sche la geolocaziun è activadaGeocodaziun e geocodaziun inversa
OpenRouteService (HeiGIT, DE)Coordinatas da partenza e d’arrivCalculaziun da la ruta
Overpass API (servers OSM)Zona geografica da la rutaDatas d’edifizis e da plantas
CartoCDN (Carto Inc., USA)Zona da la charta mussadaPlattinas da charta
UmamiPagina visitada, tip da l’apparat, lingua dal navigatur — senza cookies, adressa IP anonimisadaStatisticas d’utilisaziun agregadas
Sentry (servers UE, Germania)Sbagls tecnics, URL da la pagina, tip dal navigatur — senza datas d’identitadChattar e reparar sbagls
Fly.io
hosting		Paginas dumandadasMetter a disposiziun la website
Stadia MapsZona da la charta mussadaCharta da basa
Photon
komoot GmbH, DE		Text endatà en ils champs d’adressas; lieu gia tschernì en l’auter champPropostas da cumplettaziun automatica
Nominatim
OSM Foundation, UK		Adressa endatada; coordinatas GPS sche Vus utilisais la geolocaziunGeocodaziun e geocodaziun inversa
Open-MeteoPunct central da la rutaAura: nivels e temperatura
Relais MeridianWay
Cloudflare Workers		Coordinatas da partenza e d’arriv; zona da la rutaTransmissiun a OpenRouteService ed Overpass, autezzas dals edifizis svizzers; respostas arcunadas 7 fin 30 dis en il cache, senza colliaziun cun la persuna che las ha dumandadas
OpenRouteService
HeiGIT, DE, tras il relais		Coordinatas da partenza e d’arrivCalculaziun da la ruta
Overpass API
servers OSM, tras il relais		Zona geografica da la rutaDatas d’edifizis e da plantas
UmamiAdressa da la pagina, website da derivanza, lieu approximativ (pajais, regiun) deducì da l’adressa IP, che na vegn betg arcunada; navigatur, sistem, grondezza dal visur, lingua; acziuns en l’app (tschertga cumenzada, parter…). Senza cookiesStatisticas d’utilisaziun agregadas, che Vus pudais deactivar (guardai sutvart)
Sentry
servers UE, Germania		Sbagls tecnics, adressa da la pagina, tip dal navigatur; senza datas d’identitadChattar e reparar sbagls
-

La geolocaziun è opziunala e vegn mo activada sche Vus cliccais sin il buttun da localisaziun.

+

Suenter ina tschertga cuntegna l’adressa da la pagina il punct da partenza e quel d’arriv sco er il text endatà per als numnar: uschia sa lascha ina ruta parter. Umami e Sentry survegnan perquai questas indicaziuns cun l’adressa da la pagina.

+ +

La geolocaziun è opziunala: l’app ha mo access cun Voss permiss, che Voss navigatur dumonda. Ella vegn utilisada cura che Vus tutgais in buttun da localisaziun e, en l’app installada sin il visur da partenza, per proponer Vossa posiziun sco partenza cura che l’app vegn averta. Sche Vus avais gia dà il permiss, centrescha l’app cun quai er la charta tar la partenza.

Cookies e memorisaziun locala

-

MeridianWay n’utilisescha nagins cookies. Naginas datas na vegnan arcunadas en la memorisaziun locala da Voss navigatur.

+

MeridianWay n’utilisescha nagins cookies. L’app arcunescha dentant fin trais indicaziuns en la memorisaziun locala da Voss navigatur:

+
    +
  • Vossa ultima posiziun, sche Vus avais utilisà la geolocaziun: en l’app installada serva ella sco partenza da reserva, sche la localisaziun na reussescha betg.
    • +
  • Che Vus avais serrà il bandier d’installaziun, per ch’el na cumparia betg pli.
    • +
  • Che Vus avais deactivà las statisticas da visitas, sche quai è il cas (guardai sutvart).
    • +
+

Questas indicaziuns restan sin Voss apparat. La posiziun al banduna mo sch’ella vegn utilisada sco punct da partenza, e fa lura il medem viadi sco mintga punct da partenza. Per stizzar tut, stizzai las datas da questa website en ils parameters da Voss navigatur.

+ +

Statisticas da visitas

+

MeridianWay mesira sias visitas cun Umami, senza cookies e senza arcunar in identificatur sin Voss apparat. Sche Vus na vulais betg che Vossas visitas vegnian dumbradas, deactivai il cumutatur qua sutvart u quel en il panel «Pertutgant» da l’app: da quest navigatur na vegn lura nagut pli tramess ad Umami, senza chargiar danovamain. Il parameter vala per quest navigatur sin quest apparat. Sin l’iPhone ha l’app installada sin il visur da partenza sia atgna memoria e sto vegnir parametrada separadamain. El na deactivescha betg ils rapports da sbagls tramess a Sentry.

+

Voss dretgs

Tenor la Lescha federala davart la protecziun da datas (nLPD) e tenor il DSGVO per las utilisadras ed ils utilisaders da l’Uniun europeica pudais Vus dumandar da tut temp tge datas che concernan Vus èn vegnidas elavuradas. Las datas transmessas a servetschs da terzas persunas èn suttamessas a lur atgnas disposiziuns davart la protecziun da datas.

@@ -225,9 +301,24 @@ const { lang } = Astro.props; color: #d8dbc8; margin-bottom: 0.75rem; } + .privacy-pane ul { + margin: 0 0 0.75rem 1.25rem; + padding: 0; + } + .privacy-pane li { + line-height: 1.6; + color: #d8dbc8; + margin-bottom: 0.35rem; + } .privacy-pane a { color: #f0f2a0; } + .privacy-optout { + margin: 1rem 0 1.25rem; + padding: 14px 16px; + border: 1px solid rgba(240,242,160,0.2); + border-radius: 8px; + } table { width: 100%; border-collapse: collapse; @@ -246,6 +337,13 @@ const { lang } = Astro.props; border-bottom: 1px solid rgba(240,242,160,0.07); vertical-align: top; color: #d8dbc8; + /* German compounds otherwise push the table past a phone's width. */ + hyphens: auto; + overflow-wrap: anywhere; + } + td:first-child { overflow-wrap: normal; } + .svc { + color: rgba(216,219,200,0.6); + font-size: 0.75rem; } - td:first-child { white-space: nowrap; } diff --git a/src/components/app/AboutDrawer.astro b/src/components/app/AboutDrawer.astro index a77c5c8..d80d80a 100644 --- a/src/components/app/AboutDrawer.astro +++ b/src/components/app/AboutDrawer.astro @@ -1,6 +1,7 @@ --- import { translations, LANGS, langPath, type Lang } from '../../lib/i18n'; import AboutContent from '../AboutContent.astro'; +import AnalyticsOptOut from '../AnalyticsOptOut.astro'; import githubIcon from '../../icons/github.svg?raw'; interface Props { @@ -31,6 +32,9 @@ const t = translations[lang]; GitHub
+
+ +
{t.aria_about} - diff --git a/src/layouts/PrivacyLayout.astro b/src/layouts/PrivacyLayout.astro index 7582c35..0892f12 100644 --- a/src/layouts/PrivacyLayout.astro +++ b/src/layouts/PrivacyLayout.astro @@ -131,6 +131,8 @@ const backLabels: Record = { diff --git a/src/lib/analyticsOptOut.js b/src/lib/analyticsOptOut.js new file mode 100644 index 0000000..026751a --- /dev/null +++ b/src/lib/analyticsOptOut.js @@ -0,0 +1,35 @@ +// Umami's tracker reads this key before every send: any non-empty value stops +// page views and custom events alike, with no reload. Removing it resumes. +const KEY = 'umami.disabled'; + +export function isOptedOut() { + try { + return !!localStorage.getItem(KEY); + } catch { + return false; + } +} + +// False when storage refuses the write (private browsing, full quota). +export function setOptedOut(out) { + try { + if (out) localStorage.setItem(KEY, '1'); + else localStorage.removeItem(KEY); + return true; + } catch { + return false; + } +} + +// Checked means "counted". Every switch is redrawn from storage after a change, +// so one that couldn't be saved snaps back instead of lying. +// No analytics event here: measuring who opts out would break the promise. +export function initAnalyticsOptOut() { + const switches = document.querySelectorAll('.optout-switch'); + const sync = () => switches.forEach((s) => { s.checked = !isOptedOut(); }); + sync(); + switches.forEach((s) => s.addEventListener('change', () => { + setOptedOut(!s.checked); + sync(); + })); +} diff --git a/src/lib/i18n.ts b/src/lib/i18n.ts index 0536050..5fcbf7e 100644 --- a/src/lib/i18n.ts +++ b/src/lib/i18n.ts @@ -113,6 +113,8 @@ export const translations = { error_geo_denied: 'Localisation refusée par le navigateur.', error_geo_timeout: 'Localisation impossible, réessayez.', about_privacy: 'Confidentialité', + optout_label: 'Statistiques de visite', + optout_hint: 'Sans cookie. Désactivez pour que cet appareil ne soit plus compté.', share_btn_title: 'Partager cet itinéraire', toast_link_copied: 'Lien copié dans le presse-papier.', install_banner_android: '📲 Installez MeridianWay sur votre écran d\'accueil pour un accès plus rapide.', @@ -218,6 +220,8 @@ export const translations = { error_geo_denied: 'Standortzugriff wurde verweigert.', error_geo_timeout: 'Standort nicht verfügbar, erneut versuchen.', about_privacy: 'Datenschutz', + optout_label: 'Besuchsstatistik', + optout_hint: 'Ohne Cookie. Deaktivieren Sie diese Option, wenn Sie nicht möchten, dass dieses Gerät gezählt wird.', share_btn_title: 'Route teilen', toast_link_copied: 'Link in die Zwischenablage kopiert.', install_banner_android: '📲 MeridianWay auf dem Startbildschirm installieren für schnelleren Zugriff.', @@ -323,6 +327,8 @@ export const translations = { error_geo_denied: 'Localizzazione rifiutata dal browser.', error_geo_timeout: 'Localizzazione impossibile, riprova.', about_privacy: 'Privacy', + optout_label: 'Statistiche di visita', + optout_hint: 'Senza cookie. Disattiva perché questo dispositivo non venga più contato.', share_btn_title: 'Condividi il percorso', toast_link_copied: 'Link copiato negli appunti.', install_banner_android: '📲 Installa MeridianWay sulla schermata Home per un accesso più rapido.', @@ -428,6 +434,8 @@ export const translations = { error_geo_denied: 'Location access denied by browser.', error_geo_timeout: 'Location unavailable, please try again.', about_privacy: 'Privacy', + optout_label: 'Visit statistics', + optout_hint: 'No cookies. Turn off to stop counting this device.', share_btn_title: 'Share this route', toast_link_copied: 'Link copied to clipboard.', install_banner_android: '📲 Install MeridianWay on your home screen for faster access.', @@ -533,6 +541,8 @@ export const translations = { error_geo_denied: 'Refusà il lieu dal navigatur.', error_geo_timeout: 'Il lieu n’è betg stà pussaivel d’eruir. Empruvar per plaschair anc ina giada.', about_privacy: 'caracter confidenzial', + optout_label: 'Statisticas da visitas', + optout_hint: 'Senza cookie. Deactivai questa opziun, sche Vus na vulessas betg che quest apparat vegnia dumbrà.', share_btn_title: 'Parta questa ruta', toast_link_copied: 'Copià la colliaziun en l’archiv provisoric.', install_banner_android: '📲 L’installaziun da MeridianWay sin tes visur da partenza per in access pli svelt.', diff --git a/src/styles/main.css b/src/styles/main.css index c9e4ca9..92462e1 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -1259,6 +1259,11 @@ p.opensource-badge { .github-link { color: #f0f2a0; border-color: rgba(240,242,160,0.3); background: rgba(240,242,160,0.05); } .github-link:hover { border-color: rgba(240,242,160,0.6); background: rgba(240,242,160,0.1); } +#about-optout { + padding: 12px 20px; + border-top: 1px solid rgba(240,242,160,0.1); +} + .footer-links { display: flex; justify-content: center; diff --git a/tests/analyticsOptOut.test.js b/tests/analyticsOptOut.test.js new file mode 100644 index 0000000..97e58d9 --- /dev/null +++ b/tests/analyticsOptOut.test.js @@ -0,0 +1,49 @@ +import { describe, it, expect, beforeEach } from 'vitest'; +import { isOptedOut, setOptedOut } from '../src/lib/analyticsOptOut.js'; + +// No DOM in the "node" environment: an in-memory stand-in for localStorage. +function memoryStorage() { + const store = new Map(); + return { + getItem: (k) => (store.has(k) ? store.get(k) : null), + setItem: (k, v) => store.set(k, String(v)), + removeItem: (k) => store.delete(k), + }; +} + +function throwingStorage() { + const fail = () => { throw new Error('SecurityError'); }; + return { getItem: fail, setItem: fail, removeItem: fail }; +} + +beforeEach(() => { globalThis.localStorage = memoryStorage(); }); + +describe('analytics opt-out', () => { + it('counts the visitor by default', () => { + expect(isOptedOut()).toBe(false); + }); + + it('writes the key the Umami tracker checks before each send', () => { + setOptedOut(true); + expect(globalThis.localStorage.getItem('umami.disabled')).toBe('1'); + expect(isOptedOut()).toBe(true); + }); + + it('removes the key to opt back in, since any stored value disables', () => { + setOptedOut(true); + setOptedOut(false); + expect(globalThis.localStorage.getItem('umami.disabled')).toBeNull(); + expect(isOptedOut()).toBe(false); + }); + + it('treats a value set by hand as opted out', () => { + globalThis.localStorage.setItem('umami.disabled', '0'); + expect(isOptedOut()).toBe(true); + }); + + it('reports a refused write instead of throwing', () => { + globalThis.localStorage = throwingStorage(); + expect(setOptedOut(true)).toBe(false); + expect(isOptedOut()).toBe(false); + }); +}); diff --git a/tests/e2e/analytics-optout.spec.js b/tests/e2e/analytics-optout.spec.js new file mode 100644 index 0000000..50954f4 --- /dev/null +++ b/tests/e2e/analytics-optout.spec.js @@ -0,0 +1,81 @@ +import { test, expect } from '@playwright/test'; + +// The visit statistics switch, in the About panel and on the privacy page. +// It writes the key Umami's tracker reads before every send. What this can't +// show is the real tracker going quiet: it only sends from meridian-way.ch. + +const KEY = 'umami.disabled'; +const stored = page => page.evaluate(k => localStorage.getItem(k), KEY); + +// Umami never loads here, so stand one up before the app's module runs. +async function collectEvents(page) { + await page.addInitScript(() => { + window.__events = []; + window.umami = { track: (...args) => window.__events.push(args) }; + }); +} + +const eventCount = page => page.evaluate(() => window.__events.length); + +async function openAbout(page) { + await page.goto('/'); + // initAutocomplete() puts role=combobox on the field: the app script runs. + await page.waitForSelector('#inp-end[role="combobox"]'); + await page.click('#about-btn'); + await expect(page.locator('#about-drawer')).toHaveClass(/open/); + return page.locator('#about-drawer .optout-switch'); +} + +test('the About panel switch opts out and back in, and the state survives a reload', async ({ page }) => { + let sw = await openAbout(page); + await expect(sw).toBeChecked(); + expect(await stored(page)).toBeNull(); + + await sw.click(); + await expect(sw).not.toBeChecked(); + expect(await stored(page)).toBe('1'); + + sw = await openAbout(page); + await expect(sw).not.toBeChecked(); + + await sw.click(); + await expect(sw).toBeChecked(); + expect(await stored(page)).toBeNull(); + + sw = await openAbout(page); + await expect(sw).toBeChecked(); +}); + +test('the privacy page switch shares its state with the app', async ({ page }) => { + await page.goto('/en/privacy'); + const sw = page.locator('.privacy-optout .optout-switch'); + await expect(sw).toBeChecked(); + + await sw.click(); + await expect(sw).not.toBeChecked(); + expect(await stored(page)).toBe('1'); + + await expect(await openAbout(page)).not.toBeChecked(); +}); + +test('toggling sends no analytics event', async ({ page }) => { + await collectEvents(page); + const sw = await openAbout(page); + const before = await eventCount(page); + + await sw.click(); + await sw.click(); + + expect(await eventCount(page)).toBe(before); +}); + +test('a refused write leaves the switch on', async ({ page }) => { + await page.addInitScript(() => { + Storage.prototype.setItem = () => { throw new DOMException('Quota', 'QuotaExceededError'); }; + }); + const sw = await openAbout(page); + + await sw.click(); + + await expect(sw).toBeChecked(); +}); From 37fe751e8a56073ad2320e27e19d5fc18e8659bb Mon Sep 17 00:00:00 2001 From: paul lahana Date: Fri, 25 Sep 2026 08:46:12 +0200 Subject: [PATCH 2/2] feat: add privacy scrubbing for analytics and errors Export READY error codes set for reuse across modules. Add Sentry event and breadcrumb scrubbing to remove sensitive user data before sending to Sentry. Configure Umami analytics with beforeSend hook to round route coordinates and strip query labels from tracked events, protecting user privacy. Add e2e tests verifying the Umami hook is properly wired on all pages and correctly scrubs sensitive data from shared links. --- sentry.client.config.js | 5 +- src/components/PrivacyContent.astro | 30 +++++------ src/components/app/AppHead.astro | 2 +- src/layouts/AboutLayout.astro | 2 +- src/layouts/PrivacyLayout.astro | 2 +- src/lib/analytics.js | 33 ++++++++++++ src/lib/errors.js | 2 +- src/lib/sentryScrub.js | 53 +++++++++++++++++++ tests/analytics.test.js | 50 ++++++++++++++++++ tests/e2e/umami-before-send.spec.js | 33 ++++++++++++ tests/sentryScrub.test.js | 80 +++++++++++++++++++++++++++++ 11 files changed, 272 insertions(+), 20 deletions(-) create mode 100644 src/lib/sentryScrub.js create mode 100644 tests/analytics.test.js create mode 100644 tests/e2e/umami-before-send.spec.js create mode 100644 tests/sentryScrub.test.js diff --git a/sentry.client.config.js b/sentry.client.config.js index 0b7b65c..a8c2925 100644 --- a/sentry.client.config.js +++ b/sentry.client.config.js @@ -1,8 +1,11 @@ import * as Sentry from "@sentry/astro"; +import { scrubEvent, scrubBreadcrumb } from "./src/lib/sentryScrub.js"; Sentry.init({ dsn: "https://bf8afd06f49d13d2e136c99d78e88626@o4511568346021888.ingest.de.sentry.io/4511568347856976", // To disable sending user data, uncomment the line below. For more info visit: // https://docs.sentry.io/platforms/javascript/guides/astro/configuration/options/#dataCollection dataCollection: { userInfo: false }, -}); \ No newline at end of file + beforeSend: scrubEvent, + beforeBreadcrumb: scrubBreadcrumb, +}); diff --git a/src/components/PrivacyContent.astro b/src/components/PrivacyContent.astro index 7e0ba70..517e547 100644 --- a/src/components/PrivacyContent.astro +++ b/src/components/PrivacyContent.astro @@ -33,12 +33,12 @@ const { lang } = Astro.props; Relais MeridianWay
Cloudflare WorkersCoordonnées de départ et d'arrivée ; zone de l'itinéraireRelais vers OpenRouteService et Overpass, hauteurs des bâtiments suisses ; réponses gardées en cache 7 à 30 jours, sans lien avec qui les a demandées OpenRouteService
HeiGIT, DE, via le relaisCoordonnées de départ et d'arrivéeCalcul des itinéraires Overpass API
serveurs OSM, via le relaisZone géographique de l'itinéraireDonnées bâtiments et arbres - UmamiAdresse de la page, site de provenance, localisation approximative (pays, région) déduite de l'adresse IP, qui n'est pas conservée ; navigateur, système, taille d'écran, langue ; actions dans l'app (recherche lancée, partage…). Sans cookieStatistiques d'utilisation agrégées, désactivables (voir plus bas) - Sentry
serveurs EU, AllemagneErreurs techniques, adresse de la page, type de navigateur ; sans données d'identitéDétection et correction de bugs + UmamiAdresse de la page, site de provenance, localisation approximative (pays, région) déduite de l'adresse IP, qui n'est pas conservée ; navigateur, système, taille d'écran, langue ; actions dans l'app (recherche lancée, partage…). Sans cookieStatistiques d'utilisation agrégées, dont les zones où des itinéraires sont recherchés ; désactivables (voir plus bas) + Sentry
serveurs EU, AllemagneErreurs techniques, adresse de la page sans ses paramètres, type de navigateur ; sans données d'identitéDétection et correction de bugs -

Après une recherche, l'adresse de la page contient les points de départ et d'arrivée, ainsi que le texte saisi pour les désigner : c'est ce qui rend un itinéraire partageable. Umami et Sentry reçoivent donc ces informations avec l'adresse de la page.

+

Après une recherche, l'adresse de la page contient les points de départ et d'arrivée, ainsi que le texte saisi pour les désigner : c'est ce qui rend un itinéraire partageable. Umami la reçoit avec des points arrondis à 100 m environ et sans le texte saisi : de quoi voir dans quelles zones des itinéraires sont recherchés, pas de retrouver une adresse précise. Sentry la reçoit sans aucune de ces informations.

La géolocalisation est optionnelle : l'app n'y a accès qu'avec votre autorisation, demandée par le navigateur. Elle sert quand vous appuyez sur un bouton de localisation et, dans l'app installée sur l'écran d'accueil, à proposer votre position comme départ à l'ouverture. Si vous avez déjà donné l'autorisation, l'app s'en sert aussi pour centrer la carte au démarrage.

@@ -87,12 +87,12 @@ const { lang } = Astro.props; MeridianWay-Relais
Cloudflare WorkersStart- und Zielkoordinaten; Bereich der RouteWeiterleitung an OpenRouteService und Overpass, Schweizer Gebäudehöhen; Antworten werden 7 bis 30 Tage zwischengespeichert, ohne Bezug zur anfragenden Person OpenRouteService
HeiGIT, DE, über das RelaisStart- und ZielkoordinatenRoutenberechnung Overpass API
OSM-Server, über das RelaisGeografischer Bereich der RouteGebäude- und Baumdaten - UmamiSeitenadresse, verweisende Website, ungefährer Standort (Land, Region) aus der IP-Adresse, die nicht gespeichert wird; Browser, System, Bildschirmgrösse, Sprache; Aktionen in der App (Suche gestartet, Teilen …). Ohne CookiesAggregierte Nutzungsstatistiken, abschaltbar (siehe unten) - Sentry
EU-Server, DeutschlandTechnische Fehler, Seitenadresse, Browsertyp; ohne IdentitätsdatenFehlererkennung und -behebung + UmamiSeitenadresse, verweisende Website, ungefährer Standort (Land, Region) aus der IP-Adresse, die nicht gespeichert wird; Browser, System, Bildschirmgrösse, Sprache; Aktionen in der App (Suche gestartet, Teilen …). Ohne CookiesAggregierte Nutzungsstatistiken, auch zu den Gebieten, in denen Routen gesucht werden; abschaltbar (siehe unten) + Sentry
EU-Server, DeutschlandTechnische Fehler, Seitenadresse ohne Parameter, Browsertyp; ohne IdentitätsdatenFehlererkennung und -behebung -

Nach einer Suche enthält die Seitenadresse Start- und Zielpunkt sowie den dafür eingegebenen Text: So lässt sich eine Route teilen. Umami und Sentry erhalten diese Angaben daher mit der Seitenadresse.

+

Nach einer Suche enthält die Seitenadresse Start- und Zielpunkt sowie den dafür eingegebenen Text: So lässt sich eine Route teilen. Umami erhält sie mit auf rund 100 m gerundeten Punkten und ohne den eingegebenen Text: genug, um zu sehen, in welchen Gebieten Routen gesucht werden, aber nicht, um eine genaue Adresse zu finden. Sentry erhält sie ohne jede dieser Angaben.

Die Standortbestimmung ist optional: Die App erhält nur mit Ihrer Erlaubnis Zugriff darauf, die Ihr Browser abfragt. Sie wird genutzt, wenn Sie auf eine Standortschaltfläche tippen, und in der auf dem Startbildschirm installierten App, um beim Öffnen Ihren Standort als Start vorzuschlagen. Haben Sie die Erlaubnis bereits erteilt, zentriert die App damit auch die Karte beim Start.

@@ -141,12 +141,12 @@ const { lang } = Astro.props; Relay MeridianWay
Cloudflare WorkersCoordinate di partenza e arrivo; area dell'itinerarioInoltro a OpenRouteService e Overpass, altezze degli edifici svizzeri; risposte conservate in cache da 7 a 30 giorni, senza legame con chi le ha richieste OpenRouteService
HeiGIT, DE, tramite il relayCoordinate di partenza e arrivoCalcolo degli itinerari Overpass API
server OSM, tramite il relayArea geografica dell'itinerarioDati edifici e alberi - UmamiIndirizzo della pagina, sito di provenienza, posizione approssimativa (paese, regione) ricavata dall'indirizzo IP, che non viene conservato; browser, sistema, dimensioni dello schermo, lingua; azioni nell'app (ricerca avviata, condivisione…). Senza cookieStatistiche d'uso aggregate, disattivabili (vedi sotto) - Sentry
server EU, GermaniaErrori tecnici, indirizzo della pagina, tipo di browser; senza dati di identitàRilevamento e correzione dei bug + UmamiIndirizzo della pagina, sito di provenienza, posizione approssimativa (paese, regione) ricavata dall'indirizzo IP, che non viene conservato; browser, sistema, dimensioni dello schermo, lingua; azioni nell'app (ricerca avviata, condivisione…). Senza cookieStatistiche d'uso aggregate, comprese le zone in cui si cercano itinerari; disattivabili (vedi sotto) + Sentry
server EU, GermaniaErrori tecnici, indirizzo della pagina senza parametri, tipo di browser; senza dati di identitàRilevamento e correzione dei bug -

Dopo una ricerca, l'indirizzo della pagina contiene i punti di partenza e di arrivo e il testo inserito per indicarli: è ciò che rende condivisibile un itinerario. Umami e Sentry ricevono quindi queste informazioni insieme all'indirizzo della pagina.

+

Dopo una ricerca, l'indirizzo della pagina contiene i punti di partenza e di arrivo e il testo inserito per indicarli: è ciò che rende condivisibile un itinerario. Umami lo riceve con i punti arrotondati a circa 100 m e senza il testo inserito: abbastanza per vedere in quali zone si cercano itinerari, non per risalire a un indirizzo preciso. Sentry lo riceve senza nessuna di queste informazioni.

La geolocalizzazione è opzionale: l'app vi accede solo con il tuo permesso, richiesto dal browser. Viene usata quando tocchi un pulsante di localizzazione e, nell'app installata sulla schermata Home, per proporre la tua posizione come partenza all'apertura. Se hai già dato il permesso, l'app la usa anche per centrare la mappa all'avvio.

@@ -195,12 +195,12 @@ const { lang } = Astro.props; MeridianWay relays
Cloudflare WorkersStart and end coordinates; area of the routeRelay to OpenRouteService and Overpass, Swiss building heights; responses cached for 7 to 30 days, with no link to who requested them OpenRouteService
HeiGIT, DE, via the relayStart and end coordinatesRoute calculation Overpass API
OSM servers, via the relayGeographic area of the routeBuilding and tree data - UmamiPage address, referring site, approximate location (country, region) derived from the IP address, which is not stored; browser, system, screen size, language; actions in the app (search started, share…). No cookiesAggregated usage statistics, which you can turn off (see below) - Sentry
EU servers, GermanyTechnical errors, page address, browser type; no identity dataBug detection and fixing + UmamiPage address, referring site, approximate location (country, region) derived from the IP address, which is not stored; browser, system, screen size, language; actions in the app (search started, share…). No cookiesAggregated usage statistics, including the areas where routes are searched; you can turn them off (see below) + Sentry
EU servers, GermanyTechnical errors, page address without its parameters, browser type; no identity dataBug detection and fixing -

After a search, the page address contains the start and end points and the text typed to name them: that is what makes a route shareable. Umami and Sentry therefore receive this information with the page address.

+

After a search, the page address contains the start and end points and the text typed to name them: that is what makes a route shareable. Umami receives it with the points rounded to about 100 m and without the typed text: enough to see the areas where routes are searched, not to find a precise address. Sentry receives it without any of this information.

Geolocation is optional: the app only gets access with your permission, which your browser asks for. It is used when you tap a location button and, in the app installed on your home screen, to suggest your position as the start when it opens. If you have already granted permission, the app also uses it to centre the map at start-up.

@@ -249,12 +249,12 @@ const { lang } = Astro.props; Relais MeridianWay
Cloudflare WorkersCoordinatas da partenza e d’arriv; zona da la rutaTransmissiun a OpenRouteService ed Overpass, autezzas dals edifizis svizzers; respostas arcunadas 7 fin 30 dis en il cache, senza colliaziun cun la persuna che las ha dumandadas OpenRouteService
HeiGIT, DE, tras il relaisCoordinatas da partenza e d’arrivCalculaziun da la ruta Overpass API
servers OSM, tras il relaisZona geografica da la rutaDatas d’edifizis e da plantas - UmamiAdressa da la pagina, website da derivanza, lieu approximativ (pajais, regiun) deducì da l’adressa IP, che na vegn betg arcunada; navigatur, sistem, grondezza dal visur, lingua; acziuns en l’app (tschertga cumenzada, parter…). Senza cookiesStatisticas d’utilisaziun agregadas, che Vus pudais deactivar (guardai sutvart) - Sentry
servers UE, GermaniaSbagls tecnics, adressa da la pagina, tip dal navigatur; senza datas d’identitadChattar e reparar sbagls + UmamiAdressa da la pagina, website da derivanza, lieu approximativ (pajais, regiun) deducì da l’adressa IP, che na vegn betg arcunada; navigatur, sistem, grondezza dal visur, lingua; acziuns en l’app (tschertga cumenzada, parter…). Senza cookiesStatisticas d’utilisaziun agregadas, er davart las zonas nua che rutas vegnan tschertgadas; Vus las pudais deactivar (guardai sutvart) + Sentry
servers UE, GermaniaSbagls tecnics, adressa da la pagina senza parameters, tip dal navigatur; senza datas d’identitadChattar e reparar sbagls -

Suenter ina tschertga cuntegna l’adressa da la pagina il punct da partenza e quel d’arriv sco er il text endatà per als numnar: uschia sa lascha ina ruta parter. Umami e Sentry survegnan perquai questas indicaziuns cun l’adressa da la pagina.

+

Suenter ina tschertga cuntegna l’adressa da la pagina il punct da partenza e quel d’arriv sco er il text endatà per als numnar: uschia sa lascha ina ruta parter. Umami la survegn cun ils puncts arrundads a var 100 m e senza il text endatà: avunda per vesair en tge zonas che rutas vegnan tschertgadas, ma betg per chattar ina adressa precisa. Sentry la survegn senza naginas da questas indicaziuns.

La geolocaziun è opziunala: l’app ha mo access cun Voss permiss, che Voss navigatur dumonda. Ella vegn utilisada cura che Vus tutgais in buttun da localisaziun e, en l’app installada sin il visur da partenza, per proponer Vossa posiziun sco partenza cura che l’app vegn averta. Sche Vus avais gia dà il permiss, centrescha l’app cun quai er la charta tar la partenza.

diff --git a/src/components/app/AppHead.astro b/src/components/app/AppHead.astro index 9cc2a70..6a6058e 100644 --- a/src/components/app/AppHead.astro +++ b/src/components/app/AppHead.astro @@ -41,4 +41,4 @@ const t = translations[lang]; "offers": { "@type": "Offer", "price": "0", "priceCurrency": "CHF" }, "author": { "@type": "Person", "url": "https://github.com/paultursuru" } })} /> - + diff --git a/src/layouts/AboutLayout.astro b/src/layouts/AboutLayout.astro index 56ebc21..e80e485 100644 --- a/src/layouts/AboutLayout.astro +++ b/src/layouts/AboutLayout.astro @@ -33,7 +33,7 @@ const pageUrl = (l: Lang) => langUrl(l, 'about/'); - + diff --git a/src/layouts/PrivacyLayout.astro b/src/layouts/PrivacyLayout.astro index 0892f12..c9ad74e 100644 --- a/src/layouts/PrivacyLayout.astro +++ b/src/layouts/PrivacyLayout.astro @@ -43,7 +43,7 @@ const backLabels: Record = { {LANGS.map(l => )} - + diff --git a/src/lib/analytics.js b/src/lib/analytics.js index abeb721..de4ed90 100644 --- a/src/lib/analytics.js +++ b/src/lib/analytics.js @@ -35,6 +35,39 @@ const RETRY_MS = 200; const MAX_WAIT_MS = 5000; +// Umami keeps where routes are searched, not who searched them: route points +// rounded to ~100 m (3 decimals), and the typed labels, which can be a home +// address, dropped. Applied to the page URL and the referrer of every send. +const DROPPED = ['fromq', 'toq']; +const POINTS = ['from', 'to']; +const LAT_LNG = /^-?\d+(\.\d+)?,-?\d+(\.\d+)?$/; + +export function coarsenUrl(url) { + if (typeof url !== 'string') return url; + const q = url.indexOf('?'); + if (q < 0) return url; + const h = url.indexOf('#', q); + const hash = h < 0 ? '' : url.slice(h); + const params = new URLSearchParams(url.slice(q + 1, h < 0 ? undefined : h)); + if (![...DROPPED, ...POINTS].some((k) => params.has(k))) return url; + for (const k of DROPPED) params.delete(k); + for (const k of POINTS) { + const v = params.get(k); + if (v && LAT_LNG.test(v)) params.set(k, v.split(',').map((n) => Number(n).toFixed(3)).join(',')); + } + const query = params.toString(); + return url.slice(0, q) + (query ? `?${query}` : '') + hash; +} + +export function umamiBeforeSend(type, payload) { + if (!payload) return payload; + return { ...payload, url: coarsenUrl(payload.url), referrer: coarsenUrl(payload.referrer) }; +} + +// Named by data-before-send on the Umami tags; read at each send. Every page +// sends its first payload through trackPageview(), after this has run. +if (typeof window !== 'undefined') window.umamiBeforeSend = umamiBeforeSend; + // Umami's global is absent until its script loads, and for good behind a // blocker: every custom event goes through here. export function track(...args) { diff --git a/src/lib/errors.js b/src/lib/errors.js index 69b7a93..80f1533 100644 --- a/src/lib/errors.js +++ b/src/lib/errors.js @@ -9,7 +9,7 @@ const TECHNICAL = { }; // Codes whose message is already the sentence: shown as-is. -const READY = new Set(['ADDRESS_NOT_FOUND', 'POSITION_UNKNOWN', 'NO_ROUTE']); +export const READY = new Set(['ADDRESS_NOT_FOUND', 'POSITION_UNKNOWN', 'NO_ROUTE']); // The toast for a failed search. The technical detail stays on the error for // the console and Sentry. diff --git a/src/lib/sentryScrub.js b/src/lib/sentryScrub.js new file mode 100644 index 0000000..3e83f2b --- /dev/null +++ b/src/lib/sentryScrub.js @@ -0,0 +1,53 @@ +import { READY } from './errors.js'; + +// Keeps the route and the typed addresses out of error reports. Search URLs +// carry them as from/to and fromq/toq, geocoder requests as q=. + +export function stripQuery(url) { + return typeof url === 'string' ? url.replace(/[?#].*$/, '') : url; +} + +// A READY error's message is the toast, which can quote the user's input +// (ADDRESS_NOT_FOUND). Its code says the same without it. +function redacted(value) { + return value instanceof Error && READY.has(value.code) ? `${value.name}: ${value.code}` : null; +} + +export function scrubEvent(event, hint) { + if (event.request) { + event.request.url = stripQuery(event.request.url); + const headers = event.request.headers; + if (headers?.Referer) headers.Referer = stripQuery(headers.Referer); + } + const err = hint?.originalException; + if (redacted(err)) { + for (const ex of event.exception?.values ?? []) { + if (ex.value === err.message) ex.value = err.code; + } + } + return event; +} + +export function scrubBreadcrumb(crumb, hint) { + const { category, data } = crumb; + if ((category === 'fetch' || category === 'xhr') && data) { + data.url = stripQuery(data.url); + } + if (category === 'navigation' && data) { + data.from = stripQuery(data.from); + data.to = stripQuery(data.to); + } + if (category === 'console') { + const args = hint?.input ?? []; + if (args.some(redacted)) { + const safe = args.map((a) => redacted(a) ?? a); + crumb.message = safe.map(String).join(' '); + crumb.data = { ...data, arguments: safe }; + } + } + // Autocomplete suggestions carry the place name as their title. + if (category?.startsWith('ui.') && crumb.message) { + crumb.message = crumb.message.replace(/\[title=".*?"\]/g, ''); + } + return crumb; +} diff --git a/tests/analytics.test.js b/tests/analytics.test.js new file mode 100644 index 0000000..b25f8c3 --- /dev/null +++ b/tests/analytics.test.js @@ -0,0 +1,50 @@ +import { describe, it, expect } from 'vitest'; +import { coarsenUrl, umamiBeforeSend } from '../src/lib/analytics.js'; + +const SEARCH_URL = 'https://meridian-way.ch/?from=46.51860%2C6.56800&fromq=Avenue+Probe+12%2C+Ecublens&to=46.53730%2C6.58530&toq=Renens&dt=2026-09-25T08%3A27'; + +describe('coarsenUrl', () => { + it('rounds the route points to ~100 m and drops the typed labels', () => { + expect(coarsenUrl(SEARCH_URL)).toBe('https://meridian-way.ch/?from=46.519%2C6.568&to=46.537%2C6.585&dt=2026-09-25T08%3A27'); + }); + + it('works on the relative referrer Umami sends for same-origin pages', () => { + expect(coarsenUrl('/de/?from=46.5186,6.568&fromq=x&to=46.5373,6.5853')).toBe('/de/?from=46.519%2C6.568&to=46.537%2C6.585'); + }); + + it('keeps utm tags and the onboarding flag', () => { + expect(coarsenUrl('/?from=1.23456,2.34567&to=3,4&onboarding=1&utm_source=reddit')) + .toBe('/?from=1.235%2C2.346&to=3.000%2C4.000&onboarding=1&utm_source=reddit'); + }); + + it('leaves the query alone when it holds no route', () => { + const url = 'https://meridian-way.ch/it/?utm_source=chatgpt.com'; + expect(coarsenUrl(url)).toBe(url); + }); + + it('drops a query left empty and keeps the hash', () => { + expect(coarsenUrl('/?fromq=Home#map')).toBe('/#map'); + }); + + it('does not touch a from that is not a point', () => { + expect(coarsenUrl('/?from=newsletter')).toBe('/?from=newsletter'); + }); + + it('passes through a missing value', () => { + expect(coarsenUrl(undefined)).toBeUndefined(); + expect(coarsenUrl('')).toBe(''); + }); +}); + +describe('umamiBeforeSend', () => { + it('coarsens the url and the referrer and keeps the rest of the payload', () => { + const payload = { website: 'w', url: SEARCH_URL, referrer: '/?fromq=Home&from=1,2', name: 'scrub', data: { a: 1 } }; + expect(umamiBeforeSend('event', payload)).toEqual({ + website: 'w', + url: 'https://meridian-way.ch/?from=46.519%2C6.568&to=46.537%2C6.585&dt=2026-09-25T08%3A27', + referrer: '/?from=1.000%2C2.000', + name: 'scrub', + data: { a: 1 }, + }); + }); +}); diff --git a/tests/e2e/umami-before-send.spec.js b/tests/e2e/umami-before-send.spec.js new file mode 100644 index 0000000..432cef3 --- /dev/null +++ b/tests/e2e/umami-before-send.spec.js @@ -0,0 +1,33 @@ +import { test, expect } from '@playwright/test'; + +// Umami's tags name umamiBeforeSend, which rounds the route points and drops +// the typed labels (tests/analytics.test.js). This pins the wiring on each page +// that loads the tracker. The tracker itself never sends from localhost. + +const SHARED = '/?from=46.51860,6.56800&fromq=Chez+moi+12&to=46.53730,6.58530&toq=Renens&dt=2026-08-13T14:00'; + +async function stubUpstreams(page) { + await page.route(/nominatim|photon|open-meteo|workers\.dev|stadiamaps/, route => route.abort()); +} + +for (const path of ['/', '/en/about', '/en/privacy']) { + test(`${path} names the hook on the Umami tag and defines it`, async ({ page }) => { + await stubUpstreams(page); + await page.goto(path); + await expect(page.locator('script[src*="umami"]')).toHaveAttribute('data-before-send', 'umamiBeforeSend'); + await expect.poll(() => page.evaluate(() => typeof window.umamiBeforeSend)).toBe('function'); + }); +} + +test('a shared link reaches Umami rounded and without its labels', async ({ page }) => { + await stubUpstreams(page); + await page.goto(SHARED); + await expect.poll(() => page.evaluate(() => typeof window.umamiBeforeSend)).toBe('function'); + + const sent = await page.evaluate(() => window.umamiBeforeSend('event', { url: location.href, referrer: '' }).url); + + expect(sent).not.toContain('fromq'); + expect(sent).not.toContain('toq'); + expect(new URL(sent).searchParams.get('from')).toBe('46.519,6.568'); + expect(new URL(sent).searchParams.get('to')).toBe('46.537,6.585'); +}); diff --git a/tests/sentryScrub.test.js b/tests/sentryScrub.test.js new file mode 100644 index 0000000..3d40014 --- /dev/null +++ b/tests/sentryScrub.test.js @@ -0,0 +1,80 @@ +import { describe, it, expect } from 'vitest'; +import { stripQuery, scrubEvent, scrubBreadcrumb } from '../src/lib/sentryScrub.js'; + +const SEARCH_URL = 'https://meridian-way.ch/?from=46.51860%2C6.56800&fromq=Avenue+Probe+12&to=46.53730%2C6.58530&toq=Renens&dt=2026-09-25T08%3A27'; + +function addressNotFound() { + const err = new Error('Adresse introuvable : "Avenue Probe 12"'); + err.code = 'ADDRESS_NOT_FOUND'; + return err; +} + +describe('stripQuery', () => { + it('drops the query and the hash', () => { + expect(stripQuery(SEARCH_URL)).toBe('https://meridian-way.ch/'); + expect(stripQuery('/de/?from=1,2#x')).toBe('/de/'); + }); + + it('leaves a missing url alone', () => { + expect(stripQuery(undefined)).toBeUndefined(); + }); +}); + +describe('scrubEvent', () => { + it('strips the page URL and the referrer', () => { + const event = scrubEvent({ request: { url: SEARCH_URL, headers: { Referer: SEARCH_URL, 'User-Agent': 'UA' } } }); + expect(event.request.url).toBe('https://meridian-way.ch/'); + expect(event.request.headers).toEqual({ Referer: 'https://meridian-way.ch/', 'User-Agent': 'UA' }); + }); + + it('reports a user-facing error by its code', () => { + const err = addressNotFound(); + const event = scrubEvent({ exception: { values: [{ type: 'Error', value: err.message }] } }, { originalException: err }); + expect(event.exception.values[0].value).toBe('ADDRESS_NOT_FOUND'); + }); + + it('keeps the message of a technical error', () => { + const err = new Error('ORS 503 after retries'); + err.code = 'ROUTING_UNAVAILABLE'; + const event = scrubEvent({ exception: { values: [{ type: 'Error', value: err.message }] } }, { originalException: err }); + expect(event.exception.values[0].value).toBe('ORS 503 after retries'); + }); +}); + +describe('scrubBreadcrumb', () => { + it('strips geocoder queries from fetch breadcrumbs', () => { + const crumb = scrubBreadcrumb({ + category: 'fetch', + data: { method: 'GET', url: 'https://nominatim.openstreetmap.org/search?q=Avenue%20Probe%2012&format=json', status_code: 200 }, + }); + expect(crumb.data).toEqual({ method: 'GET', url: 'https://nominatim.openstreetmap.org/search', status_code: 200 }); + }); + + it('strips both ends of a navigation', () => { + const crumb = scrubBreadcrumb({ category: 'navigation', data: { from: '/', to: '/?from=1,2&fromq=Avenue+Probe+12' } }); + expect(crumb.data).toEqual({ from: '/', to: '/' }); + }); + + it('replaces a user-facing error logged to the console', () => { + const err = addressNotFound(); + const crumb = scrubBreadcrumb( + { category: 'console', level: 'error', message: `Error: ${err.message}`, data: { arguments: [err], logger: 'console' } }, + { input: [err], level: 'error' }, + ); + expect(crumb.message).toBe('Error: ADDRESS_NOT_FOUND'); + expect(crumb.data).toEqual({ arguments: ['Error: ADDRESS_NOT_FOUND'], logger: 'console' }); + }); + + it('keeps other console messages', () => { + const crumb = scrubBreadcrumb( + { category: 'console', level: 'warn', message: 'Overpass vegetation failed', data: { arguments: ['Overpass vegetation failed'] } }, + { input: ['Overpass vegetation failed'], level: 'warn' }, + ); + expect(crumb.message).toBe('Overpass vegetation failed'); + }); + + it('drops the place name a clicked suggestion carries as its title', () => { + const crumb = scrubBreadcrumb({ category: 'ui.click', message: 'ul#ac-start > li.ac-item[title="Avenue Probe 12, Ecublens"] > span' }); + expect(crumb.message).toBe('ul#ac-start > li.ac-item > span'); + }); +});