Merge pull request #115 from Nikolai558/development

Ready for Release 0.8.1
Nikolai558 · Aug 4, 2021 · fce3c77 · fce3c77
2 parents cb60d68 + cf06e83
commit fce3c77
Show file tree

Hide file tree

Showing 17 changed files with 216 additions and 98 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,20 +1,31 @@
 
 ## Pre-V1.0.0
 ---
+- ## Version 0.8.1
+  - Change log on Update question will display all changes from user version and up to the latest release. 
+  - FAQ button added. This will take you to a Facts And Questions google slide.
+  - Choosing AIRAC cycle phrase/question changed.
+  - Fixed bug where program crashes if the user is not connected to the internet. 
+  - Fixed bug where program states it's complete when it really is not. This happened when a file download failed.
+  - Fixed Credit screen title. 
+  - New Functionality to FAA Chart Recal Commands
+      - Charts without computer codes will be generated with the first 5 characters (not including spaces) of the chart name. 
+  - Gather WX Station data from Vatsim
+      - This may cause issues, if so please report in issues section on github. 
+
 - ## Version 0.8.0
-- Fixed Bug #98 META File Causing Crash:
-	- If Meta File is not available, NASR2SCT will put a WARN-README.txt file in output directory.
-- Testing Update Function ( For Release of 1.0.0 ) 
+  - Fixed Bug #98 META File Causing Crash:
+    - If Meta File is not available, NASR2SCT will put a WARN-README.txt file in output directory.
+  - Testing Update Function ( For Release of 1.0.0 ) 
 
 - ## Version 0.7.9:
-- 0.7.8 was packaged incorrectly and would not allow fresh install of 0.7.8
+  - 0.7.8 was packaged incorrectly and would not allow fresh install of 0.7.8
 
 - ## Version 0.7.8:
-(WARNING) 
-   *** FRESH INSTALL OF THIS VERSION DOES NOT WORK
-- Fixed Facility Id Drop Down Alignment #92
-- Duplicate Airway Alias Commands are now put in the 'OTHER' section of the Duplicate Alias Commands Text file. #94 and #81
-- Added Dialog message box with more information when a user is updating NASR2SCT #93
+  (WARNING) *** FRESH INSTALL OF THIS VERSION DOES NOT WORK
+  - Fixed Facility Id Drop Down Alignment #92
+  - Duplicate Airway Alias Commands are now put in the 'OTHER' section of the Duplicate Alias Commands Text file. #94 and #81
+  - Added Dialog message box with more information when a user is updating NASR2SCT #93
 
 - ## Version 0.7.7:
   - NEW FEATURE, ARTCC Publication Parser. #83

diff --git a/ClassData/DataAccess/GetAptData.cs b/ClassData/DataAccess/GetAptData.cs
@@ -6,8 +6,12 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Xml.Linq;
 using System.Xml.Serialization;
 
 namespace ClassData.DataAccess
@@ -195,14 +199,26 @@ private void GetOffsetRwyText()
 
         private void ParseAndWriteWxStation(string effectiveDate)
         {
+            string wxCrossCheckFilePathIn = $"{GlobalConfig.tempPath}\\{effectiveDate}_WX-CROSSCHECK.xml";
             string filepath = $"{GlobalConfig.outputDirectory}\\VRC\\[LABELS].sct2";
-
+            
             StringBuilder sb = new StringBuilder();
             sb.AppendLine("[LABELS]");
 
+            // DEBUGING ONLY! WX STATION
+            // string debugfilepath = $"{GlobalConfig.outputDirectory}\\debug.txt";
+            // StringBuilder debugSB = new StringBuilder();
+            // debugSB.AppendLine("DEBUGING ONLY! The following weather stations would have been added the old way. But now they will not be in [LABELS].\n\n");
+
             List<string> countryCodes = new List<string> { "AS", "GU", "MP", "PR", "VI", "US" };
             string id;
-            string final; 
+            string final;
+
+            // string xml = new WebClient().DownloadString("https://w1.weather.gov/xml/current_obs/index.xml");
+            XDocument xDocSload = XDocument.Load(wxCrossCheckFilePathIn);
+            var sList = xDocSload.Root.Elements("station").Elements("station_id").Select(element => element.Value.Substring(1,3)).ToList();
+            var lList = xDocSload.Root.Elements("station").Elements("station_id").Select(element => element.Value).ToList();
+
 
             foreach (string line in File.ReadAllLines($"{GlobalConfig.tempPath}\\{effectiveDate}_WXSTATIONS.txt"))
             {
@@ -230,14 +246,32 @@ private void ParseAndWriteWxStation(string effectiveDate)
                                 {
                                     final = $"\"{line.Substring(20, 4)} {apt.Name.Replace('"', '-')}\" {GlobalConfig.CorrectLatLon(lat, true, GlobalConfig.Convert)} {GlobalConfig.CorrectLatLon(lon, false, GlobalConfig.Convert)} 11579568";
 
-                                    sb.AppendLine(final);
+                                    if (sList.Contains(id, StringComparer.OrdinalIgnoreCase) || lList.Contains(id, StringComparer.OrdinalIgnoreCase))
+                                    {
+                                        foreach (string vatsimWXLine in File.ReadLines($"{GlobalConfig.tempPath}\\{effectiveDate}_WX-VATSIM.txt"))
+                                        {
+                                            if (vatsimWXLine.Substring(0, 5).Trim() == apt.Icao)
+                                            {
+                                                sb.AppendLine(final);
+                                                //Console.WriteLine($"Added weather station for {id}");
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        // Do nothing here. This is Debuging only. WX STATION
+                                        // debugSB.AppendLine(final);
+                                    }
+
                                     break;
                                 }
                             }
                         }
                     }
                 }
             }
+            // File.WriteAllText(debugfilepath, debugSB.ToString());
 
             File.WriteAllText(filepath, sb.ToString());
             File.AppendAllText(filepath, $"\n\n\n\n\n\n");

diff --git a/ClassData/DataAccess/GetFaaMetaFileData.cs b/ClassData/DataAccess/GetFaaMetaFileData.cs
@@ -67,12 +67,33 @@ private void ParseMetaFile()
                         AmdtNum = recordData.Element("amdtnum").Value,
                         AmdtDate = recordData.Element("amdtdate").Value
                     };
-                    // - If something breaks totally move those back here. 
 
-                    //if ($"; {apt.AirportName}-{record.FAAChartName}" == "; OCEANA NAS/ APOLLO SOUCEK FIELD-RNAV (GPS) RWY 32L/R")
-                    //{
-                    //    string STOPME = "";
-                    //}
+                    if ((string.IsNullOrEmpty(record.Faanfd18) && record.ChartCode == "DP") || (string.IsNullOrEmpty(record.Faanfd18) && record.ChartCode == "STAR"))
+                    {
+                        string newFaanfd18 = "";
+
+                        if (record.ChartName.Trim().Replace(" ", string.Empty).Length <= 5)
+                        {
+                            // This apears to be redundant check. As chart name Trimed and No spaces will always be greater than 5 Chars.
+                            newFaanfd18 = record.ChartName.Trim().Replace(" ", string.Empty);
+                        }
+                        else
+                        {
+                            newFaanfd18 = record.ChartName.Trim().Replace(" ", string.Empty).Substring(0, 5);
+                        }
+
+                        newFaanfd18 += "?";
+
+                        if (record.ChartCode == "DP")
+                        {
+                            record.Faanfd18 = newFaanfd18 + "." + apt.AptIdent;
+                        }
+                        else
+                        {
+                            record.Faanfd18 = apt.AptIdent + "." + newFaanfd18;
+                        }
+                        //Console.WriteLine(apt.AptIdent + " - " + record.ChartCode + " - " + record.ChartSeq + " - " + record.ChartName);
+                    }
 
                     if (
                             record.ChartName.IndexOf("CONVERGING") == -1 &&

diff --git a/ClassData/DataAccess/GetStarDpData.cs b/ClassData/DataAccess/GetStarDpData.cs
@@ -174,16 +174,17 @@ private void WriteAlias()
 
                 if (procedures[procSeqNumber][0].ComputerCode.IndexOf("NOT ASSIGNED") != -1)
                 {
-                    // Um this might skip procedures...... Might have an issue here? We will see. 
                     continue;
                 }
                 else if (procedures[procSeqNumber][0].Type == "S")
                 {
                     currentComputerCode = procedures[procSeqNumber][0].ComputerCode.Split('.')[1].Substring(0, procedures[procSeqNumber][0].ComputerCode.Split('.')[1].Length - 1);
+                    //Console.WriteLine("S: " + currentComputerCode);
                 }
                 else if (procedures[procSeqNumber][0].Type == "D")
                 {
                     currentComputerCode = procedures[procSeqNumber][0].ComputerCode.Split('.')[0].Substring(0, procedures[procSeqNumber][0].ComputerCode.Split('.')[0].Length - 1);
+                    //Console.WriteLine("D: " + currentComputerCode);
                 }
                 else
                 {

diff --git a/ClassData/DataAccess/PublicationParser.cs b/ClassData/DataAccess/PublicationParser.cs
@@ -12,7 +12,6 @@ namespace ClassData.DataAccess
 {
     public class PublicationParser
     {
-        // TODO - Populate this list from somewhere from some how.
         public static List<string> allArtcc = GlobalConfig.allArtcc;
 
         private string outputDirectory = GlobalConfig.outputDirectory + "PUBLICATIONS";

diff --git a/ClassData/GlobalConfig.cs b/ClassData/GlobalConfig.cs
@@ -24,7 +24,7 @@ namespace NASARData
     /// </summary>
     public class GlobalConfig
     {
-        public static readonly string ProgramVersion = "0.8.0";
+        public static readonly string ProgramVersion = "0.8.1";
 
         public static string GithubVersion = "";
 
@@ -156,7 +156,9 @@ public static void DownloadAllFiles(string effectiveDate, string airacCycle, boo
                     { $"{airacCycle}_FAA_Meta.xml", $"https://aeronav.faa.gov/d-tpp/{airacCycle}/xml_data/d-tpp_Metafile.xml"},
                     { $"{effectiveDate}_FIX.zip", $"https://nfdc.faa.gov/webContent/28DaySub/{effectiveDate}/FIX.zip" },
                     { $"{effectiveDate}_NAV.zip", $"https://nfdc.faa.gov/webContent/28DaySub/{effectiveDate}/NAV.zip"},
-                    { $"{airacCycle}_TELEPHONY.html", $"https://www.faa.gov/air_traffic/publications/atpubs/cnt_html/chap3_section_2.html" }
+                    { $"{airacCycle}_TELEPHONY.html", $"https://www.faa.gov/air_traffic/publications/atpubs/cnt_html/chap3_section_2.html" },
+                    { $"{effectiveDate}_WX-CROSSCHECK.xml", $"https://w1.weather.gov/xml/current_obs/index.xml" },
+                    { $"{effectiveDate}_WX-VATSIM.txt", $"http://metar.vatsim.net/metar.php?id=all" }
                 };
             }
             else
@@ -192,7 +194,9 @@ public static void DownloadAllFiles(string effectiveDate, string airacCycle, boo
                     { $"{effectiveDate}_AWY.zip", $"https://nfdc.faa.gov/webContent/28DaySub/{effectiveDate}/AWY.zip"},
                     { $"{effectiveDate}_FIX.zip", $"https://nfdc.faa.gov/webContent/28DaySub/{effectiveDate}/FIX.zip" },
                     { $"{effectiveDate}_NAV.zip", $"https://nfdc.faa.gov/webContent/28DaySub/{effectiveDate}/NAV.zip"},
-                    { $"{airacCycle}_TELEPHONY.html", $"https://www.faa.gov/air_traffic/publications/atpubs/cnt_html/chap3_section_2.html" }
+                    { $"{airacCycle}_TELEPHONY.html", $"https://www.faa.gov/air_traffic/publications/atpubs/cnt_html/chap3_section_2.html" },
+                    { $"{effectiveDate}_WX-CROSSCHECK.xml", $"https://w1.weather.gov/xml/current_obs/index.xml" },
+                    { $"{effectiveDate}_WX-VATSIM.txt", $"http://metar.vatsim.net/metar.php?id=all" }
                 };
             }
 
@@ -203,15 +207,24 @@ public static void DownloadAllFiles(string effectiveDate, string airacCycle, boo
             {
                 foreach (string fileName in allURLs.Keys)
                 {
-                    // TODO - We may not want to keep the data. Might want to remove this and just download it anyways.
-                    // This Data will ALWAYS get removed when user clicks "START" 
-                    // This is pointless but I will keep in for debuging purposes.
-
-                    if (!File.Exists($"{tempPath}\\{fileName}"))
+                    try
+                    {
+                        if (fileName == $"{effectiveDate}_WX-CROSSCHECK.xml")
+                        {
+                            CreateCurlBatchFile("WXCROSSCHECK.bat", "https://w1.weather.gov/xml/current_obs/index.xml", fileName);
+                            ExecuteCurlBatchFile("WXCROSSCHECK.bat");
+                        }
+                        else
+                        {
+                            client.DownloadFile(allURLs[fileName], $"{tempPath}\\{fileName}");
+                        }
+                    }
+                    catch (Exception)
                     {
-                        client.DownloadFile(allURLs[fileName], $"{tempPath}\\{fileName}");
-                        DownloadedFilePaths.Add($"{tempPath}\\{fileName}");
+                        MessageBox.Show($"FAILED DOWNLOADING: \n\n{fileName}\n{allURLs[fileName]}\n\nThis program will exit.\nPlease try again.");
+                        Environment.Exit(-1);
                     }
+                    DownloadedFilePaths.Add($"{tempPath}\\{fileName}");
                 }
             }
         }
@@ -561,20 +574,20 @@ public static string CreateDecFormat(string value, bool roundSixPlaces)
             return decFormat;
         }
 
-        private static void CreateCurlBatchFile() 
+        private static void CreateCurlBatchFile(string name, string url, string outputFileName) 
         {
-            string filePath = $"{tempPath}\\getAiraccEff.bat";
+            string filePath = $"{tempPath}\\{name}";
             string writeMe = $"cd \"{tempPath}\"\n" +
-                $"curl \"https://www.faa.gov/air_traffic/flight_info/aeronav/aero_data/NASR_Subscription/\">{FaaHtmlFileVariable}_FAA_NASR.HTML";
+                $"curl \"{url}\">{outputFileName}";
             File.WriteAllText(filePath, writeMe);
         }
 
-        private static void ExecuteCurlBatchFile()
+        private static void ExecuteCurlBatchFile(string batchFileName)
         {
             ProcessStartInfo ProcessInfo;
             Process Process;
 
-            ProcessInfo = new ProcessStartInfo("cmd.exe", "/c " + $"\"{tempPath}\\getAiraccEff.bat\"");
+            ProcessInfo = new ProcessStartInfo("cmd.exe", "/c " + $"\"{tempPath}\\{batchFileName}\"");
             ProcessInfo.CreateNoWindow = true;
             ProcessInfo.UseShellExecute = false;
 
@@ -594,9 +607,9 @@ public static void GetAiracDateFromFAA()
 
             string response;
 
-            CreateCurlBatchFile();
+            CreateCurlBatchFile("getAiraccEff.bat", "https://www.faa.gov/air_traffic/flight_info/aeronav/aero_data/NASR_Subscription/", $"{FaaHtmlFileVariable}_FAA_NASR.HTML");
 
-            ExecuteCurlBatchFile();
+            ExecuteCurlBatchFile("getAiraccEff.bat");
 
             if (File.Exists($"{tempPath}\\{FaaHtmlFileVariable}_FAA_NASR.HTML")  && File.ReadAllText($"{tempPath}\\{FaaHtmlFileVariable}_FAA_NASR.HTML").Length > 10)
             {

diff --git a/ClassData/Models/AliasCheck.cs b/ClassData/Models/AliasCheck.cs
@@ -74,8 +74,6 @@ public void CheckForDuplicates(string CompleteAliasFilePath)
 
         private void WriteDupFile(List<string> DuplicateCommandsList, List<AptModel> AirportModels) 
         {
-            // TODO - Make more efficient
-
             string outFilePath = $"{GlobalConfig.outputDirectory}\\ALIAS\\DUPLICATE_COMMANDS.txt";
             string currentAirportIatta = "";
             string aptIatta;

diff --git a/ClassData/Models/MetaFileModels/MetaRecordModel.cs b/ClassData/Models/MetaFileModels/MetaRecordModel.cs
@@ -154,8 +154,8 @@ public void CreateAliasComand(string AptIata)
                                 tempRecordList[missingIndex].AliasCommand = tempRecordList[missingIndex].AliasCommand.Insert(2, tempVariant);
                             }
 
-                            // TODO - Might want to remove this
-                            File.AppendAllText($"{NASARData.GlobalConfig.tempPath}\\MisMatchingVariants.txt", $"APT IATA: {AptIata} - {tempRecordList[missingIndex].FAAChartName}\n");
+                            // Might want to remove this - This is to see MisMatchingVaarents inside the Temp File.
+                            // File.AppendAllText($"{NASARData.GlobalConfig.tempPath}\\MisMatchingVariants.txt", $"APT IATA: {AptIata} - {tempRecordList[missingIndex].FAAChartName}\n");
                         }
                     }
 

diff --git a/NASR_GUI/CreditsForm.Designer.cs b/NASR_GUI/CreditsForm.Designer.cs