Merge pull request #126 from Nikolai558/development

Releasing 2.4.1
Nikolai558 · Jan 20, 2023 · 0b6f48f · 0b6f48f
2 parents 90ff22c + 53b36c4
commit 0b6f48f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,12 @@
 # CHANGELOG
 
 ---
+- ## Version 2.4.1
+  - BUG FIX #125: Index out of bounds for AIRAC Data error.
+  - vERAM conversion to Geojson file now checks for 
+  reversed coordinates. Example: IF the start lat/lon
+  is the same as the ending of the next coordinate lat/lon.
+
 - ## Version 2.4.0
   - AIRAC Date selection now displays the AIRAC Cycle number
   - vERAM-to-GeoJSON now allows the user to select an option

diff --git a/FeBuddyLibrary/DataAccess/GeoJson.cs b/FeBuddyLibrary/DataAccess/GeoJson.cs
@@ -14,6 +14,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Security.Cryptography;
+using Newtonsoft.Json.Linq;
 
 namespace FeBuddyLibrary.DataAccess
 {
@@ -927,6 +928,9 @@ public void WriteGeoMapGeoJson(string dirPath, GeoMapSet geo)
                     }
 
                     string jsonString = JsonConvert.SerializeObject(geojson, new JsonSerializerSettings { Formatting = Formatting.Indented, NullValueHandling = NullValueHandling.Ignore });
+
+                    //jsonString = PostProcess(jsonString);
+
                     File.WriteAllText(file.FullName, jsonString);
                 }
             }
@@ -1034,7 +1038,8 @@ private List<Feature> CreateLineFeature(List<Element> elements)
                 else
                 {
                     // If start coords do NOT match end coords of previous element
-                    if (LatLonHelpers.CorrectIlleagleLon(element.StartLon).ToString() + " " + element.StartLat.ToString() != LatLonHelpers.CorrectIlleagleLon(prevElement.EndLon).ToString() + " " + prevElement.EndLat.ToString())
+                    if ((LatLonHelpers.CorrectIlleagleLon(element.StartLon).ToString() + " " + element.StartLat.ToString() != LatLonHelpers.CorrectIlleagleLon(prevElement.EndLon).ToString() + " " + prevElement.EndLat.ToString())
+                        && (LatLonHelpers.CorrectIlleagleLon(element.EndLon).ToString() + " " + element.EndLat.ToString() != LatLonHelpers.CorrectIlleagleLon(prevElement.StartLon).ToString() + " " + prevElement.StartLat.ToString()))
                     {
                         if (crossesAM)
                         {
@@ -1168,5 +1173,6 @@ private Feature CreateSymbolFeature(Element element)
             //}
             return output;
         }
+
     }
 }
diff --git a/FeBuddyWinFormUI/FeBuddyWinFormUI.csproj b/FeBuddyWinFormUI/FeBuddyWinFormUI.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>FE-BUDDY</AssemblyName>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Copyright>Copyright © 2023 Nikolas Boling, Kyle Sanders</Copyright>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>FE_BUDDY_icon.ico</ApplicationIcon>

diff --git a/FeBuddyWinFormUI/WinForms/AiracDataForm.cs b/FeBuddyWinFormUI/WinForms/AiracDataForm.cs
@@ -297,13 +297,13 @@ private void Worker_StartParsingDoWork(object sender, DoWorkEventArgs e)
             {
                 Logger.LogMessage("DEBUG", "CURRENT AIRAC IS SELECTED");
 
-                GlobalConfig.airacEffectiveDate = currentAiracSelection.Text.Split('\n')[1];
+                GlobalConfig.airacEffectiveDate = currentAiracSelection.Text.Split('(')[1].Replace(")", string.Empty);
             }
             else if (nextAiracSelection.Checked)
             {
                 Logger.LogMessage("DEBUG", "NEXT AIRAC IS SELECTED");
 
-                GlobalConfig.airacEffectiveDate = nextAiracSelection.Text.Split('\n')[1];
+                GlobalConfig.airacEffectiveDate = nextAiracSelection.Text.Split('(')[1].Replace(")", string.Empty) ;
             }
 
             SetControlPropertyThreadSafe(processingDataLabel, "Text", "Downloading FAA Data");

diff --git a/FeBuddyWinFormUI/WinForms/GeoJsonFrom.cs b/FeBuddyWinFormUI/WinForms/GeoJsonFrom.cs
@@ -306,6 +306,9 @@ private void Worker_StartConversionDoWork(object sender, DoWorkEventArgs e)
                     geoJsonConverter.WriteCombinedGeoMapGeoJson(GlobalConfig.outputDirBase, geo);
                 }
             }
+
+            // Do Post processing of geojson here (combine features in feature collection if the features have lat/lon that should be combined.
+            // this is to handle for reversed start lat/lon and end lat/lon elements inside the veram xml.
         }
 
         private void Worker_StartParsingCompleted(object sender, RunWorkerCompletedEventArgs e)

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -4,8 +4,6 @@
 The following is a list of features that we are considering or actively working on in priority order.
 
 ---
-- [ ] vERAM-to-GeoJSON option to group by attributes.
-  - Refer to issue: https://github.com/Nikolai558/FE-BUDDY/issues/113
 
 - [ ] SCT2-to-GeoJSON
   - Reference: https://fetools.bvartcc.com/
@@ -64,6 +62,15 @@ The following is a list of features that we are considering or actively working
   - [GeoMap converter](https://github.com/justinshannon/geo-map-converter)
     - Word is that the FAA may have changed their format of GeoMaps so this guy's may not work anymore.
 
+- [ ] Alias management
+  - Refer to issue: https://github.com/Nikolai558/FE-BUDDY/issues/121
+
+- [ ] vNAS API
+  - Refer to issue: https://github.com/Nikolai558/FE-BUDDY/issues/122
+
+- [ ] Facility Admin Tools
+  - Refer to issue: https://github.com/Nikolai558/FE-BUDDY/issues/123
+
 - [ ] Create more resources to complement the vNAS system.
   - This will require more time to see what resources wohld actually be useful.