Merge pull request #34 from vatsimhk/dev

v2.0.2

Author: EightSmart

AT3/AT3Tags.cpp

@@ -7,6 +7,8 @@
 #include <array>
 #include <chrono>
 #include <ctime>
+#include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
 
 using namespace EuroScopePlugIn;
 
@@ -671,7 +673,6 @@ string AT3Tags::GetRouteCodeLine4(CFlightPlan& FlightPlan, CRadarTarget& RadarTa
 	string spadCurrent = FlightPlan.GetControllerAssignedData().GetScratchPadString();
 	string flightStrip = FlightPlan.GetControllerAssignedData().GetFlightStripAnnotation(3);
 	string runway = FlightPlan.GetFlightPlanData().GetArrivalRwy();
-	string fpRoute = FlightPlan.GetFlightPlanData().GetRoute();
 	string lineStr;
 
 	size_t startContainer = flightStrip.find("/R/");
@@ -685,6 +686,18 @@ string AT3Tags::GetRouteCodeLine4(CFlightPlan& FlightPlan, CRadarTarget& RadarTa
 			}
 		}
 		else if (arptSet.find(FlightPlan.GetFlightPlanData().GetDestination()) != arptSet.end() && strlen(FlightPlan.GetFlightPlanData().GetArrivalRwy()) != 0) {
+
+			// resolve flightplan route and remove stepclimb info to avoid the interference
+			vector<string> route = split(FlightPlan.GetFlightPlanData().GetRoute(), ' ');
+			string fpRoute = "";
+			for (std::size_t i = 0; i < route.size(); i++) {
+				if (i != 0 && i != route.size()) {
+					route[i] = route[i].substr(0, route[i].find_first_of('/'));
+				}
+				boost::to_upper(route[i]);
+				fpRoute = fpRoute + route[i] + " ";
+			}
+
 			for (auto& rte : rteJson[FlightPlan.GetFlightPlanData().GetDestination()][runway.substr(0, 2)]["routes"].items()) { //matches exact route only for auto assigning route code
 				if (fpRoute.find(rte.value()["route"]) != string::npos) {
 					lineStr = rte.key();
@@ -734,11 +747,14 @@ string AT3Tags::GetAPPDEPLine4(CFlightPlan& FlightPlan, CRadarTarget& RadarTarge
 		}
 	}
 	else if (arptSet.find(FlightPlan.GetFlightPlanData().GetDestination()) != arptSet.end() && strlen(FlightPlan.GetFlightPlanData().GetArrivalRwy()) != 0) {
-		string app = GetAvailableApps(FlightPlan.GetFlightPlanData().GetDestination(), FlightPlan.GetFlightPlanData().GetArrivalRwy())[0]; //selects default app if no assignment, which is [0]
-		if (app.find("_") != string::npos) {
-			lineStr = app.substr(0, app.find("_"));
-			string spadItem = "/A/" + app + "/A//";
-			FlightPlan.GetControllerAssignedData().SetFlightStripAnnotation(2, spadItem.c_str());
+		vector<string> appsVec = GetAvailableApps(FlightPlan.GetFlightPlanData().GetDestination(), FlightPlan.GetFlightPlanData().GetArrivalRwy());
+		if (appsVec.size() > 0) {
+			string app = appsVec[0]; //selects default app if no assignment, which is [0]
+			if (app.find("_") != string::npos) {
+				lineStr = app.substr(0, app.find("_"));
+				string spadItem = "/A/" + app + "/A//";
+				FlightPlan.GetControllerAssignedData().SetFlightStripAnnotation(2, spadItem.c_str());
+			}
 		}
 	}
 
@@ -769,11 +785,14 @@ string AT3Tags::GetAMCLine4(CFlightPlan& FlightPlan, CRadarTarget& RadarTarget)
 		}
 	}
 	else if (arptSet.find(FlightPlan.GetFlightPlanData().GetDestination()) != arptSet.end() && strlen(FlightPlan.GetFlightPlanData().GetArrivalRwy()) != 0) {
-		string app = GetAvailableApps(FlightPlan.GetFlightPlanData().GetDestination(), FlightPlan.GetFlightPlanData().GetArrivalRwy())[0]; //selects default app if no assignment, which is [0]
-		if (app.find("_") != string::npos) {
-			lineStr = app.substr(0, app.find("_"));
-			string spadItem = "/A/" + app + "/A//";
-			FlightPlan.GetControllerAssignedData().SetFlightStripAnnotation(2, spadItem.c_str());
+		vector<string> appsVec = GetAvailableApps(FlightPlan.GetFlightPlanData().GetDestination(), FlightPlan.GetFlightPlanData().GetArrivalRwy());
+		if (appsVec.size() > 0) {
+			string app = appsVec[0]; //selects default app if no assignment, which is [0]
+			if (app.find("_") != string::npos) {
+				lineStr = app.substr(0, app.find("_"));
+				string spadItem = "/A/" + app + "/A//";
+				FlightPlan.GetControllerAssignedData().SetFlightStripAnnotation(2, spadItem.c_str());
+			}
 		}
 	}
 

AT3/AT3Tags.hpp

@@ -11,6 +11,8 @@
 #include "MAESTROapi.h"
 #include <chrono>
 #include <ctime>
+#include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
 
 using namespace std;
 using namespace EuroScopePlugIn;
@@ -95,4 +97,20 @@ class AT3Tags :
 	COLORREF colorAssumed;
 	COLORREF colorNotAssumed;
 	COLORREF colorRedundant;
+
+private:
+	template <typename Out>
+	void split(const string& s, char delim, Out result) {
+		istringstream iss(s);
+		string item;
+		while (getline(iss, item, delim)) {
+			*result++ = item;
+		}
+	}
+
+	vector<string> split(const string& s, char delim) {
+		vector<string> elems;
+		split(s, delim, back_inserter(elems));
+		return elems;
+	}
 };

Constant.hpp

@@ -3,7 +3,7 @@
 #include <gdiplus.h>
 
 #define MY_PLUGIN_NAME      "HKCP"
-#define MY_PLUGIN_VERSION   "2.0.1"
+#define MY_PLUGIN_VERSION   "2.0.2"
 #define MY_PLUGIN_DEVELOPER "HKvACC, Jan Fries, Hendrik Peter, Sven Czarnian"
 #define MY_PLUGIN_COPYRIGHT "GPL v3"
 #define MY_PLUGIN_VIEW_AVISO  "Hong Kong Controller Plugin"

MissedApproach/MissedApproachAlarm.cpp

@@ -476,11 +476,11 @@ void MissedApproachAlarm::OnFlightPlanControllerAssignedDataUpdate(CFlightPlan F
 			}
 		}
 
-		// Trigger alarm (APP)
+		// Clear Scratchpad
 		scratchPadString.erase(0, strlen("MISAP_"));
 		controllerData.SetScratchPadString(scratchPadString.c_str());
 
-		// Don't add to vector unless runway is selected and active
+		// Don't Trigger alarm (APP) unless runway is selected and active
 		if (find(activeMAPPRunways.begin(), activeMAPPRunways.end(), data.GetArrivalRwy()) == activeMAPPRunways.end()) return;
 		missedAcftData.push_back(FlightPlan.GetCallsign());
 		missedAcftData.push_back(data.GetDestination());

MissedApproach/MissedApproachPlugin.cpp

@@ -52,11 +52,10 @@ void MissedApproachPlugin::ackMissedApproach(const char* callsign) {
 	data = fpl.GetFlightPlanData();
 	controllerData = fpl.GetControllerAssignedData();
 
-	string buf = controllerData.GetScratchPadString();
-	buf.append("MISAP-ACK_");
+	string buf = "MISAP-ACK_";
 	buf.append(myself.GetPositionId());
+	buf.append(controllerData.GetScratchPadString());
 	controllerData.SetScratchPadString(buf.c_str());
-	//couldn't find it, handle error
 }
 
 void MissedApproachPlugin::resetMissedApproach(const char* callsign) {
@@ -118,5 +117,6 @@ bool MissedApproachPlugin::matchArrivalAirport(const char* arrivalArpt) {
 }
 
 string MissedApproachPlugin::checkForAck(string scratchPadString) {
-	return scratchPadString.substr(10, 2);
+	auto it = scratchPadString.find("MISAP-ACK_");
+	return scratchPadString.substr(it + 10, 2);
 }