From 37aec649ee6518ed1b968bf6a0f7360197a61d9d Mon Sep 17 00:00:00 2001 From: ISA Date: Mon, 28 Jul 2025 16:21:48 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20Ger=C3=A4te/Stations-Marker=20werden=20?= =?UTF-8?q?nur=20f=C3=BCr=20Systeme=20mit=20Allow=3D1=20angezeigt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Geräte mit Allow=0 in GisSystemStatic werden auf der Karte ausgeblendet - Daten bleiben unverändert, nur die Anzeige/Zeichnung ist --- .env.development | 2 +- .env.production | 2 +- docs/TODO.md | 5 +++++ package-lock.json | 4 ++-- package.json | 2 +- utils/devices/createAndSetDevices.js | 8 ++++++++ websocketDump/GisSystemStatic.json | 30 ++++++++++++++-------------- 7 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.env.development b/.env.development index 34a6633eb..d14790f08 100644 --- a/.env.development +++ b/.env.development @@ -25,4 +25,4 @@ NEXT_PUBLIC_USE_MOCKS=true NEXT_PUBLIC_BASE_PATH=/talas5 # Oder leer lassen für direkten Zugriff -> NEXT_PUBLIC_BASE_PATH= # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.1.303 +NEXT_PUBLIC_APP_VERSION=1.1.304 diff --git a/.env.production b/.env.production index 7d884780b..e3ca34d03 100644 --- a/.env.production +++ b/.env.production @@ -26,4 +26,4 @@ NEXT_PUBLIC_BASE_PATH=/talas5 # Oder leer lassen für direkten Zugriff -> NEXT_PUBLIC_BASE_PATH= # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.1.303 \ No newline at end of file +NEXT_PUBLIC_APP_VERSION=1.1.304 \ No newline at end of file diff --git a/docs/TODO.md b/docs/TODO.md index 6e288f793..9a189d25d 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -69,3 +69,8 @@ die Daten von DB auch mit WebSocket gelöst werden - [ ] Redundante Kontextmenülogik auflösen - [ ] Bessere Trennung zwischen Mock- und Live-API in Service-Funktionen + +--- + +28.07.2025 IdSystem 11 GMA Glätemeldeanlagen, werden neu neu laden das Browser nich mehr geladen in +DB maps idsystem ändern und testen diff --git a/package-lock.json b/package-lock.json index dba6f3b15..418d2c632 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nodemap", - "version": "1.1.303", + "version": "1.1.304", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nodemap", - "version": "1.1.303", + "version": "1.1.304", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/package.json b/package.json index f28e45196..d31151198 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodemap", - "version": "1.1.303", + "version": "1.1.304", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/utils/devices/createAndSetDevices.js b/utils/devices/createAndSetDevices.js index 5a65c11d5..ffd8a06f0 100644 --- a/utils/devices/createAndSetDevices.js +++ b/utils/devices/createAndSetDevices.js @@ -26,6 +26,14 @@ export const createAndSetDevices = async ( measurements, oms // 🔁 OMS für Spiderfy hinzugefügt ) => { + // Prüfe, ob das System erlaubt ist (Allow === 1) + const systemConfig = Array.isArray(GisSystemStatic) + ? GisSystemStatic.find(sys => sys.IdSystem === systemId) + : null; + if (!systemConfig || systemConfig.Allow !== 1) { + setMarkersFunction([]); + return; + } const basePath = process.env.NEXT_PUBLIC_BASE_PATH || ""; try { diff --git a/websocketDump/GisSystemStatic.json b/websocketDump/GisSystemStatic.json index f64aab102..865786fb8 100644 --- a/websocketDump/GisSystemStatic.json +++ b/websocketDump/GisSystemStatic.json @@ -3,14 +3,14 @@ "IdSystem": 1, "Name": "TALAS", "Longname": "Talas Meldestationen", - "Allow": 0, + "Allow": 1, "Icon": 1 }, { "IdSystem": 2, "Name": "ECI", "Longname": "ECI Geräte", - "Allow": 1, + "Allow": 0, "Icon": 2 }, { @@ -24,91 +24,91 @@ "IdSystem": 5, "Name": "GSM Modem", "Longname": "LR77 GSM Modems", - "Allow": 1, + "Allow": 0, "Icon": 5 }, { "IdSystem": 6, "Name": "Cisco Router", "Longname": "Cisco Router", - "Allow": 1, + "Allow": 0, "Icon": 6 }, { "IdSystem": 7, "Name": "WAGO", "Longname": "WAGO I/O Systeme", - "Allow": 1, + "Allow": 0, "Icon": 7 }, { "IdSystem": 8, "Name": "Siemens", "Longname": "Siemens Notrufsysteme", - "Allow": 1, + "Allow": 0, "Icon": 8 }, { "IdSystem": 9, "Name": "OTDR", "Longname": "Glasfaserüberwachung OTU", - "Allow": 1, + "Allow": 0, "Icon": 9 }, { "IdSystem": 10, "Name": "WDM", "Longname": " Wavelength Division Multiplexing", - "Allow": 1, + "Allow": 0, "Icon": 10 }, { "IdSystem": 11, "Name": "GMA", "Longname": "Glättemeldeanlagen", - "Allow": 1, + "Allow": 0, "Icon": 11 }, { "IdSystem": 13, "Name": "Messstellen", "Longname": "Messstellen", - "Allow": 1, + "Allow": 0, "Icon": 13 }, { "IdSystem": 30, "Name": "TK-Komponenten", "Longname": "TK-Komponenten", - "Allow": 1, + "Allow": 0, "Icon": 30 }, { "IdSystem": 100, "Name": "TALAS ICL", "Longname": "Talas ICL Unterstationen", - "Allow": 1, + "Allow": 0, "Icon": 100 }, { "IdSystem": 110, "Name": "DAUZ", "Longname": "Dauerzählstellen", - "Allow": 1, + "Allow": 0, "Icon": 110 }, { "IdSystem": 111, "Name": "SMS Modem", "Longname": "SMS Modem", - "Allow": 1, + "Allow": 0, "Icon": 111 }, { "IdSystem": 200, "Name": "Sonstige", "Longname": "Sonstige", - "Allow": 1, + "Allow": 0, "Icon": 200 } ] \ No newline at end of file