From 7924214b663680b6c186c869801dd302a4e7a22e Mon Sep 17 00:00:00 2001
From: Philip Schell <philip.schell@fit.fraunhofer.de>
Date: Wed, 3 Jul 2019 14:06:38 +0200
Subject: [PATCH] Changes to new Mqtt topic for camera density

---
 CHANGELOG                           | 1 +
 Lora-Map/Properties/AssemblyInfo.cs | 4 ++--
 Lora-Map/Server.cs                  | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 14768ce..086a2c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 * Implement #14 show description on map in tooltip on area
 ### Changes
 * Move CoordinateSharp to own Library
+* Changes to new Mqtt topic for camera density
 
 ## 1.2.7
 ### New Features
diff --git a/Lora-Map/Properties/AssemblyInfo.cs b/Lora-Map/Properties/AssemblyInfo.cs
index d1f1ad0..a46c6b2 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.7")]
-[assembly: AssemblyFileVersion("1.2.7")]
+[assembly: AssemblyVersion("1.2.8")]
+[assembly: AssemblyFileVersion("1.2.8")]
 
 /*
 * 1.1.1 Add Debian package config
diff --git a/Lora-Map/Server.cs b/Lora-Map/Server.cs
index 984dd40..29c4e88 100644
--- a/Lora-Map/Server.cs
+++ b/Lora-Map/Server.cs
@@ -81,7 +81,9 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
           } else {
             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);
           if(this.crowds.ContainsKey(cameraid)) {
             this.crowds[cameraid].Update(d);