Merge pull request #120 from Nikolai558/development

Releasing 2.4.0

ChangeLog.md

@@ -1,6 +1,12 @@
 # CHANGELOG
 
 ---
+- ## Version 2.4.0
+  - AIRAC Date selection now displays the AIRAC Cycle number
+  - vERAM-to-GeoJSON now allows the user to select an option
+  to have all elements with identical attributes to be grouped
+  together into the same GeoJSON file.
+
 - ## Version 2.3.7
   - High and Low AWY Geomap default line style changed to Solid.
   - Roadmap and Credit buttons link changed to GitHub Development Branch.

FeBuddyLibrary/Models/GeoJsonModel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
@@ -61,6 +62,23 @@ public class Properties
         // [Text]
         public int? yOffset { get; set; } = null;
 
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            if (bcg!=null) sb.Append("__BCG " + bcg.ToString());
+            if (filters!=null) sb.Append("__Filters " + string.Join(",", filters));
+            if (size!=null) sb.Append("__Size " + size.ToString());
+            if (underline!=null) sb.Append("__Underline " + underline.ToString());
+            if (opaque!=null) sb.Append("__Opaque " + opaque.ToString());
+            if (xOffset!=null) sb.Append("__XOffset " + xOffset.ToString());
+            if (yOffset!=null) sb.Append("__YOffset " + yOffset.ToString());
+            if (zIndex != null) sb.Append("__ZIndex " + zIndex.ToString());
+            if (style != null && !string.IsNullOrEmpty(style) && !string.IsNullOrWhiteSpace(style)) sb.Append("__Style " + style);
+            if (thickness != null) sb.Append("__Thickness " + thickness.ToString());
+
+            return sb.ToString();
+    }
+
         public override bool Equals(object obj)
         {
             var other = obj as Properties;

FeBuddyLibrary/Models/XmlGeoJsonGeoMapsRootModels.cs

@@ -91,7 +91,7 @@ public class LineDefaults
 
         public override string ToString()
         {
-            return $"Line Defaults: BCG {Bcg} _ Filters {Filters} _ Style {Style} _ Thickness {Thickness}";
+            return $"Line Defaults: BCG {Bcg}__Filters {Filters}__Style {Style}__Thickness {Thickness}";
         }
     }
 
@@ -112,7 +112,7 @@ public class SymbolDefaults
 
         public override string ToString()
         {
-            return $"Symbol Defaults: BCG {Bcg} _ Filters {Filters} _ Style {Style} _ Size {Size}";
+            return $"Symbol Defaults: BCG {Bcg}__Filters {Filters}__Style {Style}__Size {Size}";
         }
 
     }
@@ -141,7 +141,7 @@ public class TextDefaults
         public int YOffset { get; set; }
         public override string ToString()
         {
-            return $"Text Defaults: BCG {Bcg} _ Filters {Filters} _ Size {Size} _ Underline {Underline} _ Opaque {Opaque} _ XOffset {XOffset} _ YOffset {YOffset}";
+            return $"Text Defaults: BCG {Bcg}__Filters {Filters}__Size {Size}__Underline {Underline}__Opaque {Opaque}__XOffset {XOffset}__YOffset {YOffset}";
         }
     }
 
@@ -164,6 +164,7 @@ public class Element : IXmlSerializable
         public int? YOffset { get; private set; } = null;
         public string Style { get; private set; } = null;
         public int? Thickness { get; private set; } = null;
+        public int? ZIndex { get; private set; } = null;
 
 
         public void ReadXml(XmlReader reader)
@@ -185,6 +186,7 @@ public void ReadXml(XmlReader reader)
             string attr15 = reader.GetAttribute("YOffset");
             string attr16 = reader.GetAttribute("Style");
             string attr17 = reader.GetAttribute("Thickness");
+            string attr18 = reader.GetAttribute("zIndex");
             reader.Read();
 
             XsiType = attr1;
@@ -204,6 +206,7 @@ public void ReadXml(XmlReader reader)
             YOffset = ConvertToNullable<int>(attr15);
             Style = attr16;
             Thickness = ConvertToNullable<int>(attr17);
+            ZIndex = ConvertToNullable<int>(attr18);
 
         }
 

FeBuddyWinFormUI/FeBuddyWinFormUI.csproj

@@ -4,8 +4,8 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>FE-BUDDY</AssemblyName>
-    <Version>2.3.7</Version>
-    <Copyright>Copyright © 2022 Nikolas Boling, Kyle Sanders</Copyright>
+    <Version>2.4.0</Version>
+    <Copyright>Copyright © 2023 Nikolas Boling, Kyle Sanders</Copyright>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>FE_BUDDY_icon.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>

FeBuddyWinFormUI/WinForms/AiracDataForm.cs

@@ -95,14 +95,14 @@ private void AiracDataForm_Closing(object sender, EventArgs e)
 
         private void CurrentAiracSelection_CheckedChanged(object sender, EventArgs e)
         {
-            currentAiracSelection.Text = GlobalConfig.currentAiracDate;
-            nextAiracSelection.Text = GlobalConfig.nextAiracDate;
+            currentAiracSelection.Text = AiracDateCycleModel.AllCycleDates[GlobalConfig.currentAiracDate] + " (" + GlobalConfig.currentAiracDate + ")";
+            nextAiracSelection.Text = AiracDateCycleModel.AllCycleDates[GlobalConfig.nextAiracDate] + " (" + GlobalConfig.nextAiracDate + ")";
         }
 
         private void NextAiracSelection_CheckedChanged(object sender, EventArgs e)
         {
-            currentAiracSelection.Text = GlobalConfig.currentAiracDate;
-            nextAiracSelection.Text = GlobalConfig.nextAiracDate;
+            currentAiracSelection.Text = AiracDateCycleModel.AllCycleDates[GlobalConfig.currentAiracDate] + " (" + GlobalConfig.currentAiracDate + ")";
+            nextAiracSelection.Text = AiracDateCycleModel.AllCycleDates[GlobalConfig.nextAiracDate] + " (" + GlobalConfig.nextAiracDate + ")";
         }
 
         private void ChooseDirButton_Click(object sender, EventArgs e)
@@ -297,13 +297,13 @@ private void Worker_StartParsingDoWork(object sender, DoWorkEventArgs e)
             {
                 Logger.LogMessage("DEBUG", "CURRENT AIRAC IS SELECTED");
 
-                GlobalConfig.airacEffectiveDate = currentAiracSelection.Text;
+                GlobalConfig.airacEffectiveDate = currentAiracSelection.Text.Split('\n')[1];
             }
             else if (nextAiracSelection.Checked)
             {
                 Logger.LogMessage("DEBUG", "NEXT AIRAC IS SELECTED");
 
-                GlobalConfig.airacEffectiveDate = nextAiracSelection.Text;
+                GlobalConfig.airacEffectiveDate = nextAiracSelection.Text.Split('\n')[1];
             }
 
             SetControlPropertyThreadSafe(processingDataLabel, "Text", "Downloading FAA Data");
@@ -456,8 +456,8 @@ private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArg
                     MessageBoxButtons.OK);
             }
 
-            currentAiracSelection.Text = GlobalConfig.currentAiracDate;
-            nextAiracSelection.Text = GlobalConfig.nextAiracDate;
+            currentAiracSelection.Text = AiracDateCycleModel.AllCycleDates[GlobalConfig.currentAiracDate] + " (" + GlobalConfig.currentAiracDate + ")";
+            nextAiracSelection.Text = AiracDateCycleModel.AllCycleDates[GlobalConfig.nextAiracDate] + " (" + GlobalConfig.nextAiracDate + ")";
 
             processingGroupBox.Visible = false;
             processingGroupBox.Enabled = false;