Lora/Lora-Map
1
0
Fork 0
Code Issues 8 Pull Requests Releases 23 Wiki Activity

Changes to new Mqtt topic for camera density

Browse Source
This commit is contained in:
Philip Schell 2019-07-03 14:06:38 +02:00
parent fbefdd156f
commit 7924214b66
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -8,6 +8,7 @@
* Implement #14 show description on map in tooltip on area * Implement #14 show description on map in tooltip on area
### Changes ### Changes
* Move CoordinateSharp to own Library * Move CoordinateSharp to own Library
* Changes to new Mqtt topic for camera density
## 1.2.7 ## 1.2.7
### New Features ### New Features

4
Lora-Map/Properties/AssemblyInfo.cs
View File

@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.7")] [assembly: AssemblyVersion("1.2.8")]
[assembly: AssemblyFileVersion("1.2.7")] [assembly: AssemblyFileVersion("1.2.8")]
/* /*
* 1.1.1 Add Debian package config * 1.1.1 Add Debian package config

4
Lora-Map/Server.cs
View File

@ -81,7 +81,9 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
} else { } else {
this.cameras.Add(cameraid, new Camera(d)); this.cameras.Add(cameraid, new Camera(d));
} }
} else if((Crowd.CheckJsonCrowdDensityLocal(d) || Crowd.CheckJsonFightingDetection(d) || Crowd.CheckJsonFlow(d)) && ((String)e.From).Contains("camera/crowd")) { } else if((((String)e.From).Contains("sfn/crowd_density_local") && Crowd.CheckJsonCrowdDensityLocal(d)) ||
(((String)e.From).Contains("sfn/fighting_detection") && Crowd.CheckJsonFightingDetection(d)) ||
(((String)e.From).Contains("sfn/flow") && Crowd.CheckJsonFlow(d))) {
String cameraid = Crowd.GetId(d); String cameraid = Crowd.GetId(d);
if(this.crowds.ContainsKey(cameraid)) { if(this.crowds.ContainsKey(cameraid)) {
this.crowds[cameraid].Update(d); this.crowds[cameraid].Update(d);