Adapted departure RWY detection to attempt matching against active ES RWYs

If no active RWY is provided by EuroScope (e.g. a SID is not available for the active RWYs), DelHel now attempts to find matching SIDs for the currently active RWYs

Author: MorpheusXAUT

DelHel/CDelHel.cpp

@@ -53,7 +53,7 @@ bool CDelHel::OnCompileCommand(const char* sCommandLine)
 	if (starts_with(args[0], ".delhel")) {
 		if (args.size() == 1) {
 			std::ostringstream msg;
-			msg << "Version " << PLUGIN_VERSION << " loaded. Available commands: auto, debug, nap, reload, reset, update";
+			msg << "Version " << PLUGIN_VERSION << " loaded. Available commands: auto, debug, nap, reload, reset, update, rflblw, logminmaxrfl, minmaxrfl, flash";
 
 			this->LogMessage(msg.str());
 
@@ -434,25 +434,28 @@ void CDelHel::ReadAirportConfig()
 				continue;
 			}
 
-			for (auto& [rwy, jsi] : jrwys.items()) {
+			std::ostringstream rrs;
+			rrs << icao << "\\/(";
+			for (auto it = jrwys.items().begin(); it != jrwys.items().end(); ++it) {
 				sidinfo si{
-					rwy, // rwy
-					jsi.value<std::string>("dep", ""), // dep
-					jsi.value<std::string>("nap", "") // nap
+					it.key(), // rwy
+					it.value().value<std::string>("dep", ""), // dep
+					it.value().value<std::string>("nap", "") // nap
 				};
 
 				s.rwys.emplace(si.rwy, si);
-				ap.rwys.insert(si.rwy);
-			}
-
-			ap.sids.emplace(wp, s);
+				ap.rwys.emplace(si.rwy, false);
 
-			std::ostringstream rrs;
-			rrs << icao << "\\/(";
-			std::copy(ap.rwys.begin(), ap.rwys.end(), std::ostream_iterator<std::string>(rrs, "|"));
+				rrs << si.rwy;
+				if (std::next(it) != jrwys.items().end()) {
+					rrs << '|';
+				}
+			}
 			rrs << ')';
 
 			ap.rwy_regex = std::regex(rrs.str(), std::regex_constants::ECMAScript);
+
+			ap.sids.emplace(wp, s);
 		}
 
 		this->airports.emplace(icao, ap);
@@ -464,21 +467,39 @@ void CDelHel::ReadAirportConfig()
 void CDelHel::UpdateActiveAirports()
 {
 	this->SelectActiveSectorfile();
-	for (auto sfe = this->SectorFileElementSelectFirst(EuroScopePlugIn::SECTOR_ELEMENT_AIRPORT); sfe.IsValid(); sfe = this->SectorFileElementSelectNext(sfe, EuroScopePlugIn::SECTOR_ELEMENT_AIRPORT)) {
-		std::string dep = sfe.GetName();
-		to_upper(dep);
+	for (auto sfe = this->SectorFileElementSelectFirst(EuroScopePlugIn::SECTOR_ELEMENT_RUNWAY); sfe.IsValid(); sfe = this->SectorFileElementSelectNext(sfe, EuroScopePlugIn::SECTOR_ELEMENT_RUNWAY)) {
+		std::string ap = trim(sfe.GetAirportName());
+		to_upper(ap);
 
-		auto ait = this->airports.find(dep);
+		auto ait = this->airports.find(ap);
 		if (ait == this->airports.end()) {
 			continue;
 		}
 
-		ait->second.active = sfe.IsElementActive(true, 0);
+		std::string rwy = trim(sfe.GetRunwayName(0));
+		to_upper(rwy);
+
+		auto rit = ait->second.rwys.find(rwy);
+		if (rit != ait->second.rwys.end()) {
+			rit->second = sfe.IsElementActive(true, 0);
+		}
+
+		rwy = trim(sfe.GetRunwayName(1));
+		to_upper(rwy);
+
+		rit = ait->second.rwys.find(rwy);
+		if (rit != ait->second.rwys.end()) {
+			rit->second = sfe.IsElementActive(true, 1);
+		}
+
+		if (!ait->second.active) {
+			ait->second.active = sfe.IsElementActive(true, 0) || sfe.IsElementActive(true, 1);
+		}
 	}
 }
 
 
-validation CDelHel::ProcessFlightPlan(const EuroScopePlugIn::CFlightPlan& fp, bool nap, bool validateOnly)
+validation CDelHel::ProcessFlightPlan(EuroScopePlugIn::CFlightPlan& fp, bool nap, bool validateOnly)
 {
 	validation res{
 		true, // valid
@@ -617,18 +638,35 @@ validation CDelHel::ProcessFlightPlan(const EuroScopePlugIn::CFlightPlan& fp, bo
 			return res;
 		}
 
+		std::map<std::string, sidinfo>::iterator sit;
 		std::string rwy = fpd.GetDepartureRwy();
 		if (rwy == "") {
-			this->LogMessage("Failed to process flightplan, no runway assigned", cs);
+			this->LogDebugMessage("No runway assigned, attempting to pick first active runway for SID", cs);
 
-			res.valid = false;
-			res.tag = "RWY";
-			res.color = TAG_COLOR_RED;
+			for (auto [r, active] : ap.rwys) {
+				if (active) {
+					sit = sid.rwys.find(r);
+					if (sit != sid.rwys.end()) {
+						rwy = r;
+						break;
+					}
+				}
+			}
 
-			return res;
+			if (rwy == "") {
+				this->LogMessage("Failed to process flightplan, no runway assigned", cs);
+
+				res.valid = false;
+				res.tag = "RWY";
+				res.color = TAG_COLOR_RED;
+
+				return res;
+			}
+		}
+		else {
+			sit = sid.rwys.find(rwy);
 		}
 
-		auto sit = sid.rwys.find(rwy);
 		if (sit == sid.rwys.end()) {
 			this->LogMessage("Invalid flightplan, no matching SID found for runway", cs);
 
@@ -701,7 +739,6 @@ validation CDelHel::ProcessFlightPlan(const EuroScopePlugIn::CFlightPlan& fp, bo
 						for (auto wyprouit = vait->waypts.begin(); wyprouit != vait->waypts.end(); ++wyprouit) {
 							for (auto wypfpl = fpl.route.begin() + count; wypfpl != fpl.route.end(); ++wypfpl) {
 
-								this->LogDebugMessage("Looking for json-Wypt: " + *wyprouit + " comparing to fpl-Wypt: " + wypfpl->name, cs);
 								if (wypfpl->airway && wypfpl->name.rfind(*wyprouit) == 0) { // check if waypoint name is part of the airway (e.g. SID)
 
 									routecheck = true;

DelHel/CDelHel.h

@@ -55,7 +55,7 @@ class CDelHel : public EuroScopePlugIn::CPlugIn
 	void ReadAirportConfig();
 	void UpdateActiveAirports();
 
-	validation ProcessFlightPlan(const EuroScopePlugIn::CFlightPlan& fp, bool nap, bool validateOnly = false);
+	validation ProcessFlightPlan(EuroScopePlugIn::CFlightPlan& fp, bool nap, bool validateOnly = false);
 	bool CDelHel::CheckFlightPlanProcessed(const EuroScopePlugIn::CFlightPlan& fp);
 	bool IsFlightPlanProcessed(const EuroScopePlugIn::CFlightPlan& fp);
 	void AutoProcessFlightPlans();

DelHel/airport.h

@@ -13,7 +13,7 @@ struct airport {
 	int elevation;
 	bool active;
 	std::map<std::string, sid> sids;
-	std::set<std::string> rwys;
+	std::map<std::string, bool> rwys;
 	std::vector<routing> validroutes;
 	std::regex rwy_regex;
 };

DelHel/helpers.h

@@ -97,4 +97,17 @@ inline void to_upper(std::string& str)
 inline int round_to_closest(int num, int closest)
 {
 	return ((num + closest / 2) / closest) * closest;
+}
+
+inline std::string trim(const std::string& str, const std::string& charset = " \t")
+{
+	size_t begin = str.find_first_not_of(charset);
+	if (begin == std::string::npos) {
+		// Empty string or only characters from charset provided
+		return "";
+	}
+
+	size_t end = str.find_last_not_of(charset);
+
+	return str.substr(begin, end - begin + 1);
 }