[1.1.4] #3 Create icons for devices

Lora-Map/Lora-Map.csproj

@@ -63,6 +63,9 @@
     <None Include="dpkg\postinst" />
     <None Include="dpkg\preinst" />
     <None Include="dpkg\prerm" />
+    <None Include="names.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="resources\js\leaflet\leaflet-src.esm.js.map" />
     <None Include="resources\js\leaflet\leaflet-src.js.map" />
     <None Include="resources\js\leaflet\leaflet.js.map" />
@@ -92,6 +95,12 @@
     <Content Include="resources\icons\marker\map-marker.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="resources\icons\marker\thw\einheiten\26-91.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="resources\icons\marker\thw\einheiten\27-92.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="resources\js\leaflet\images\layers-2x.png" />
     <Content Include="resources\js\leaflet\images\layers.png" />
     <Content Include="resources\js\leaflet\images\marker-icon-2x.png" />

Lora-Map/Model/Botclient.cs

@@ -9,7 +9,7 @@ using LitJson;
 namespace Fraunhofer.Fit.IoT.LoraMap.Model {
   class Botclient {
 
-    public Botclient(JsonData json) {
+    public Botclient(String id, JsonData json, JsonData marker) {
       if (json.ContainsKey("Rssi") && json["Rssi"].IsDouble) {
         this.Rssi = (Double)json["Rssi"];
       }
@@ -58,6 +58,17 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model {
           this.Height = (Double)json["Gps"]["Height"];
         }
       }
+      if(marker.ContainsKey(id)) {
+        if(marker[id].ContainsKey("name") && marker[id]["name"].IsString) {
+          this.Name = (String)marker[id]["name"];
+        }
+        if(marker[id].ContainsKey("icon") && marker[id]["icon"].IsString) {
+          this.Icon = (String)marker[id]["icon"];
+        }
+      } else {
+        this.Name = id;
+        this.Icon = null;
+      }
     }
 
     public Double Rssi { get; private set; }
@@ -70,6 +81,8 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model {
     public Int32 Batterysimple { get; private set; }
     public Boolean Fix { get; private set; }
     public Double Height { get; private set; }
+    public String Name { get; private set; }
+    public String Icon { get; private set; }
 
     public virtual Dictionary<String, Object> ToDictionary() {
       Dictionary<String, Object> dictionary = new Dictionary<String, Object>();

Lora-Map/Properties/AssemblyInfo.cs

@@ -1,6 +1,5 @@
 using System.Resources;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden
@@ -11,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Fraunhofer FIT")]
 [assembly: AssemblyProduct("Lora-Map")]
-[assembly: AssemblyCopyright("Copyright ©  2018 - 08.03.2019")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 10.03.2019")]
 [assembly: AssemblyTrademark("Fraunhofer FIT, BlubbFish")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("de-DE")]
@@ -34,11 +33,12 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.3")]
-[assembly: AssemblyFileVersion("1.1.3")]
+[assembly: AssemblyVersion("1.1.4")]
+[assembly: AssemblyFileVersion("1.1.4")]
 
 /*
 * 1.1.1 Add Debian package config
 * 1.1.2 #2 Show versions number in Site
 * 1.1.3 #1 Click on icon and show details
+* 1.1.4 #3 Create icons for devices
 */

Lora-Map/Server.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Text;
 using BlubbFish.Utils;
@@ -13,8 +14,9 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
   class Server : Webserver
   {
     private readonly SortedDictionary<String, Botclient> locations = new SortedDictionary<String, Botclient>();
-    
-    public Server(ADataBackend backend, Dictionary<String, String> settings, InIReader requests) : base(backend, settings, requests) { }
+    private readonly JsonData marker;
+
+    public Server(ADataBackend backend, Dictionary<String, String> settings, InIReader requests) : base(backend, settings, requests) => this.marker = JsonMapper.ToObject(File.ReadAllText("names.json"));
 
     protected override void Backend_MessageIncomming(Object sender, BackendEvent e) {
       try {
@@ -33,7 +35,7 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
           && d["Gps"].ContainsKey("Height") && d["Gps"]["Height"].IsDouble
           && d.ContainsKey("Name") && d["Name"].IsString) {
           String name = (String)d["Name"];
-          Botclient b = new Botclient(d);
+          Botclient b = new Botclient(name, d, this.marker);
           if (this.locations.ContainsKey(name)) {
             this.locations[name] = b;
           } else {

Lora-Map/names.json

@@ -0,0 +1,10 @@
+{
+  "A": {
+    "name": "26/91",
+    "icon": "icons/marker/thw/einheiten/26-91.png"
+  },
+  "C": {
+    "name": "27/92",
+    "icon": "icons/marker/thw/einheiten/27-92.png"
+  }
+}

Lora-Map/resources/icons/marker/Person.svg

@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="74.953316mm"
+   height="84.703323mm"
+   viewBox="0 0 74.953316 84.703324"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Person.svg"
+   inkscape:export-filename="E:\Eigene Dateien\Dokumente\Visual Studio 2017\Projects\mqtt-map\Lora-Map\resources\icons\marker\thw\zug\Fuehrer-TZ-2.png"
+   inkscape:export-xdpi="50"
+   inkscape:export-ydpi="50">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="-66.411843"
+     inkscape:cy="181.57164"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4614"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Organisation"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-58.582862,-112.24358)">
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="THW"
+       style="display:inline">
+      <rect
+         style="opacity:1;fill:#0d468b;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect817"
+         width="50"
+         height="50"
+         x="-69.83815"
+         y="155.68683"
+         rx="0"
+         ry="0"
+         transform="rotate(-45)" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Feuerwehr"
+       style="display:none">
+      <rect
+         transform="rotate(-45)"
+         ry="0"
+         rx="0"
+         y="155.68683"
+         x="-69.83815"
+         height="50"
+         width="50"
+         id="rect4525"
+         style="opacity:1;fill:#b41302;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Hilo"
+       style="display:none">
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect4529"
+         width="50"
+         height="50"
+         x="-69.83815"
+         y="155.68683"
+         rx="0"
+         ry="0"
+         transform="rotate(-45)" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Polizei"
+       style="display:none">
+      <rect
+         transform="rotate(-45)"
+         ry="0"
+         rx="0"
+         y="155.68683"
+         x="-69.83815"
+         height="50"
+         width="50"
+         id="rect4533"
+         style="opacity:1;fill:#2a8626;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer6"
+       inkscape:label="Führung"
+       style="display:none">
+      <rect
+         style="opacity:1;fill:#ffdf00;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect4537"
+         width="50"
+         height="50"
+         x="-69.83815"
+         y="155.68683"
+         rx="0"
+         ry="0"
+         transform="rotate(-45)" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer7"
+       inkscape:label="Sonstig"
+       style="display:none">
+      <rect
+         transform="rotate(-45)"
+         ry="0"
+         rx="0"
+         y="155.68683"
+         x="-69.83815"
+         height="50"
+         width="50"
+         id="rect4541"
+         style="opacity:1;fill:#ffa13e;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="Funktion"
+     transform="translate(-4.4253269e-7,9.75)"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer9"
+       inkscape:label="Sonder"
+       style="display:none">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 22.717909,15.753114 H 52.251191"
+         id="path4546"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer10"
+       inkscape:label="Führungskraft"
+       style="display:inline">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4549"
+         d="M 22.765156,15.753114 H 51.778721 L 37.510343,1.0079274 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="Rang"
+     transform="translate(-4.4253269e-7,9.75)">
+    <g
+       inkscape:groupmode="layer"
+       id="layer12"
+       inkscape:label="Truppführer"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path4554"
+         cx="37.476501"
+         cy="-6"
+         r="3" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer13"
+       inkscape:label="Gruppenführer"
+       style="display:none">
+      <g
+         id="g4572">
+        <circle
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+           id="circle4557"
+           cx="32.976501"
+           cy="-6"
+           r="3" />
+        <circle
+           r="3"
+           cy="-6"
+           cx="41.976501"
+           id="circle4560"
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer14"
+       inkscape:label="Zugführer"
+       style="display:none">
+      <g
+         id="g4577">
+        <circle
+           style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+           id="circle4563"
+           cx="37.476501"
+           cy="-6"
+           r="3" />
+        <circle
+           r="3"
+           cy="-6"
+           cx="28.4765"
+           id="circle4566"
+           style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+        <circle
+           r="3"
+           cy="-6"
+           cx="46.476501"
+           id="circle4568"
+           style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="Typ">
+    <g
+       inkscape:groupmode="layer"
+       id="layer16"
+       inkscape:label="B1"
+       style="display:inline">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.58834457px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3647086px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="37.476501"
+         y="54.946476"
+         id="text4583"><tspan
+           sodipodi:role="line"
+           id="tspan4581"
+           x="37.476501"
+           y="54.946476"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.3647086px">B1</tspan></text>
+    </g>
+    <g
+       style="display:none"
+       inkscape:label="B2"
+       id="g4608"
+       inkscape:groupmode="layer">
+      <text
+         id="text4606"
+         y="54.946476"
+         x="37.476501"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.58834457px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3647086px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.3647086px"
+           y="54.946476"
+           x="37.476501"
+           id="tspan4604"
+           sodipodi:role="line">B2</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g4614"
+       inkscape:label="B"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.58834457px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3647086px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="37.476501"
+         y="54.946476"
+         id="text4612"><tspan
+           sodipodi:role="line"
+           id="tspan4610"
+           x="37.476501"
+           y="54.946476"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.3647086px">B</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer17"
+       inkscape:label="TZ-1"
+       style="display:none">
+      <text
+         id="text4588"
+         y="54.946476"
+         x="37.476501"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.58834457px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3647086px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.3647086px"
+           y="54.946476"
+           x="37.476501"
+           id="tspan4586"
+           sodipodi:role="line">TZ-1</tspan></text>
+    </g>
+    <g
+       inkscape:label="TZ-2"
+       id="g4596"
+       inkscape:groupmode="layer"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.58834457px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3647086px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="37.476501"
+         y="54.946476"
+         id="text4594"><tspan
+           sodipodi:role="line"
+           id="tspan4592"
+           x="37.476501"
+           y="54.946476"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.3647086px">TZ-2</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g4602"
+       inkscape:label="TZ"
+       style="display:none">
+      <text
+         id="text4600"
+         y="54.946476"
+         x="37.476501"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.58834457px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3647086px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.3647086px"
+           y="54.946476"
+           x="37.476501"
+           id="tspan4598"
+           sodipodi:role="line">TZ</tspan></text>
+    </g>
+  </g>
+</svg>

Lora-Map/resources/icons/marker/thw/Marker.svg

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="85.250008mm"
+   height="121.83333mm"
+   viewBox="0 0 85.250008 121.83333"
+   version="1.1"
+   id="svg4622"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Marker.svg"
+   inkscape:export-filename="E:\Eigene Dateien\Dokumente\Visual Studio 2017\Projects\mqtt-map\Lora-Map\resources\icons\marker\thw\Einheiten\27-92.png"
+   inkscape:export-xdpi="50"
+   inkscape:export-ydpi="50">
+  <svg:defs
+     id="defs4616" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="-20.760119"
+     inkscape:cy="286.62271"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer18"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <svg:metadata
+     id="metadata4619">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Marker"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-59.988091,-124.25)">
+    <svg:rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       id="rect5167"
+       width="82.5"
+       height="110"
+       x="61.988094"
+       y="125" />
+    <svg:path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 61.988094,235.33334 -10e-7,8.74999"
+       id="path5173"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <svg:circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path5175"
+       cx="61.988091"
+       cy="244.08333"
+       r="2" />
+  </svg:g>
+  <svg:g
+     inkscape:groupmode="layer"
+     id="layer18"
+     inkscape:label="Name"
+     transform="translate(4.8486328e-7,-21.52381)">
+    <svg:text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="9.6537676"
+       y="38.26413"
+       id="text5171"><svg:tspan
+         sodipodi:role="line"
+         id="tspan5169"
+         x="9.6537676"
+         y="38.26413"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';stroke-width:0.26458332px">27/92</svg:tspan></svg:text>
+  </svg:g>
+  <svg:g
+     inkscape:groupmode="layer"
+     id="layer19"
+     inkscape:label="Icon"
+     transform="translate(4.8486328e-7,-21.52381)">
+    <svg:image
+       sodipodi:absref="E:\Eigene Dateien\Dokumente\Visual Studio 2017\Projects\mqtt-map\Lora-Map\resources\icons\marker\thw\../Person.svg"
+       xlink:href="../Person.svg"
+       y="43.601036"
+       x="5"
+       id="image4534"
+       preserveAspectRatio="none"
+       height="84.756111"
+       width="75" />
+    <use
+       xlink:href="../Person.svg"
+       xlink:actuate="onLoad"
+       xlink:type="simple" />
+  </svg:g>
+</svg:svg>

Lora-Map/resources/icons/marker/thw/Trupps-Gruppen-Zuege.svg

@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="75mm"
+   height="53mm"
+   viewBox="0 0 75 53"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Trupps-Gruppen-Zuege.svg"
+   inkscape:export-filename="E:\Eigene Dateien\Dokumente\Visual Studio 2017\Projects\mqtt-map\Lora-Map\resources\icons\marker\thw\trupp\B1.png"
+   inkscape:export-xdpi="50.799999"
+   inkscape:export-ydpi="50.799999">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="469.68393"
+     inkscape:cy="210.67759"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer15"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Background"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-244)">
+    <rect
+       style="opacity:1;fill:#0d468b;fill-opacity:1;stroke:#e6e6e6;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect10"
+       width="70"
+       height="40"
+       x="2.5"
+       y="254.5"
+       rx="0"
+       ry="0" />
+    <g
+       aria-label="THW"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.24502373px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28112558px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4534">
+      <path
+         d="m 51.057801,293 v -6.92382 H 48.866998 V 285 h 5.595059 v 1.07618 H 52.271254 V 293 Z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28112558px"
+         id="path4536"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 59.705708,293 v -3.49211 H 56.532063 V 293 h -1.213452 v -8 h 1.213452 v 3.42622 h 3.173645 V 285 h 1.213452 v 8 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28112558px"
+         id="path4538"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 63.895139,293 -2.004118,-8 h 1.284831 l 1.257379,5.6884 h 0.02196 L 66.009071,285 h 0.873027 l 1.553878,5.6884 h 0.02196 L 69.715317,285 h 1.284832 l -2.004118,8 h -1.010295 l -1.531915,-5.76527 h -0.02196 L 64.905434,293 Z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28112558px"
+         id="path4540"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Größe"
+     transform="translate(0,-244)"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Trupp"
+       style="display:inline">
+      <circle
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path4547"
+         cy="247"
+         cx="39"
+         r="3" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Gruppen"
+       style="display:none">
+      <g
+         id="g4557">
+        <circle
+           r="3"
+           cy="247"
+           cx="20.25"
+           id="path4550"
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+        <circle
+           r="3"
+           cy="247"
+           cx="57.75"
+           id="path4552"
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer6"
+       inkscape:label="Züge"
+       style="display:none">
+      <circle
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path4550-0"
+         cx="20.25"
+         cy="247"
+         r="3" />
+      <circle
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path4552-7"
+         cx="39"
+         cy="247"
+         r="3" />
+      <circle
+         style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="path4547-2"
+         cy="247"
+         cx="57.75"
+         r="3" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="Zusatz"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer11"
+       inkscape:label="EGS"
+       style="display:none">
+      <text
+         id="text4622"
+         y="49"
+         x="3.9890261"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.23731136px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28093278px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28093278px"
+           y="49"
+           x="3.9890261"
+           id="tspan4620"
+           sodipodi:role="line">EGS</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer9"
+       inkscape:label="B"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.23731136px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28093278px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="3.9890261"
+         y="49"
+         id="text4616"><tspan
+           sodipodi:role="line"
+           id="tspan4614"
+           x="3.9890261"
+           y="49"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28093278px">B</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer10"
+       inkscape:label="ASH"
+       style="display:none">
+      <text
+         id="text4610"
+         y="49"
+         x="3.9890261"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.23731136px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28093278px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28093278px"
+           y="49"
+           x="3.9890261"
+           id="tspan4608"
+           sodipodi:role="line">ASH</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer8"
+       inkscape:label="A"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.23731136px;line-height:125%;font-family:Consolas;-inkscape-font-specification:Consolas;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28093278px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="3.9890261"
+         y="49"
+         id="text4592"><tspan
+           sodipodi:role="line"
+           id="tspan4590"
+           x="3.9890261"
+           y="49"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28093278px">A</tspan></text>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="Bezeichnungen">
+    <g
+       inkscape:groupmode="layer"
+       id="layer18"
+       inkscape:label="TZ-E"
+       style="display:none">
+      <text
+         id="text4701"
+         y="34.989704"
+         x="16.894501"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px"
+           y="34.989704"
+           x="16.894501"
+           id="tspan4699"
+           sodipodi:role="line">TZ-E</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer15"
+       inkscape:label="TZ-FGr"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="7.0419998"
+         y="34.989704"
+         id="text4695"><tspan
+           sodipodi:role="line"
+           id="tspan4693"
+           x="7.0419998"
+           y="34.989704"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px">TZ-FGr</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer17"
+       inkscape:label="TZ-BrB"
+       style="display:none">
+      <text
+         id="text4689"
+         y="34.989704"
+         x="5.9194999"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px"
+           y="34.989704"
+           x="5.9194999"
+           id="tspan4687"
+           sodipodi:role="line">TZ-BrB</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer16"
+       inkscape:label="TZ-Bel"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="8.2465"
+         y="34.989704"
+         id="text4683"><tspan
+           sodipodi:role="line"
+           id="tspan4681"
+           x="8.2465"
+           y="34.989704"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px">TZ-Bel</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer14"
+       inkscape:label="TZ"
+       style="display:none">
+      <text
+         id="text4668"
+         y="34.989704"
+         x="27.107"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px"
+           y="34.989704"
+           x="27.107"
+           id="tspan4666"
+           sodipodi:role="line">TZ</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer19"
+       inkscape:label="FGr"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="22.85"
+         y="34.989704"
+         id="text4662"><tspan
+           sodipodi:role="line"
+           id="tspan4660"
+           x="22.85"
+           y="34.989704"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px">FGr</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer22"
+       inkscape:label="Bel"
+       style="display:none">
+      <text
+         id="text4656"
+         y="34.989704"
+         x="24.054501"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px"
+           y="34.989704"
+           x="24.054501"
+           id="tspan4654"
+           sodipodi:role="line">Bel</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer21"
+       inkscape:label="B2"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="27.250999"
+         y="34.989704"
+         id="text4650"><tspan
+           sodipodi:role="line"
+           id="tspan4648"
+           x="27.250999"
+           y="34.989704"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px">B2</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer20"
+       inkscape:label="B1"
+       style="display:inline">
+      <text
+         id="text4644"
+         y="34.989704"
+         x="29.015499"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px"
+           y="34.989704"
+           x="29.015499"
+           id="tspan4642"
+           sodipodi:role="line">B1</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer23"
+       inkscape:label="B"
+       style="display:none">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.29522419px;line-height:125%;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28238061px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="32.429501"
+         y="34.989704"
+         id="text4640"><tspan
+           sodipodi:role="line"
+           id="tspan4638"
+           x="32.429501"
+           y="34.989704"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.08441925px;font-family:'DIN 1451 Mittelschrift';-inkscape-font-specification:'DIN 1451 Mittelschrift';fill:#ffffff;fill-opacity:1;stroke-width:0.28238061px">B</tspan></text>
+    </g>
+  </g>
+</svg>

Lora-Map/resources/js/marker.js

@@ -11,14 +11,25 @@ function datarunner() {
 
 //https://leafletjs.com/reference-1.4.0.html#marker
 function parsedata() {
-  if (this.readyState == 4 && this.status == 200) {
+  if (this.readyState === 4 && this.status === 200) {
     serverLocation = JSON.parse(this.responseText);
     for (var key in serverLocation) {
       if (serverLocation.hasOwnProperty(key)) {
         var markeritem = serverLocation[key];
-        if (markeritem['Latitude'] != 0 || markeritem['Longitude'] != 0) {
+        if (markeritem['Latitude'] !== 0 || markeritem['Longitude'] !== 0) {
           if (!markers.hasOwnProperty(key)) {
-            markers[key] = L.marker([markeritem['Latitude'], markeritem['Longitude']], { 'title': key }).addTo(mymap).on("click", showMarkerInfo, key);
+            var marker = null;
+            if (markeritem['Icon'] === null) {
+              marker = L.marker([markeritem['Latitude'], markeritem['Longitude']], { 'title': markeritem['Name'] });
+            } else {
+              var myIcon = L.icon({
+                'iconUrl': markeritem['Icon'],
+                'iconSize': [56, 80],
+                'iconAnchor': [0, 80]
+              });
+              marker = L.marker([markeritem['Latitude'], markeritem['Longitude']], { 'title': markeritem['Name'], 'icon': myIcon });
+            }
+            markers[key] = marker.addTo(mymap).on("click", showMarkerInfo, key);
           } else {
             markers[key].setLatLng([markeritem['Latitude'], markeritem['Longitude']]);
           }

Lora-Map/resources/js/menu.js

@@ -4,8 +4,9 @@ function showHidePanel(name) {
     document.getElementById("pannels").style.display = "block";
     document.getElementById(name).style.display = "block";
     visiblePanel = name;
-  } else if (visiblePanel === name && name !== "pannels_info") {
+  } else if (visiblePanel === name && name !== "pannels_info" || name === null) {
     document.getElementById("pannels").style.display = "none";
+    document.getElementById(visiblePanel).style.display = "none";
     visiblePanel = null;
   } else {
     document.getElementById(visiblePanel).style.display = "none";
@@ -31,7 +32,7 @@ function updateDeviceStatus() {
   document.getElementById("pannels_info").innerHTML = "";
   if (serverLocation.hasOwnProperty(statusToDevice)) {
     var markeritem = serverLocation[statusToDevice];
-    var html = "<div class=\"name\">Name: <span class=\"bold\">" + statusToDevice + "</span></div>";
+    var html = "<div class=\"name\">Name: <span class=\"bold\">" + markeritem["Name"] + "</span></div>";
     html += "<div class=\"batt\"><span class=\"bold\">Batterie:</span> " + markeritem["Battery"] + "V <img src=\"icons/akku/" + markeritem["Batterysimple"] + "-4.png\"></div>";
     if (markeritem["Fix"]) {
       html += "<div class=\"gps\" style=\"color: green;\">GPS-Empfang</div>";
@@ -58,11 +59,11 @@ function updateStatus() {
       divItem.setAttribute("rel", name);
       var spanColor = document.createElement("span");
       spanColor.className = "color";
-      if (markeritem["Batterysimple"] == 0) {
+      if (markeritem["Batterysimple"] === 0) {
         spanColor.style.backgroundColor = "red";
-      } else if (markeritem["Batterysimple"] == 1 || markeritem["Batterysimple"] == 2) {
+      } else if (markeritem["Batterysimple"] === 1 || markeritem["Batterysimple"] === 2) {
         spanColor.style.backgroundColor = "yellow";
-      } else if (markeritem["Batterysimple"] == 3 || markeritem["Batterysimple"] == 4) {
+      } else if (markeritem["Batterysimple"] === 3 || markeritem["Batterysimple"] === 4) {
         spanColor.style.backgroundColor = "green";
       }
       divItem.appendChild(spanColor);
@@ -76,7 +77,7 @@ function updateStatus() {
       divLine1.className = "line1";
       var spanName = document.createElement("span");
       spanName.className = "name";
-      spanName.innerText = name;
+      spanName.innerText = markeritem["Name"];
       divLine1.appendChild(spanName);
       var spanAkku = document.createElement("span");
       spanAkku.className = "akku";
@@ -110,10 +111,10 @@ function timeDiffToText(time) {
   if (diff < 60) {
     return diff + " s";
   }
-  if (diff < (60 * 60)) {
+  if (diff < 60 * 60) {
     return Math.floor(diff / 60) + " m";
   }
-  if (diff < (60 * 60 * 24)) {
+  if (diff < 60 * 60 * 24) {
     return Math.floor(diff / (60 * 60)) + " h";
   }
   return Math.floor(diff / (60 * 60 * 24)) + " d";

Lora-Map/resources/js/nav.js

@@ -1,8 +1,14 @@
-var mymap = L.map('bigmap').setView([{%START_LOCATION%}], 14);
+var mymap = L.map('bigmap').setView(["{%START_LOCATION%}"], 14);
 
 L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', {
   attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
   maxZoom: 20,
   id: 'mapbox.streets',
-  accessToken: '{%YOUR_API_KEY%}'
-}).addTo(mymap);
+  accessToken: '"{%YOUR_API_KEY%}"'
+}).addTo(mymap);
+
+mymap.on("click", hidePanel);
+
+function hidePanel(e) {
+  showHidePanel(null);
+}