Skip to content

fix for 0-byte WPTs#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jteresco merged 1 commit into from
Oct 7, 2019
Merged

fix for 0-byte WPTs #249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions siteupdate/cplusplus/classes/Route/read_wpt.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,25 +110,24 @@ void Route::read_wpt
delete[] wptdata;

// per-route datachecks

// look for hidden termini
if (point_list.front()->is_hidden) datacheckerrors->add(this, point_list.front()->label, "", "", "HIDDEN_TERMINUS", "");
if (point_list.back()->is_hidden) datacheckerrors->add(this, point_list.back()->label, "", "", "HIDDEN_TERMINUS", "");

// angle check is easier with a traditional for loop and array indices
for (unsigned int i = 1; i < point_list.size()-1; i++)
{ //cout << "computing angle for " << point_list[i-1].str() << ' ' << point_list[i].str() << ' ' << point_list[i+1].str() << endl;
if (point_list[i-1]->same_coords(point_list[i]) || point_list[i+1]->same_coords(point_list[i]))
datacheckerrors->add(this, point_list[i-1]->label, point_list[i]->label, point_list[i+1]->label, "BAD_ANGLE", "");
else { double angle = point_list[i]->angle(point_list[i-1], point_list[i+1]);
if (angle > 135)
{ sprintf(fstr, "%.2f", angle);
datacheckerrors->add(this, point_list[i-1]->label, point_list[i]->label, point_list[i+1]->label, "SHARP_ANGLE", fstr);
}
}
}

if (point_list.size() < 2) el->add_error("Route contains fewer than 2 points: " + str());
else { // look for hidden termini
if (point_list.front()->is_hidden) datacheckerrors->add(this, point_list.front()->label, "", "", "HIDDEN_TERMINUS", "");
if (point_list.back()->is_hidden) datacheckerrors->add(this, point_list.back()->label, "", "", "HIDDEN_TERMINUS", "");

// angle check is easier with a traditional for loop and array indices
for (unsigned int i = 1; i < point_list.size()-1; i++)
{ //cout << "computing angle for " << point_list[i-1].str() << ' ' << point_list[i].str() << ' ' << point_list[i+1].str() << endl;
if (point_list[i-1]->same_coords(point_list[i]) || point_list[i+1]->same_coords(point_list[i]))
datacheckerrors->add(this, point_list[i-1]->label, point_list[i]->label, point_list[i+1]->label, "BAD_ANGLE", "");
else { double angle = point_list[i]->angle(point_list[i-1], point_list[i+1]);
if (angle > 135)
{ sprintf(fstr, "%.2f", angle);
datacheckerrors->add(this, point_list[i-1]->label, point_list[i]->label, point_list[i+1]->label, "SHARP_ANGLE", fstr);
}
}
}
}
std::cout << '.' << std::flush;
//std::cout << str() << std::flush;
//print_route();
Expand Down