diff --git a/.env.development b/.env.development index a3fa228ec..d1a553a6f 100644 --- a/.env.development +++ b/.env.development @@ -23,4 +23,4 @@ NEXT_PUBLIC_USE_MOCKS=true # z.B. http://10.10.0.13/xyz/index.aspx -> basePath in config.json auf /xyz setzen # basePath wird jetzt in public/config.json gepflegt # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.1.375 +NEXT_PUBLIC_APP_VERSION=1.1.376 diff --git a/.env.production b/.env.production index 4d2bd2239..9d9c11ead 100644 --- a/.env.production +++ b/.env.production @@ -24,4 +24,4 @@ NEXT_PUBLIC_USE_MOCKS=false # basePath wird jetzt in public/config.json gepflegt # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.1.375 +NEXT_PUBLIC_APP_VERSION=1.1.376 diff --git a/components/icons/material-symbols/MinusIcon.js b/components/icons/material-symbols/MinusIcon.js new file mode 100644 index 000000000..ed671bc67 --- /dev/null +++ b/components/icons/material-symbols/MinusIcon.js @@ -0,0 +1,14 @@ +const MinusIcon = ({ className = "h-8 w-8" }) => ( + + + +); + +export default MinusIcon; diff --git a/components/icons/material-symbols/PlusIcon.js b/components/icons/material-symbols/PlusIcon.js new file mode 100644 index 000000000..ee8aab1b7 --- /dev/null +++ b/components/icons/material-symbols/PlusIcon.js @@ -0,0 +1,14 @@ +const PlusIcon = ({ className = "h-8 w-8" }) => ( + + + +); + +export default PlusIcon; diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index 11134d82a..6be439ede 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -15,6 +15,8 @@ import InfoIcon from "@/components/icons/material-symbols/InfoIcon"; import AlarmIcon from "@/components/icons/material-symbols/AlarmIcon"; import MapMarkerIcon from "@/components/icons/material-symbols/MapMarkerIcon"; import ExpandIcon from "@/components/icons/material-symbols/ExpandIcon"; +import PlusIcon from "@/components/icons/material-symbols/PlusIcon"; +import MinusIcon from "@/components/icons/material-symbols/MinusIcon"; import PoiUpdateModal from "@/components/pois/poiUpdateModal/PoiUpdateModal.js"; import { ToastContainer, toast } from "react-toastify"; import plusRoundIcon from "../icons/devices/overlapping/PlusRoundIcon.js"; @@ -1266,6 +1268,27 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { /> + {/* Custom Zoom Controls bottom-right, styled in littwin-blue to match app icons */} +
+ + +
{/* Marker/AreaDropdown Panel außerhalb der Button-Leiste platzieren, damit die Position mit den anderen Panels identisch ist */} {overlay === "area" && setOverlay(null)} />} {/* BaseMapPanel entfernt */} diff --git a/package-lock.json b/package-lock.json index 103b604d4..0ba6ed0c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nodemap", - "version": "1.1.375", + "version": "1.1.376", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nodemap", - "version": "1.1.375", + "version": "1.1.376", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/package.json b/package.json index e9ed94f8f..eee6797de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodemap", - "version": "1.1.375", + "version": "1.1.376", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/playwright/tests/mapcomponent.spec.js b/playwright/tests/mapcomponent.spec.js index 883b5c632..053609103 100644 --- a/playwright/tests/mapcomponent.spec.js +++ b/playwright/tests/mapcomponent.spec.js @@ -282,10 +282,10 @@ test("zoom control buttons update mapZoom", async ({ page }) => { }); await page.goto("http://localhost:3000/?m=12&u=484"); - // Wait for Leaflet map and zoom controls + // Wait for Leaflet map and custom zoom controls await page.locator("#map.leaflet-container").waitFor({ state: "visible", timeout: 20_000 }); - const zoomInBtn = page.locator(".leaflet-control-zoom-in"); - const zoomOutBtn = page.locator(".leaflet-control-zoom-out"); + const zoomInBtn = page.getByTestId("zoom-in"); + const zoomOutBtn = page.getByTestId("zoom-out"); await expect(zoomInBtn).toBeVisible(); await expect(zoomOutBtn).toBeVisible(); diff --git a/reports/junit/playwright.xml b/reports/junit/playwright.xml index 8e84105f7..1d7ec25b8 100644 --- a/reports/junit/playwright.xml +++ b/reports/junit/playwright.xml @@ -1,6 +1,6 @@ - - - + + + - + - +