[1.3.0] New Gateway

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelogs
 
+## 1.3.0 - New Gateway
+### New Features
+* Implement Lora-Gateway-Data 1.1.0 Format
+### Bugfixes
+### Changes
+* Refactoring
+* Make requests.conf not needed anymore.
+
 ## 1.2.10
 ### New Features
 * Posibility to display sensor data on map

Lora-Map/Lora-Map.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
@@ -10,32 +10,34 @@
  <Description>Displays Items with Coordinates from Mqtt on a Map</Description>
  <Company>Fraunhofer FIT</Company>
  <PackageId>LoraMap.IoT.Fit.Fraunhofer</PackageId>
- <Copyright>Copyright © Fraunhofer FIT, BlubbFish 2018 - 11.12.2019</Copyright>
+ <Copyright>Copyright © Fraunhofer FIT, BlubbFish 2018 - 20.01.2020</Copyright>
  <Authors>BlubbFish</Authors>
- <Version>1.2.10</Version>
+ <Version>1.3.0</Version>
  <PackageLicenseFile>LICENSE</PackageLicenseFile>
  <PackageProjectUrl>https://github.com/MONICA-Project/lora-map</PackageProjectUrl>
  <RepositoryUrl>https://github.com/MONICA-Project/lora-map.git</RepositoryUrl>
  <RepositoryType>git</RepositoryType>
  <NeutralLanguage>de-DE</NeutralLanguage>
- <PackageReleaseNotes>1.2.10 Refactoring is the thing
-1.2.9 The PüMa Release
-1.2.8 Improving the UI
-1.2.7 Reorganise a lot of things, add Support for Cameradata
-1.2.6 New Types of marker for person
-1.2.5 Set textsize for every zoomlevel
-1.2.4 Can draw Textmarkers on the Map, use MGRS (UTM) on the Map
-1.2.3 #9 display polygons and marker on the map
-1.2.2 Bugfix, if only recieve panic packet with gps data, update the marker on the map also
-1.2.1 #6 Load the map from the Device
-1.2.0 #4 Possible to Ex and Import Setting
-1.1.7 #8 Editor for Names
-1.1.6 #5 Create admin area
-1.1.5 Add support for alert button
-1.1.4 #3 Create icons for devices
-1.1.3 #1 Click on icon and show details
-1.1.2 #2 Show versions number in Site
-1.1.1 Add Debian package config</PackageReleaseNotes>
+ <PackageReleaseNotes>
+ 1.3.0 New Gateway
+ 1.2.10 Refactoring is the thing
+ 1.2.9 The PüMa Release
+ 1.2.8 Improving the UI
+ 1.2.7 Reorganise a lot of things, add Support for Cameradata
+ 1.2.6 New Types of marker for person
+ 1.2.5 Set textsize for every zoomlevel
+ 1.2.4 Can draw Textmarkers on the Map, use MGRS (UTM) on the Map
+ 1.2.3 #9 display polygons and marker on the map
+ 1.2.2 Bugfix, if only recieve panic packet with gps data, update the marker on the map also
+ 1.2.1 #6 Load the map from the Device
+ 1.2.0 #4 Possible to Ex and Import Setting
+ 1.1.7 #8 Editor for Names
+ 1.1.6 #5 Create admin area
+ 1.1.5 Add support for alert button
+ 1.1.4 #3 Create icons for devices
+ 1.1.3 #1 Click on icon and show details
+ 1.1.2 #2 Show versions number in Site
+ 1.1.1 Add Debian package config</PackageReleaseNotes>
  <PackageTags>lora mqtt map lagekarte</PackageTags>
  <StartupObject>Fraunhofer.Fit.IoT.LoraMap.Program</StartupObject>
  </PropertyGroup>
@@ -59,9 +61,6 @@
  </ItemGroup>
 
  <ItemGroup>
- <None Update="config-example\requests.conf.example">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
  <None Update="config-example\settings.conf.example">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>

Lora-Map/Program.cs

@@ -12,16 +12,11 @@ class Program {
  _ = Console.ReadLine();
  return;
  }
- if(!InIReader.ConfigExist("requests")) {
- Helper.WriteError("requests.ini not found!");
- _ = Console.ReadLine();
- return;
- }
  InIReader ini = InIReader.GetInstance("settings");
  Dictionary<String, String> backenddata = ini.GetSection("mqtt");
  backenddata.Add("topic", "lora/#;camera/#;sfn/#");
  ADataBackend b = (ADataBackend)ABackend.GetInstance(backenddata, ABackend.BackendType.Data);
- _ = new Server(b, ini.GetSection("webserver"), InIReader.GetInstance("requests"));
+ _ = new Server(b, ini.GetSection("webserver"));
  }
  }
 }

Lora-Map/Server.cs

@@ -31,7 +31,7 @@ class Server : Webserver {
  private readonly Object lockDensy = new Object();
  private readonly Object lockSensor = new Object();
 
- public Server(ADataBackend backend, Dictionary<String, String> settings, InIReader requests) : base(backend, settings, requests) {
+ public Server(ADataBackend backend, Dictionary<String, String> settings) : base(backend, settings, null) {
  this.logger.SetPath(settings["loggingpath"]);
  this.CheckJsonFiles();
  this.admin = new AdminModel(settings);