From 31313743902af0dd4f2e1c7944d08b5493e0d894 Mon Sep 17 00:00:00 2001
From: dl2alf <dl2alf@darc.de>
Date: Mon, 3 Jan 2022 10:31:10 +0100
Subject: [PATCH] Merge V1.3.3.6 with V1.4x (2)

---
 AirScout/Properties/Settings.Designer.cs      | 24 ++++++-------
 AirScout/VersionHistory.txt                   | 36 +------------------
 .../PropagationDatabase.cs                    |  4 +--
 3 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/AirScout/Properties/Settings.Designer.cs b/AirScout/Properties/Settings.Designer.cs
index 89008ac..601f87b 100644
--- a/AirScout/Properties/Settings.Designer.cs
+++ b/AirScout/Properties/Settings.Designer.cs
@@ -2305,6 +2305,18 @@ Digital data base on the World Wide Web (URL: http://www.ngdc.noaa.gov/mgg/topo/
             }
         }
         
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public string StationsMap_OverlayElevation {
+            get {
+                return ((string)(this["StationsMap_OverlayElevation"]));
+            }
+            set {
+                this["StationsMap_OverlayElevation"] = value;
+            }
+        }
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Maidenhead locator system elvation tiles calculated by DL2ALF based on elevation " +
@@ -2683,17 +2695,5 @@ Digital data base on the World Wide Web (URL: http://www.ngdc.noaa.gov/mgg/topo/
                 this["Map_ShowDistances"] = value;
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public string StationsMap_OverlayElevation {
-            get {
-                return ((string)(this["StationsMap_OverlayElevation"]));
-            }
-            set {
-                this["StationsMap_OverlayElevation"] = value;
-            }
-        }
     }
 }
diff --git a/AirScout/VersionHistory.txt b/AirScout/VersionHistory.txt
index 295e0d8..de2b5a3 100644
--- a/AirScout/VersionHistory.txt
+++ b/AirScout/VersionHistory.txt
@@ -1,38 +1,4 @@
-2021-xx-xx: V1.4.1.0
-====================
-
-- Bugfix:  RIT on rig is reset when tracking started --> fixed
-- Bugfix:  Exceptions while accessing elevation database from background processes and more than one elevation model was ticked --> database status shows "Error" --> fixed
-- Bugfix:  Exceptions while accessing elevation database and local obstructions have NULL values --> fixed
-- Bugfix:  Database update was not started when last status was "Error" and no other changes occured
-- Bugfix:  Exceptions were thrown sometimes on concurrent database access from different threads, missing database locks --> fixed
-- Feature: configurable update rate for tracking
-- Feature: configurable time offset for tracking
-- Feature: optional show a locator grid on map
-- Feature: optional show distance circles around own location
-
-2021-04-13: V1.4.0.2
-====================
-
-- Feature: complete rework of tracking module with Status visualization
-- Feature: CAT now handles OmniRi V1.19 or V2.x dynamically
-- Feature: refined extrapolation of plane positions
-- Bugfix:  Planes were shown as hot when crossing path "behind" the DX station --> fixed
-
-2021-04-5: V1.4.0.1 
-====================
-
-- Feature:	introducing CAT Interface with OmniRig V2.1
-- Feature:	introducing Doppler shift compensation with CAT
-
-2021-xx-xx: V1.4.0.0 (not published)
-====================
-
-- Feature:	introducing ASTER Digital Elevation Model covering earth surface almost complete, but data are very raw and have to filtered, only useful when coverage > 60° needed
-- Feature:	new OpenTopoMap provider, not really suitable for supervising aircraft travel but has very nice contour levels (based on SRTM)
-- Feature:	adjust main map opacity via "Options/Map" which is helpful in case map colors are very prominent
-
-2021-12-23: V1.3.3.6
+2021-12-23: V1.3.3.6
 ====================
 
 - Feature:  Elevation grid overlay on "Optionms/Stations/Map" to better understand elevation resolution issues and local situation (for zoom levels >= 17)
diff --git a/ScoutBase/ScoutBase.Propagation/PropagationDatabase.cs b/ScoutBase/ScoutBase.Propagation/PropagationDatabase.cs
index f5d004f..e210e58 100644
--- a/ScoutBase/ScoutBase.Propagation/PropagationDatabase.cs
+++ b/ScoutBase/ScoutBase.Propagation/PropagationDatabase.cs
@@ -534,9 +534,9 @@ namespace ScoutBase.Propagation
             // return null if elevation path is null for whatever reason
             if (ep == null)
                 return null;
-//            using (StreamWriter sw = new StreamWriter(File.OpenWrite("propagation.csv")))
+            //            using (StreamWriter sw = new StreamWriter(File.OpenWrite("propagation.csv")))
             {
-//                sw.WriteLine("i;dist1;dist2;f1c1;f1c2;elv;eps1;eps1_min;eps2;eps2_min");
+            //                sw.WriteLine("i;dist1;dist2;f1c1;f1c2;elv;eps1;eps1_min;eps2;eps2_min");
                 for (int i = 0; i < ep.Count; i++)
                 {
                     double dist1 = i * stepwidth / 1000.0;