Changed ICAO Airlines file loading logic to cover GNG usecase

vSMR/CallsignLookup.cpp

@@ -5,8 +5,10 @@
 // CCallsignLookup Class by Even Rognlien, used with permission
 //
 
-CCallsignLookup::CCallsignLookup(std::string fileName) {
+CCallsignLookup::CCallsignLookup() {}
 
+void CCallsignLookup::readFile(string fileName)
+{
 
 	ifstream myfile;
 

vSMR/CallsignLookup.hpp

@@ -14,7 +14,8 @@ class CCallsignLookup
 
 public:
 
-	CCallsignLookup(string fileName);
+	CCallsignLookup();
+	void readFile(string fileName);
 	string getCallsign(string airlineCode);
 
 	~CCallsignLookup();

vSMR/SMRRadar.cpp

@@ -61,23 +61,29 @@ CSMRRadar::CSMRRadar()
 	ConfigPath = DllPath + "\\vSMR_Profiles.json";
 
 	Logger::info("Loading callsigns");
-	// Loading up the callsigns for the bottom line
-	// Search for ICAO airlines file if it already exists (usually given by the VACC)
-	string AirlinesPath = DllPath;
-	for (int i = 0; i < 3; ++i) {
-		AirlinesPath = AirlinesPath.substr(0, AirlinesPath.find_last_of("/\\"));
-	}
-	AirlinesPath += "\\ICAO\\ICAO_Airlines.txt";
 
-	ifstream f(AirlinesPath.c_str());
+	// Creating the RIMCAS instance
+	if (Callsigns == nullptr)
+		Callsigns = new CCallsignLookup();
+
+	// We can look in three places for this file:
+	// 1. Within the plugin directory
+	// 2. In the ICAO folder of a GNG package
+	// 3. In the working directory of EuroScope
+	fs::path possible_paths[3];
+	possible_paths[0] = fs::path(DllPath) / fs::path("ICAO_Airlines.txt");
+	possible_paths[1] = fs::path(DllPath).parent_path().parent_path() / fs::path("ICAO") / fs::path("ICAO_Airlines.txt");
+	possible_paths[2] = fs::path(DllPath).parent_path().parent_path().parent_path() / fs::path("ICAO") / fs::path("ICAO_Airlines.txt");
+
+	for (auto p : possible_paths) {
+		Logger::info("Trying to read callsigns from: " + p.string());
+		if (fs::exists(p)) {
+			Logger::info("Found callsign file!");
+			Callsigns->readFile(p.string());
 
-	if (f.good()) {
-		Callsigns = new CCallsignLookup(AirlinesPath);
-	}
-	else {
-		Callsigns = new CCallsignLookup(DllPath + "\\ICAO_Airlines.txt");
-	}
-	f.close();
+			break;
+		}
+	};
 
 	Logger::info("Loading RIMCAS & Config");
 	// Creating the RIMCAS instance

vSMR/SMRRadar.hpp

@@ -18,11 +18,13 @@
 #include <thread>
 #include "ColorManager.h"
 #include "Logger.h"
+#include <filesystem>
+#include <iostream>
 
 using namespace std;
 using namespace Gdiplus;
 using namespace EuroScopePlugIn;
-
+namespace fs = std::filesystem;
 
 namespace SMRSharedData
 {
@@ -79,7 +81,7 @@ class CSMRRadar :
 	char DllPathFile[_MAX_PATH];
 	string DllPath;
 	string ConfigPath;
-	CCallsignLookup * Callsigns;
+	CCallsignLookup * Callsigns = nullptr;
 	CColorManager * ColorManager;
 
 	map<string, bool> ShowLists;

vSMR/vSMR.vcxproj

@@ -14,6 +14,7 @@
     <ProjectGuid>{6DE02EC4-F0B1-4BA2-AED5-D261FEC4D758}</ProjectGuid>
     <RootNamespace>vSMR</RootNamespace>
     <Keyword>MFCDLLProj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -67,6 +68,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -99,6 +101,7 @@
       <AdditionalIncludeDirectories>..\lib\include</AdditionalIncludeDirectories>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -187,4 +190,4 @@
       <UserProperties RESOURCE_FILE="vSMR.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>