diff --git a/Lora-Map/Model/Marker.cs b/Lora-Map/Model/Marker.cs index b6417df..fedef22 100644 --- a/Lora-Map/Model/Marker.cs +++ b/Lora-Map/Model/Marker.cs @@ -29,6 +29,13 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model if(json["person"].ContainsKey("text") && json["person"]["text"].IsString) { ret += "&person-text=" + (String)json["person"]["text"]; } + if(json["person"].ContainsKey("typ") && json["person"]["typ"].IsArray) { + foreach(JsonData item in json["person"]["typ"]) { + if(item.IsString) { + ret += "&person-typ=" + (String)item; + } + } + } } ret += (ret.Contains("?")) ? "&name=" + name : "?name=" + name; return ret; @@ -100,6 +107,12 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model xmlpersontext.Item(0).InnerText = keyvalue[1]; } break; + case "person-typ": + XmlNodeList xmlpersontyp = this.svg.DocumentElement.SelectNodes("//*[local-name()='defs'][@id='people-def']"); + if(xmlpersontyp.Count == 1) { + xmlpersontyp.Item(0).InnerXml += ""; + } + break; } } } diff --git a/Lora-Map/Properties/AssemblyInfo.cs b/Lora-Map/Properties/AssemblyInfo.cs index 7576b35..7c414f9 100644 --- a/Lora-Map/Properties/AssemblyInfo.cs +++ b/Lora-Map/Properties/AssemblyInfo.cs @@ -33,8 +33,8 @@ 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.2.5")] -[assembly: AssemblyFileVersion("1.2.5")] +[assembly: AssemblyVersion("1.2.6")] +[assembly: AssemblyFileVersion("1.2.6")] /* * 1.1.1 Add Debian package config @@ -50,4 +50,5 @@ using System.Runtime.InteropServices; * 1.2.3 #9 display polygons and marker on the map * 1.2.4 Can draw Textmarkers on the Map, use MGRS (UTM) on the Map * 1.2.5 #10 text Letzer Datenempfang is too long when scrollbar is there and #11 set textsize for every zoomlevel +* 1.2.6 New Types of marker for person */ diff --git a/Lora-Map/resources/admin/js/menu.js b/Lora-Map/resources/admin/js/menu.js index f9925fb..7202629 100644 --- a/Lora-Map/resources/admin/js/menu.js +++ b/Lora-Map/resources/admin/js/menu.js @@ -78,6 +78,11 @@ var NamesEditor = { if(markerobj["person"].hasOwnProperty("text")) { url += "&person-text=" + markerobj["person"]["text"]; } + if (markerobj["person"].hasOwnProperty("typ") && Array.isArray(markerobj["person"]["typ"])) { + for (i in markerobj["person"]["typ"]) { + url += "&person-typ=" + markerobj["person"]["typ"][i]; + } + } } return ""; }, @@ -98,6 +103,17 @@ var NamesEditor = { if (query.hasOwnProperty("person-text")) { markerobj["person"]["text"] = query["person-text"]; } + if (query.hasOwnProperty("person-typ")) { + if (Array.isArray(query["person-typ"])) { + markerobj["person"]["typ"] = new Array(); + for (var i in query["person-typ"]) { + markerobj["person"]["typ"].push(query["person-typ"][i]); + } + } else { + markerobj["person"]["typ"] = new Array(); + markerobj["person"]["typ"].push(query["person-typ"]); + } + } } return markerobj; }, @@ -191,29 +207,43 @@ var NamesEditor = { ie.innerHTML = "