Fix Recently Added Valhalla Alternates Serialization #2811
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gknisely
previously approved these changes
Jan 27, 2021
kevinkreiser
commented
Jan 27, 2021
|
|
||
| // for each route | ||
| for (int i = 0; i < api.directions().routes_size(); ++i) { | ||
| if (i == 1) { | ||
| writer.start_array("alternates"); | ||
| } | ||
|
|
||
| // the main route | ||
| // the route itself | ||
| writer.start_object(); |
There was a problem hiding this comment.
every route needs to be wrapped in an object { we had only one for the outer object in the response but for each of the alternates we didnt add one. this lead to json that looked like:
{
"trip": .... main route here,
"alternates": [
"trip",
{guts of alternate here},
kevinkreiser
commented
Jan 27, 2021
Comment on lines
+60
to
+69
| rapidjson::Document doc; | ||
| doc.Parse(json); | ||
| ASSERT_FALSE(doc.HasParseError()); | ||
| ASSERT_TRUE(doc.HasMember("trip")); | ||
| ASSERT_TRUE(doc.HasMember("alternates") == (num_alternates > 0)); | ||
| if (num_alternates > 0) { | ||
| for (const auto& alt : doc["alternates"].GetArray()) { | ||
| ASSERT_TRUE(alt.HasMember("trip")); | ||
| } | ||
| } |
There was a problem hiding this comment.
here we actually check that the json isnt bunk
dnesbitt61
approved these changes
Jan 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In adding #2734 we needed a way to represent alternate routes in the valhalla serializer. In the first iteration of that PR it was added while we were still using the old json serializer. Before I merged the PR though many other PRs made it into master which caused a huge merge parade. As a part of that merge process I needed to reconcile the new json serialization (using rapidjson) with the old code. I thought I had done that but infact I was wrong and there wasnt any test coverage of it. I've added test coverage in this pr and also fixed the serialization.