Points are now saveable in captureRoute

This commit is contained in:
2022-02-03 20:37:26 +01:00
parent bc37abcb66
commit b4a5814ef1
2 changed files with 18 additions and 4 deletions
+14 -1
View File
@@ -78,9 +78,22 @@ CourseCorrection Navigation::getCourseCorrection() {
} }
bool Navigation::addCurrentPosToRoute() { bool Navigation::addCurrentPosToRoute() {
Point p = currentLocation(); std::cout << "Navigation::addCurrentPosToRoute 1" << std::endl;
Point p = this->currentLocation();
std::cout << "Navigation::addCurrentPosToRoute " << p.lat << " " << p.lon << std::endl;
if (!p.isValid()) { return false; } if (!p.isValid()) { return false; }
// First Point
if (this->route->getRouteInfo().totalPoints == 0) {
std::cout << "Navigation::addCurrentPosToRoute 2" << std::endl;
this->route->addPointToRoute(p);
this->lastPoint = p;
return true;
}
// Ever Point after the first
if (MIN_DISTANCE_BETWEEN_POINTS <= this->distanceBetwenn(p, this->lastPoint)) { if (MIN_DISTANCE_BETWEEN_POINTS <= this->distanceBetwenn(p, this->lastPoint)) {
std::cout << "Navigation::addCurrentPosToRoute 3" << std::endl;
this->route->addPointToRoute(p); this->route->addPointToRoute(p);
this->lastPoint = p; this->lastPoint = p;
return true; return true;
@@ -18,10 +18,11 @@ void CaptureRoute::loop() {
void CaptureRoute::runCaptureRoute() { void CaptureRoute::runCaptureRoute() {
if (Ps3.data.button.triangle) { if (Ps3.data.button.triangle) {
this->navigation->addCurrentPosToRoute(); if (this->navigation->addCurrentPosToRoute()) {
this->routeInfo.totalPoints++; this->routeInfo = navigation->getRouteInfo();
this->updateDisplay = true; this->updateDisplay = true;
} }
}
} }
bool CaptureRoute::shouldUpdate() { bool CaptureRoute::shouldUpdate() {