From 913f081fb0ced8bb78d0a58a59a53b404b11026e Mon Sep 17 00:00:00 2001 From: gevos Date: Fri, 9 Feb 2024 12:06:48 +0100 Subject: [PATCH 1/4] fix(gemeindegrenzen): change date in legend (#1145) --- src/lang/de.json | 4 ++-- src/lang/en.json | 4 ++-- src/lang/fr.json | 4 ++-- src/lang/it.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lang/de.json b/src/lang/de.json index e4976ef7f..f6ed41b04 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -121,7 +121,7 @@ "ch.sbb.betriebsregionen-desc": "Geographische Aufteilung der Infrastruktur SBB.", "ch.sbb.casa": "CASA", "ch.sbb.ch_gemeinden": "Gemeindegrenzen", - "ch.sbb.ch_gemeinden-desc": "

Blenden Sie die Gemeindegrenzen ein/aus. Die Gemeinden finden Sie über das Suchfeld.

Daten:
Bundesamt für Statistik, swisstopo (01.01.2023)

", + "ch.sbb.ch_gemeinden-desc": "

Blenden Sie die Gemeindegrenzen ein/aus. Die Gemeinden finden Sie über das Suchfeld.

Daten:
Bundesamt für Statistik, swisstopo (01.01.2024)

", "ch.sbb.construction": "Bauprojekte Bahninfrastruktur", "ch.sbb.construction-angebotsschritt-2035": "Angebotsschritt 2035", "ch.sbb.construction.ausbau.bahnhof": "Bahnhof", @@ -219,7 +219,7 @@ "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Grüne Grenzlinie", "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Graue Grenzlinie", "ch.sbb.infrastruktur.gemeindegrenzen.group": "Gemeindegrenzen", - "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Gemeindegrenzen

Daten:
Bundesamt für Statistik, swisstopo (01.01.2023)

", + "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Gemeindegrenzen

Daten:
Bundesamt für Statistik, swisstopo (01.01.2024)

", "ch.sbb.infrastruktur.gewaesser.group": "Gewässer", "ch.sbb.infrastruktur.gewaesser.group-desc": "Gewässer", "ch.sbb.infrastruktur.grenzen.group": "Grenzen", diff --git a/src/lang/en.json b/src/lang/en.json index bc802de48..cbc57090f 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -133,7 +133,7 @@ "ch.sbb.betriebsregionen-desc": "Geographical distribution of SBB infrastructure.", "ch.sbb.casa": "CASA", "ch.sbb.ch_gemeinden": "Municipal borders", - "ch.sbb.ch_gemeinden-desc": "

Show/hide the municipal borders. You can find municipalities using the search field.

Data:
Federal Statistical Office, swisstopo (01.01.2023)

", + "ch.sbb.ch_gemeinden-desc": "

Show/hide the municipal borders. You can find municipalities using the search field.

Data:
Federal Statistical Office, swisstopo (01.01.2024)

", "ch.sbb.construction": "Railway infrastructure construction projects", "ch.sbb.construction-angebotsschritt-2035": "Expansion rail network 2035", "ch.sbb.construction.ausbau.bahnhof": "Station", @@ -229,7 +229,7 @@ "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Green border line", "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Grey border line", "ch.sbb.infrastruktur.gemeindegrenzen.group": "Municipal borders", - "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Municipal borders

Data:
Federal Statistical Office, swisstopo (01.01.2023)

", + "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Municipal borders

Data:
Federal Statistical Office, swisstopo (01.01.2024)

", "ch.sbb.infrastruktur.gewaesser.group": "Bodies of water", "ch.sbb.infrastruktur.gewaesser.group-desc": "Bodies of water", "ch.sbb.infrastruktur.grenzen.group": "Borders", diff --git a/src/lang/fr.json b/src/lang/fr.json index a8f66b8b4..f6680757c 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -142,7 +142,7 @@ "ch.sbb.betriebsregionen-desc": "Répartition géographique de l'infrastructure des CFF.", "ch.sbb.casa": "CASA", "ch.sbb.ch_gemeinden": "Limites de commune", - "ch.sbb.ch_gemeinden-desc": "

Affichez/masquez les limites communales. Vous trouvez les communes via le champ de recherche.

Données:
Office fédéral de la statistique, swisstopo (01.01.2023)

", + "ch.sbb.ch_gemeinden-desc": "

Affichez/masquez les limites communales. Vous trouvez les communes via le champ de recherche.

Données:
Office fédéral de la statistique, swisstopo (01.01.2024)

", "ch.sbb.construction": "Projet de construction de l'infrastructure ferroviaire", "ch.sbb.construction-angebotsschritt-2035": "Développement de l’offre 2035", "ch.sbb.construction.ausbau.bahnhof": "Gare", @@ -240,7 +240,7 @@ "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Ligne de démarcation verte", "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Ligne de démarcation grise", "ch.sbb.infrastruktur.gemeindegrenzen.group": "Limites communales", - "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Limites communales

Données:
Office fédéral de la statistique, swisstopo (01.01.2023)

", + "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Limites communales

Données:
Office fédéral de la statistique, swisstopo (01.01.2024)

", "ch.sbb.infrastruktur.gewaesser.group": "Eaux", "ch.sbb.infrastruktur.gewaesser.group-desc": "Eaux", "ch.sbb.infrastruktur.grenzen.group": "Frontières", diff --git a/src/lang/it.json b/src/lang/it.json index 5e427c7b1..f2df4e257 100644 --- a/src/lang/it.json +++ b/src/lang/it.json @@ -142,7 +142,7 @@ "ch.sbb.betriebsregionen-desc": "Distribuzione geografica dell'infrastruttura delle FFS.", "ch.sbb.casa": "CASA", "ch.sbb.ch_gemeinden": "Limiti comunali", - "ch.sbb.ch_gemeinden-desc": "

Visualizzazione dei confini comunali. I Comuni vengono individuati dal campo di ricerca.

Dati:
Ufficio federale di statistica, swisstopo (01.01.2023)

", + "ch.sbb.ch_gemeinden-desc": "

Visualizzazione dei confini comunali. I Comuni vengono individuati dal campo di ricerca.

Dati:
Ufficio federale di statistica, swisstopo (01.01.2024)

", "ch.sbb.construction": "Progetti di costruzione dell'infrastruttura ferroviaria", "ch.sbb.construction-angebotsschritt-2035": "Ampliamento dell’offerta 2035", "ch.sbb.construction.ausbau.bahnhof": "Stazione", @@ -240,7 +240,7 @@ "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Linea di confine in verde", "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Linea di confine in grigio", "ch.sbb.infrastruktur.gemeindegrenzen.group": "Confini communali", - "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Confini comunali

Dati:
Ufficio federale di statistica, swisstopo (01.01.2023)

", + "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "

Confini comunali

Dati:
Ufficio federale di statistica, swisstopo (01.01.2024)

", "ch.sbb.infrastruktur.gewaesser.group": "Acque", "ch.sbb.infrastruktur.gewaesser.group-desc": "Acque", "ch.sbb.infrastruktur.grenzen.group": "Confini", From 649f6fa2eab3bfe676a26f39fba78f45a4e6a369 Mon Sep 17 00:00:00 2001 From: Eva Schiller | geOps Date: Fri, 9 Feb 2024 12:34:06 +0100 Subject: [PATCH 2/4] chore(release): 1.27.6 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7bf7316d..c44ca1fd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.27.6](https://github.com/geops/trafimage-maps/compare/v1.27.5...v1.27.6) (2024-02-09) + +### Bug Fixes + +- **gemeindegrenzen:** change date in legend ([#1145](https://github.com/geops/trafimage-maps/issues/1145)) ([913f081](https://github.com/geops/trafimage-maps/commit/913f081fb0ced8bb78d0a58a59a53b404b11026e)) + ### [1.27.5](https://github.com/geops/trafimage-maps/compare/v1.27.4...v1.27.5) (2024-02-08) ### Bug Fixes diff --git a/package.json b/package.json index 9160bcc0e..a55d083e4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "trafimage-maps", "description": "trafimage-maps web component", - "version": "1.27.5", + "version": "1.27.6", "private": true, "main": "build/bundle.js", "proxy": "http://127.0.0.1:8000", From e3306338db80d7196d565f2cf531680fcb9e93e9 Mon Sep 17 00:00:00 2001 From: gevos Date: Mon, 12 Feb 2024 11:34:03 +0100 Subject: [PATCH 3/4] fix(geltungsbereiche): fix button and layer styling for iframes (#1141) * fix(geltungsbereiche): fix padding for iframes to avoid text/info button conflict * chore(release): 1.27.4-beta.0 * fix(geltungsbereiche): improve layer styling for iframe * chore(release): 1.27.4-beta.1 * chore(release): 1.27.5-beta.0 * chore(release): 1.27.6-beta.0 * chore(release): 1.27.7-beta.0 --- package.json | 2 +- .../GeltungsbereicheTopicMenu/GeltungsbereicheTopicMenu.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a55d083e4..159b8fb02 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "trafimage-maps", "description": "trafimage-maps web component", - "version": "1.27.6", + "version": "1.27.7-beta.0", "private": true, "main": "build/bundle.js", "proxy": "http://127.0.0.1:8000", diff --git a/src/menus/GeltungsbereicheTopicMenu/GeltungsbereicheTopicMenu.js b/src/menus/GeltungsbereicheTopicMenu/GeltungsbereicheTopicMenu.js index 717d76be6..ad326fc6d 100644 --- a/src/menus/GeltungsbereicheTopicMenu/GeltungsbereicheTopicMenu.js +++ b/src/menus/GeltungsbereicheTopicMenu/GeltungsbereicheTopicMenu.js @@ -46,10 +46,6 @@ const useStyles = makeStyles(() => { lineHeight: 1.5, }, - // Display proper padding and border inside the list - "& li:first-child": { - paddingTop: "6px", - }, "& li": { paddingTop: "14px", paddingBottom: "14px", @@ -57,7 +53,6 @@ const useStyles = makeStyles(() => { }, "& li:last-child": { borderBottom: "none", - paddingBottom: "6px", }, }, responsiveLeft: { @@ -66,6 +61,7 @@ const useStyles = makeStyles(() => { }, currentValue: { display: "flex", + paddingRight: 24, }, infoButton: { position: "absolute", From 1cda4a5fe53426a162da1d92a8c445e2622cfb57 Mon Sep 17 00:00:00 2001 From: Eva Schiller | geOps Date: Mon, 12 Feb 2024 11:44:58 +0100 Subject: [PATCH 4/4] chore(release): 1.27.7 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c44ca1fd9..8f4773191 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.27.7](https://github.com/geops/trafimage-maps/compare/v1.27.6...v1.27.7) (2024-02-12) + +### Bug Fixes + +- **geltungsbereiche:** fix button and layer styling for iframes ([#1141](https://github.com/geops/trafimage-maps/issues/1141)) ([e330633](https://github.com/geops/trafimage-maps/commit/e3306338db80d7196d565f2cf531680fcb9e93e9)) + ### [1.27.6](https://github.com/geops/trafimage-maps/compare/v1.27.5...v1.27.6) (2024-02-09) ### Bug Fixes diff --git a/package.json b/package.json index 159b8fb02..3e3a69db8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "trafimage-maps", "description": "trafimage-maps web component", - "version": "1.27.7-beta.0", + "version": "1.27.7", "private": true, "main": "build/bundle.js", "proxy": "http://127.0.0.1:8000",