Merge branch 'sid_allocation_update'

Fixes service-desk#48

Author: Epse

BeluxPlugin/BeluxGatePlanner.cpp

@@ -30,7 +30,7 @@ void BeluxGatePlanner::parse_json(std::string const& data) {
 				const std::string callsign = entry.key();
 				const std::string gate = std::string(entry.value().as_string());
 				BeluxGateEntry gate_entry(callsign, airport, gate);
-				if (this->gate_list.find(callsign) != this->gate_list.end())
+				if (this->gate_list.contains(callsign))
 				{
 					gate_entry.gate_has_changed = this->gate_list.at(callsign).gate != gate;
 				}

BeluxPlugin/BeluxPlugin.cpp

@@ -55,7 +55,7 @@ BeluxPlugin::BeluxPlugin(void) : CPlugIn(EuroScopePlugIn::COMPATIBILITY_CODE, MY
 	});
 
 	getActiveRunways();
-	procedureAssigner->set_departure_runways(activeDepRunways);
+	procedureAssigner->set_runways(&activeDepRunways, &activeArrRunways);
 	if (procedureAssigner->setup_lara() < 1)
 	{
 		printMessage("SID", "Could not parse LARA");
@@ -252,10 +252,10 @@ void BeluxPlugin::ProcessFlightPlans()
 			procedureAssigner->process_flight_plan(fp, force_new_procedure);
 		}
 
-		if (activeAirports.find(dep_airport) == activeAirports.end() // IF Not found in belux airport list
+		if (!activeAirports.contains(dep_airport)
 			|| !fp.IsValid() || !fp.GetCorrelatedRadarTarget().IsValid()
 			// OR flightplan has not been loaded/correleted correctly?
-			|| processed->find(callsign) != processed->end() // OR was already processed
+			|| processed->contains(callsign)
 			|| (strcmp(fp.GetTrackingControllerId(), "") != 0 && !fp.GetTrackingControllerIsMe())
 			// OR aircraft is tracked (with exception of aircraft tracked by current controller)
 			|| fp.GetCorrelatedRadarTarget().GetGS() > 5 // OR moving: Ground speed > 5knots
@@ -392,7 +392,7 @@ void BeluxPlugin::OnTimer(int Counter)
 void BeluxPlugin::OnAirportRunwayActivityChanged(void)
 {
 	getActiveRunways();
-	procedureAssigner->set_departure_runways(activeDepRunways);
+	procedureAssigner->set_runways(&activeDepRunways, &activeArrRunways);
 	procedureAssigner->reprocess_all();
 }
 
@@ -475,7 +475,7 @@ void BeluxPlugin::OnGetTagItem(CFlightPlan FlightPlan, CRadarTarget RadarTarget,
 			break;
 		{
 			const string cs = FlightPlan.GetCallsign();
-			if (gatePlanner.gate_list.find(cs) != gatePlanner.gate_list.end())
+			if (gatePlanner.gate_list.contains(cs))
 			{
 				if (gatePlanner.gate_list[cs].color != NULL)
 				{
@@ -597,7 +597,7 @@ void BeluxPlugin::getActiveRunways()
 	     rwy = SectorFileElementSelectNext(rwy, SECTOR_ELEMENT_RUNWAY))
 	{
 		const auto ad_name = boost::trim_copy(string(rwy.GetAirportName()));
-		if (active_airports.find(ad_name) == active_airports.end())
+		if (!active_airports.contains(ad_name))
 		{
 			continue; // Inactive AD
 		}

BeluxPlugin/BeluxPlugin.hpp

@@ -51,34 +51,34 @@ class BeluxPlugin :
 public:
 	BeluxPlugin();
 	virtual ~BeluxPlugin();
-	virtual void BeluxPlugin::OnNewMetarReceived(const char* sStation, const char* sFullMetar);
-	virtual void BeluxPlugin::OnFlightPlanFlightPlanDataUpdate(CFlightPlan FlightPlan);
-	virtual void BeluxPlugin::OnFlightPlanDisconnect(CFlightPlan FlightPlan);
-	virtual void BeluxPlugin::OnGetTagItem(EuroScopePlugIn::CFlightPlan FlightPlan, EuroScopePlugIn::CRadarTarget RadarTarget, int ItemCode, int TagData, char sItemString[16], int* pColorCode, COLORREF* pRGB, double* pFontSize);
-	virtual void BeluxPlugin::OnFunctionCall(int FunctionId, const char* sItemString, POINT Pt, RECT Area);
-	virtual bool BeluxPlugin::OnCompileCommand(const char* sCommandLine);
-	virtual void BeluxPlugin::OnTimer(int Counter);
-	virtual void BeluxPlugin::OnAirportRunwayActivityChanged(void);
+	virtual void OnNewMetarReceived(const char* sStation, const char* sFullMetar);
+	virtual void OnFlightPlanFlightPlanDataUpdate(CFlightPlan FlightPlan);
+	virtual void OnFlightPlanDisconnect(CFlightPlan FlightPlan);
+	virtual void OnGetTagItem(EuroScopePlugIn::CFlightPlan FlightPlan, EuroScopePlugIn::CRadarTarget RadarTarget, int ItemCode, int TagData, char sItemString[16], int* pColorCode, COLORREF* pRGB, double* pFontSize);
+	virtual void OnFunctionCall(int FunctionId, const char* sItemString, POINT Pt, RECT Area);
+	virtual bool OnCompileCommand(const char* sCommandLine);
+	virtual void OnTimer(int Counter);
+	virtual void OnAirportRunwayActivityChanged(void);
 
 
 protected:
-	string BeluxPlugin::GetHttpsRequest(string host, string uri, string request, bool expect_long_json);
-	string BeluxPlugin::GetGateInfo();
-	string BeluxPlugin::GetAirportInfo(string airport);
-	string BeluxPlugin::GetLatestPluginVersion();
-	string BeluxPlugin::SwapGate(string callsign, string gate);
-	void BeluxPlugin::ProcessMETAR(string airport, string metar);
+	string GetHttpsRequest(string host, string uri, string request, bool expect_long_json);
+	string GetGateInfo();
+	string GetAirportInfo(string airport);
+	string GetLatestPluginVersion();
+	string SwapGate(string callsign, string gate);
+	void ProcessMETAR(string airport, string metar);
 	/**
 	 * \brief Sets all active runways in the plugin properties
 	 */
-	void BeluxPlugin::getActiveRunways();
-	void BeluxPlugin::ProcessFlightPlans();
-	void BeluxPlugin::FetchAndProcessGates();
-	void BeluxPlugin::versionCheck();
-	void BeluxPlugin::loadJSONconfig();
+	void getActiveRunways();
+	void ProcessFlightPlans();
+	void FetchAndProcessGates();
+	void versionCheck();
+	void loadJSONconfig();
 
-	void BeluxPlugin::printDebugMessage(const string& function, const string& message);
-	void BeluxPlugin::printMessage(const string& topic, const string& message);
+	void printDebugMessage(const string& function, const string& message);
+	void printMessage(const string& topic, const string& message);
 };
 
 inline static bool startsWith(const char* pre, const char* str)

BeluxPlugin/BeluxPlugin.vcxproj

@@ -99,7 +99,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>C:\Program Files %28x86%29\EuroScope\PlugInEnvironment;C:\Users\Stef\Documents\Repositories\belux-euroscope-plugin\lib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>C:\Program Files %28x86%29\EuroScope\PlugInEnvironment;C:\Users\Stef\Documents\Repositories\belux-euroscope-plugin\lib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

BeluxPlugin/BeluxUtil.cpp

@@ -130,7 +130,7 @@ string BeluxUtil::https_fetch_file(string url)
 tuple<double, double> BeluxUtil::calculate_mach(string callsign, int flightlevel, int gs, double hdg, double lat,
                                                 double lon)
 {
-	if (mach_timeout.find(callsign) == mach_timeout.end() || (get<1>(mach_timeout[callsign]) + 5) < std::time(0) &&
+	if (!mach_timeout.contains(callsign) || (get<1>(mach_timeout[callsign]) + 5) < std::time(0) &&
 		weatherdoc != NULL && !weatherdoc.HasParseError())
 	{
 		const int possibleFL_length = 17;

BeluxPlugin/BeluxUtil.hpp

@@ -47,7 +47,7 @@ class BeluxUtil
 
     static string https_fetch_file(string url);
 
-    map<string, tuple<double, double>> BeluxUtil::locations = {
+    map<string, tuple<double, double>> locations = {
         {"DVR",  {51.160,1.331}},
         {"KOK",  {51.103,2.623}},
         {"FERDI" , {50.877,3.591}},

BeluxPlugin/ProcedureAssigner.cpp

@@ -8,14 +8,13 @@
 #include <variant>
 
 bool ProcedureAssigner::should_process(const EuroScopePlugIn::CFlightPlan& flight_plan,
-                                       bool ignore_already_assigned) const
+	bool ignore_already_assigned) const
 {
 	if (flight_plan.GetClearenceFlag())
 		return false; // No reason to change it from under the ATCO
 
 	const auto adep = std::string(flight_plan.GetFlightPlanData().GetOrigin());
-	if (std::find(std::begin(airports), std::end(airports), adep) ==
-		std::end(airports))
+	if (ranges::find(airports, adep) == std::end(airports))
 		return false; // Not an airport we handle
 
 	if (!flight_plan.IsValid() || !flight_plan.GetCorrelatedRadarTarget().IsValid())
@@ -51,10 +50,10 @@ bool ProcedureAssigner::should_process(const EuroScopePlugIn::CFlightPlan& fligh
 }
 
 std::optional<std::string> ProcedureAssigner::get_runway(const EuroScopePlugIn::CFlightPlan& flight_plan,
-                                                         const std::string& sid_fix) const
+	const std::string& sid_fix) const
 {
 	const std::string origin = flight_plan.GetFlightPlanData().GetOrigin();
-	if (departure_runways->find(origin) == departure_runways->end())
+	if (!departure_runways->contains(origin))
 	{
 		return {};
 	}
@@ -69,8 +68,8 @@ std::optional<std::string> ProcedureAssigner::get_runway(const EuroScopePlugIn::
 	if (origin == "EBLG")
 	{
 		// For EBLG, we never assign 22R/04L by default
-		const bool has_04R = std::binary_search(origin_runways.begin(), origin_runways.end(), std::string("04R"));
-		const bool has_22L = std::binary_search(origin_runways.begin(), origin_runways.end(), std::string("22L"));
+		const bool has_04R = ranges::binary_search(origin_runways, std::string("04R"));
+		const bool has_22L = ranges::binary_search(origin_runways, std::string("22L"));
 
 		if (has_04R)
 			return "04R";
@@ -83,11 +82,11 @@ std::optional<std::string> ProcedureAssigner::get_runway(const EuroScopePlugIn::
 
 	// Should only get here at EBBR
 	const bool has_25R = std::binary_search(std::begin(origin_runways), std::end(origin_runways),
-	                                        std::string("25R"));
+		std::string("25R"));
 	const bool has_19 = std::binary_search(std::begin(origin_runways), std::end(origin_runways),
-	                                       std::string("19"));
+		std::string("19"));
 	const bool has_07R = std::binary_search(std::begin(origin_runways), std::end(origin_runways),
-	                                        std::string("07R"));
+		std::string("07R"));
 	const char wtc = flight_plan.GetFlightPlanData().GetAircraftWtc();
 
 	if (has_25R && has_19)
@@ -113,12 +112,13 @@ std::optional<std::string> ProcedureAssigner::get_runway(const EuroScopePlugIn::
 ProcedureAssigner::ProcedureAssigner(std::function<void(const std::string&)> printer)
 {
 	departure_runways = new std::map<std::string, std::vector<std::string>>();
+	arrival_runways = new std::map<std::string, std::vector<std::string>>();
 	debug_printer = std::move(printer);
 }
 
 // TODO: a lot of the data in this loop should really be cached between planes in one iteration...
 std::optional<SidEntry> ProcedureAssigner::process_flight_plan(const EuroScopePlugIn::CFlightPlan& flight_plan,
-                                                               bool force)
+	bool force)
 {
 	const std::string callsign = flight_plan.GetCallsign();
 
@@ -210,9 +210,10 @@ size_t ProcedureAssigner::setup_lara(bool always) const
 		lara_path += "\\TopSky\\TopSkyAreasManualAct.txt";
 		std::ifstream ifs(lara_path);
 		const std::string allocation_file((std::istreambuf_iterator<char>(ifs)),
-										  (std::istreambuf_iterator<char>()));
+			(std::istreambuf_iterator<char>()));
 		return lara_parser.parse_string(allocation_file);
-	} catch (exception &e)
+	}
+	catch (exception& e)
 	{
 		const auto msg = "Could not parse LARA, areas may be inaccurate: " + std::string(e.what());
 		debug_printer(msg);
@@ -231,14 +232,16 @@ void ProcedureAssigner::on_disconnect(const EuroScopePlugIn::CFlightPlan& flight
 		cache.erase(found);
 }
 
-void ProcedureAssigner::set_departure_runways(
-	const std::map<std::string, std::vector<std::string>>& active_departure_runways)
+void ProcedureAssigner::set_runways(
+	const std::map<std::string, std::vector<std::string>>* active_departure_runways, const std::map<std::string, std::
+	vector<std::string>>*active_arrival_runways)
 {
-	(*departure_runways) = active_departure_runways;
+	departure_runways = active_departure_runways;
+	arrival_runways = active_arrival_runways;
 	airports.erase(airports.begin(), airports.end());
 
 
-	for (const auto& [fst, snd] : active_departure_runways)
+	for (const auto& [fst, snd] : *active_departure_runways)
 	{
 		airports.insert(fst);
 	}
@@ -247,12 +250,12 @@ void ProcedureAssigner::set_departure_runways(
 }
 
 std::optional<SidEntry> ProcedureAssigner::suggest(const EuroScopePlugIn::CFlightPlan& flight_plan,
-                                                               bool ignore_already_assigned)
+	bool ignore_already_assigned)
 {
 	const std::string callsign = flight_plan.GetCallsign();
 
 	// See if we have it cached
-	if (cache.find(callsign) != cache.end())
+	if (cache.contains(callsign))
 	{
 		return cache.at(callsign);
 	}
@@ -264,7 +267,7 @@ std::optional<SidEntry> ProcedureAssigner::suggest(const EuroScopePlugIn::CFligh
 
 	typedef boost::split_iterator<std::string::const_iterator> SplitIter;
 	for (SplitIter i = boost::make_split_iterator(route_text, boost::token_finder(boost::is_space()));
-	     i != SplitIter(); ++i)
+		i != SplitIter(); ++i)
 	{
 		auto route_element = boost::copy_range<std::string>(*i);
 		for (auto& fix : sid_fixes)
@@ -303,14 +306,16 @@ std::optional<SidEntry> ProcedureAssigner::suggest(const EuroScopePlugIn::CFligh
 	// Get a tm struct for now in UTC
 	tm now;
 	gmtime_s(&now, &raw_time);
+	const auto chrono_now = std::chrono::system_clock::now();
 
 	const auto areas = lara_parser.get_active(now);
 
-	auto entry = sid_allocation.find(flight_plan_data.GetOrigin(),
-	                                       sid_fix,
-	                                       flight_plan_data.GetDestination(),
-	                                       flight_plan_data.GetEngineNumber(),
-	                                       runway, now, areas);
+	const std::string adep = flight_plan_data.GetOrigin();
+	auto entry = sid_allocation.find(adep,
+		sid_fix,
+		flight_plan_data.GetDestination(),
+		flight_plan_data.GetEngineNumber(),
+		runway, chrono_now, areas, arrival_runways->at(adep));
 	cache.insert_or_assign(callsign, entry);
 	return entry;
 }

BeluxPlugin/ProcedureAssigner.h

@@ -8,12 +8,13 @@
 #include "SidAllocation.h"
 #include "LaraParser.h"
 
-#define PREACTIVE_MINUTES 20
+constexpr int PREACTIVE_MINUTES = 20;
 
 class ProcedureAssigner
 {
 private:
-	std::map<std::string, std::vector<std::string>>* departure_runways;
+	const std::map<std::string, std::vector<std::string>>* departure_runways;
+	const std::map<std::string, std::vector<std::string>>* arrival_runways;
 	std::set<std::string> airports;
 	std::map<std::string, std::optional<SidEntry>> cache;
 	std::function<void(const std::string&)> debug_printer;
@@ -59,7 +60,7 @@ class ProcedureAssigner
 	 * \param flight_plan The disconnected flight plan
 	 */
 	void on_disconnect(const EuroScopePlugIn::CFlightPlan& flight_plan);
-	void set_departure_runways(const std::map<std::string, std::vector<std::string>>& active_departure_runways);
+	void set_runways(const std::map<std::string, std::vector<std::string>>* active_departure_runways, const std::map<std::string, std::vector<std::string>>* active_arrival_runways);
 	/**
 	 * \brief Suggests, but does not assign, a procedure for the provided flight plan, using caching.
 	 * \param flight_plan Flight plan to suggest a procedure for