feat: Geräte/Stations-Marker werden nur für Systeme mit Allow=1 angezeigt
- Geräte mit Allow=0 in GisSystemStatic werden auf der Karte ausgeblendet - Daten bleiben unverändert, nur die Anzeige/Zeichnung ist
This commit is contained in:
@@ -25,4 +25,4 @@ NEXT_PUBLIC_USE_MOCKS=true
|
|||||||
NEXT_PUBLIC_BASE_PATH=/talas5
|
NEXT_PUBLIC_BASE_PATH=/talas5
|
||||||
# Oder leer lassen für direkten Zugriff -> NEXT_PUBLIC_BASE_PATH=
|
# Oder leer lassen für direkten Zugriff -> NEXT_PUBLIC_BASE_PATH=
|
||||||
# App-Versionsnummer
|
# App-Versionsnummer
|
||||||
NEXT_PUBLIC_APP_VERSION=1.1.303
|
NEXT_PUBLIC_APP_VERSION=1.1.304
|
||||||
|
|||||||
@@ -26,4 +26,4 @@ NEXT_PUBLIC_BASE_PATH=/talas5
|
|||||||
# Oder leer lassen für direkten Zugriff -> NEXT_PUBLIC_BASE_PATH=
|
# Oder leer lassen für direkten Zugriff -> NEXT_PUBLIC_BASE_PATH=
|
||||||
|
|
||||||
# App-Versionsnummer
|
# App-Versionsnummer
|
||||||
NEXT_PUBLIC_APP_VERSION=1.1.303
|
NEXT_PUBLIC_APP_VERSION=1.1.304
|
||||||
@@ -69,3 +69,8 @@ die Daten von DB auch mit WebSocket gelöst werden
|
|||||||
|
|
||||||
- [ ] Redundante Kontextmenülogik auflösen
|
- [ ] Redundante Kontextmenülogik auflösen
|
||||||
- [ ] Bessere Trennung zwischen Mock- und Live-API in Service-Funktionen
|
- [ ] 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
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "nodemap",
|
"name": "nodemap",
|
||||||
"version": "1.1.303",
|
"version": "1.1.304",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "nodemap",
|
"name": "nodemap",
|
||||||
"version": "1.1.303",
|
"version": "1.1.304",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.13.3",
|
"@emotion/react": "^11.13.3",
|
||||||
"@emotion/styled": "^11.13.0",
|
"@emotion/styled": "^11.13.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "nodemap",
|
"name": "nodemap",
|
||||||
"version": "1.1.303",
|
"version": "1.1.304",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.13.3",
|
"@emotion/react": "^11.13.3",
|
||||||
"@emotion/styled": "^11.13.0",
|
"@emotion/styled": "^11.13.0",
|
||||||
|
|||||||
@@ -26,6 +26,14 @@ export const createAndSetDevices = async (
|
|||||||
measurements,
|
measurements,
|
||||||
oms // 🔁 OMS für Spiderfy hinzugefügt
|
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 || "";
|
const basePath = process.env.NEXT_PUBLIC_BASE_PATH || "";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -3,14 +3,14 @@
|
|||||||
"IdSystem": 1,
|
"IdSystem": 1,
|
||||||
"Name": "TALAS",
|
"Name": "TALAS",
|
||||||
"Longname": "Talas Meldestationen",
|
"Longname": "Talas Meldestationen",
|
||||||
"Allow": 0,
|
"Allow": 1,
|
||||||
"Icon": 1
|
"Icon": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 2,
|
"IdSystem": 2,
|
||||||
"Name": "ECI",
|
"Name": "ECI",
|
||||||
"Longname": "ECI Geräte",
|
"Longname": "ECI Geräte",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 2
|
"Icon": 2
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -24,91 +24,91 @@
|
|||||||
"IdSystem": 5,
|
"IdSystem": 5,
|
||||||
"Name": "GSM Modem",
|
"Name": "GSM Modem",
|
||||||
"Longname": "LR77 GSM Modems",
|
"Longname": "LR77 GSM Modems",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 5
|
"Icon": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 6,
|
"IdSystem": 6,
|
||||||
"Name": "Cisco Router",
|
"Name": "Cisco Router",
|
||||||
"Longname": "Cisco Router",
|
"Longname": "Cisco Router",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 6
|
"Icon": 6
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 7,
|
"IdSystem": 7,
|
||||||
"Name": "WAGO",
|
"Name": "WAGO",
|
||||||
"Longname": "WAGO I/O Systeme",
|
"Longname": "WAGO I/O Systeme",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 7
|
"Icon": 7
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 8,
|
"IdSystem": 8,
|
||||||
"Name": "Siemens",
|
"Name": "Siemens",
|
||||||
"Longname": "Siemens Notrufsysteme",
|
"Longname": "Siemens Notrufsysteme",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 8
|
"Icon": 8
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 9,
|
"IdSystem": 9,
|
||||||
"Name": "OTDR",
|
"Name": "OTDR",
|
||||||
"Longname": "Glasfaserüberwachung OTU",
|
"Longname": "Glasfaserüberwachung OTU",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 9
|
"Icon": 9
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 10,
|
"IdSystem": 10,
|
||||||
"Name": "WDM",
|
"Name": "WDM",
|
||||||
"Longname": " Wavelength Division Multiplexing",
|
"Longname": " Wavelength Division Multiplexing",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 10
|
"Icon": 10
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 11,
|
"IdSystem": 11,
|
||||||
"Name": "GMA",
|
"Name": "GMA",
|
||||||
"Longname": "Glättemeldeanlagen",
|
"Longname": "Glättemeldeanlagen",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 11
|
"Icon": 11
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 13,
|
"IdSystem": 13,
|
||||||
"Name": "Messstellen",
|
"Name": "Messstellen",
|
||||||
"Longname": "Messstellen",
|
"Longname": "Messstellen",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 13
|
"Icon": 13
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 30,
|
"IdSystem": 30,
|
||||||
"Name": "TK-Komponenten",
|
"Name": "TK-Komponenten",
|
||||||
"Longname": "TK-Komponenten",
|
"Longname": "TK-Komponenten",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 30
|
"Icon": 30
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 100,
|
"IdSystem": 100,
|
||||||
"Name": "TALAS ICL",
|
"Name": "TALAS ICL",
|
||||||
"Longname": "Talas ICL Unterstationen",
|
"Longname": "Talas ICL Unterstationen",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 100
|
"Icon": 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 110,
|
"IdSystem": 110,
|
||||||
"Name": "DAUZ",
|
"Name": "DAUZ",
|
||||||
"Longname": "Dauerzählstellen",
|
"Longname": "Dauerzählstellen",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 110
|
"Icon": 110
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 111,
|
"IdSystem": 111,
|
||||||
"Name": "SMS Modem",
|
"Name": "SMS Modem",
|
||||||
"Longname": "SMS Modem",
|
"Longname": "SMS Modem",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 111
|
"Icon": 111
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"IdSystem": 200,
|
"IdSystem": 200,
|
||||||
"Name": "Sonstige",
|
"Name": "Sonstige",
|
||||||
"Longname": "Sonstige",
|
"Longname": "Sonstige",
|
||||||
"Allow": 1,
|
"Allow": 0,
|
||||||
"Icon": 200
|
"Icon": 200
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
Reference in New Issue
Block a user