to eliminate refpoints which also have lat/lon attributes

Rasbats · May 16, 2020 · 8264698 · 8264698
1 parent f581291
commit 8264698
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/src/RTZassistPanelMain.cpp b/src/RTZassistPanelMain.cpp
@@ -467,6 +467,8 @@ int RTZassistPanelMain::ExportGPX() {
 	vector<waypoint> myVectorWaypoints;
 	// end of placeholders
 
+	wxString isRefpoint;
+
 	string readFile = "dom_out.txt"; // intermediate file - make temporary?
 	vector<string> myVector;
 
@@ -484,7 +486,7 @@ int RTZassistPanelMain::ExportGPX() {
 	int c = myVector.size();
 
 	for (int z = 0; z < c; z++) {
-
+		
 		wxStringTokenizer tokenizer(myVector[z], ":");
 		while (tokenizer.HasMoreTokens())
 		{
@@ -495,6 +497,15 @@ int RTZassistPanelMain::ExportGPX() {
 				myRoute.routeName = tokenizer.GetNextToken();
 			}
 
+			myWaypoint.b_isRefpoint = false;
+
+			if (token == "tag") {
+				isRefpoint = tokenizer.GetNextToken();
+				if (isRefpoint == "refpoint") {
+					myWaypoint.b_isRefpoint = true;
+				}
+			}
+
 			if (token == "id") {
 				myWaypoint.id = tokenizer.GetNextToken();
 			}
@@ -510,8 +521,9 @@ int RTZassistPanelMain::ExportGPX() {
 			if (token == "lon") {
 
 				myWaypoint.lon = tokenizer.GetNextToken();
-				myRoute.waypoints.push_back(myWaypoint);
-
+				//
+				if(!myWaypoint.b_isRefpoint)	myRoute.waypoints.push_back(myWaypoint);   // this eliminates RTZ refpoints, which have lat/lon and could be misinterpreted as waypoints.
+				//
 			}
 		}
 	}
@@ -564,21 +576,22 @@ int RTZassistPanelMain::ExportGPX() {
 	for (int i = 0; i < waypointCount; i++) {
 
 		tinyxml2::XMLElement*m_waypoint = doc.NewElement("rtept");
-		Route->InsertEndChild(m_waypoint);
-		m_waypoint->SetAttribute("lat", myRoute.waypoints[i].lat.mb_str());
-		m_waypoint->SetAttribute("lon", myRoute.waypoints[i].lon.mb_str());
-
-		tinyxml2::XMLElement* name = doc.NewElement("name");
-		m_waypoint->InsertFirstChild(name);
-		name->SetText(myRoute.waypoints[i].name.mb_str());
-
-		tinyxml2::XMLElement* symbol = doc.NewElement("sym");
-		m_waypoint->InsertFirstChild(symbol);
-		symbol->SetText("diamond");
-
-		tinyxml2::XMLElement* type = doc.NewElement("type");
-		m_waypoint->InsertFirstChild(type);
-		type->SetText("WPT");
+
+			Route->InsertEndChild(m_waypoint);
+			m_waypoint->SetAttribute("lat", myRoute.waypoints[i].lat.mb_str());
+			m_waypoint->SetAttribute("lon", myRoute.waypoints[i].lon.mb_str());
+
+			tinyxml2::XMLElement* name = doc.NewElement("name");
+			m_waypoint->InsertFirstChild(name);
+			name->SetText(myRoute.waypoints[i].name.mb_str());
+
+			tinyxml2::XMLElement* symbol = doc.NewElement("sym");
+			m_waypoint->InsertFirstChild(symbol);
+			symbol->SetText("diamond");
+
+			tinyxml2::XMLElement* type = doc.NewElement("type");
+			m_waypoint->InsertFirstChild(type);
+			type->SetText("WPT");
 
 	}
 

diff --git a/src/RTZassistPanelMain.h b/src/RTZassistPanelMain.h
@@ -40,6 +40,7 @@ class waypoint
 	wxString id;
 	wxString name;
 	wxString lat, lon;
+	bool b_isRefpoint;
 };
 
 class route