From f728d96f25b87a6799dcc7c25ff12f90271c55c2 Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Tue, 28 Apr 2020 11:31:01 +0200
Subject: [PATCH] update Di 28. Apr 11:31:01 CEST 2020

---
 public/js/client_waip.js | 20 ++++++++++++++++----
 views/dbrd.pug           |  2 --
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/public/js/client_waip.js b/public/js/client_waip.js
index 7c4c779..e612082 100644
--- a/public/js/client_waip.js
+++ b/public/js/client_waip.js
@@ -216,6 +216,7 @@ var redIcon = new L.Icon({
 var marker = L.marker(new L.LatLng(0, 0), {
   icon: redIcon
 }).addTo(map);
+var geojson = L.geoJSON().addTo(map);
 
 /* ########################### */
 /* ######## SOCKET.IO ######## */
@@ -396,12 +397,23 @@ socket.on('io.neuerEinsatz', function(data) {
     };
     $('#em_weitere').html(tmp);
   };
+  // Karte setzen
+
   // Karte setzen
   map.removeLayer(marker);
-  marker = L.marker(new L.LatLng(data.wgs84_x, data.wgs84_y), {
-    icon: redIcon
-  }).addTo(map);
-  map.setView(new L.LatLng(data.wgs84_x, data.wgs84_y), 15);
+  map.removeLayer(geojson);
+  if (data.wgs84_x && data.wgs84_y) {
+    marker = L.marker(new L.LatLng(data.wgs84_x, data.wgs84_y), {
+      icon: redIcon
+    }).addTo(map);
+    map.setView(new L.LatLng(data.wgs84_x, data.wgs84_y), 15);
+  } else {
+    geojson = L.geoJSON(JSON.parse(data.wgs84_area));
+    geojson.addTo(map);
+    map.fitBounds(geojson.getBounds());
+  };  
+  
+  
   // Hilfsfrist setzen
   start_counter(data.zeitstempel, data.ablaufzeit);
   // Uhr ausblenden
diff --git a/views/dbrd.pug b/views/dbrd.pug
index 2e35530..88af82a 100755
--- a/views/dbrd.pug
+++ b/views/dbrd.pug
@@ -7,8 +7,6 @@ block content
   include includes/modal_info
   .container-fluid
     include includes/master_dashboard
-  //script.
-    var einsatzdaten_obj = !{JSON.stringify(einsatzdaten).replace(/<\//g, '<\\/')}
   script(src='/socket.io/socket.io.js') 
   script(src='/js/leaflet.js')
   script(src='/js/client_dbrd.js')
\ No newline at end of file