Skip to content

Commit

Permalink
chore: merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
danji90 committed Feb 21, 2024
2 parents ed9dd77 + 2f9745f commit 1fd7fc2
Show file tree
Hide file tree
Showing 8 changed files with 737 additions and 13 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

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.9](https://github.com/geops/trafimage-maps/compare/v1.27.8...v1.27.9) (2024-02-21)

### Bug Fixes

- **railplus:** update address in railplus PDF legends ([#1147](https://github.com/geops/trafimage-maps/issues/1147)) ([57f9f9d](https://github.com/geops/trafimage-maps/commit/57f9f9d9db7ad6b40e94c5229172a8590cba5669))

### [1.27.8](https://github.com/geops/trafimage-maps/compare/v1.27.7...v1.27.8) (2024-02-15)

### Bug Fixes

- fix display of zoom bar and map buttons on iframe topics ([20961c0](https://github.com/geops/trafimage-maps/commit/20961c0269c536f8e28185c0f96905c642375f0e))
- fix display of zoom bar and map buttons on iframe topics ([bc0d732](https://github.com/geops/trafimage-maps/commit/bc0d732d401de3a5e15263bb9fb279740a7568e5))
- hide zoom buttons on mobile for iframe topics using css ([33032a9](https://github.com/geops/trafimage-maps/commit/33032a90f7c8914d9a282d047480631ce8e8b436))
- hide zoom buttons on mobile for iframe topics using css ([c59d8f0](https://github.com/geops/trafimage-maps/commit/c59d8f08ac192d6575c8eab636f997b071e5a061))
- hide zoom buttons on mobile for iframe topics using css ([be0e46c](https://github.com/geops/trafimage-maps/commit/be0e46c78409c5ac161cce031e918ebb8bcbaca5))

### [1.27.7](https://github.com/geops/trafimage-maps/compare/v1.27.6...v1.27.7) (2024-02-12)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "trafimage-maps",
"description": "trafimage-maps web component",
"version": "1.27.7",
"version": "1.27.9",
"private": true,
"main": "build/bundle.js",
"proxy": "http://127.0.0.1:8000",
Expand Down
2 changes: 1 addition & 1 deletion src/components/MapControls/MapControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function MapControls({
map={map}
zoomInChildren={<ZoomIn />}
zoomOutChildren={<ZoomOut />}
zoomSlider={!isSmallHeight && zoomSlider}
zoomSlider={!isSmallHeight && !isMobile && zoomSlider}
titles={{
zoomIn: t("Hineinzoomen"),
zoomOut: t("Rauszoomen"),
Expand Down
13 changes: 13 additions & 0 deletions src/components/TrafimageMaps/TrafimageMaps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -435,4 +435,17 @@
}
}
}

/* Topic spezifische css */
&.ch-sbb-geltungsbereiche-iframe {
&.tm-w-xs .wkp-map-controls {
display: none;
}
}

&.ch-sbb-direktverbindungen-iframe {
&.tm-w-xs .rs-zooms-bar {
display: none;
}
}
}
236 changes: 235 additions & 1 deletion src/img/railplus_legend_de.url.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
236 changes: 235 additions & 1 deletion src/img/railplus_legend_fr.url.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
236 changes: 235 additions & 1 deletion src/img/railplus_legend_it.url.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 1 addition & 8 deletions src/menus/DirektverbindungenMenu/DvMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ function DvMenu() {
const dispatch = useDispatch();
const classes = useStyles();
const featureInfo = useSelector((state) => state.app.featureInfo);
const topic = useSelector((state) => state.app.activeTopic);
const highlightLayer = useSelector((state) => state.map.highlightLayer);
const isMobile = useIsMobile();

Expand Down Expand Up @@ -62,13 +61,7 @@ function DvMenu() {
useEffect(() => {
// Hide menu and zoom buttons on mobile
dispatch(setDisplayMenu(!isMobile));
const zoomControls = document
.querySelectorAll(`.${topic.key.replaceAll(".", "-")}.map-controls`)[0]
?.querySelectorAll(".rs-zooms-bar")[0];
if (zoomControls) {
zoomControls.style.display = isMobile ? "none" : "block";
}
}, [isMobile, topic, dispatch]);
}, [isMobile, dispatch]);

// Hook to highlight map features
useHighlightLayer(featureInfo, highlightLayer);
Expand Down

0 comments on commit 1fd7fc2

Please sign in to comment.