Add empty waypoint names to HistoryEventMapper#mapNavigationRoute as old records may not include them
#5627
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
Guardiola31337
added
bug
Revert PR mapbox/mapbox-java#1387 |
LukasPaczos
reviewed
Mar 30, 2022
libnavigation-core/src/main/java/com/mapbox/navigation/core/history/model/HistoryEventMapper.kt
Show resolved
Hide resolved
Guardiola31337
force-pushed
the
pg-history-event-mapper-waypoint-names
branch
from
b4bfddf
to
32e6622
Compare
Guardiola31337
added
the
skip changelog
LukasPaczos
reviewed
Mar 30, 2022
Comment on lines
127
to
137
| private fun addWaypointNames(response: String): String { | ||
| val gson = GsonBuilder().create() | ||
| val jsonObject = gson.fromJson(response, JsonObject::class.java) | ||
| val waypoints = jsonObject?.getAsJsonArray(WAYPOINTS_JSON_KEY) | ||
| val isNameNotIncluded = waypoints?.get(0)?.asJsonObject?.get(NAME_JSON_KEY) == null | ||
| if (isNameNotIncluded) { | ||
| waypoints?.forEachIndexed { index, _ -> | ||
| jsonObject.getAsJsonArray(WAYPOINTS_JSON_KEY) | ||
| .get(index).asJsonObject.addProperty(NAME_JSON_KEY, "") | ||
| } | ||
| } | ||
| return jsonObject.toString() | ||
| } |
There was a problem hiding this comment.
Suggested change
| private fun addWaypointNames(response: String): String { | |
| val gson = GsonBuilder().create() | |
| val jsonObject = gson.fromJson(response, JsonObject::class.java) | |
| val waypoints = jsonObject?.getAsJsonArray(WAYPOINTS_JSON_KEY) | |
| val isNameNotIncluded = waypoints?.get(0)?.asJsonObject?.get(NAME_JSON_KEY) == null | |
| if (isNameNotIncluded) { | |
| waypoints?.forEachIndexed { index, _ -> | |
| jsonObject.getAsJsonArray(WAYPOINTS_JSON_KEY) | |
| .get(index).asJsonObject.addProperty(NAME_JSON_KEY, "") | |
| } | |
| } | |
| return jsonObject.toString() | |
| } | |
| private fun addWaypointNames(response: String): String { | |
| val gson = GsonBuilder().create() | |
| val jsonObject = gson.fromJson(response, JsonObject::class.java) | |
| val waypoints = jsonObject?.getAsJsonArray(WAYPOINTS_JSON_KEY)?.map { it.asJsonObject } | |
| waypoints?.forEach { waypoint -> | |
| if (!waypoint.has(NAME_JSON_KEY)) { | |
| waypoint.addProperty(NAME_JSON_KEY, "") | |
| } | |
| } | |
| return jsonObject.toString() | |
| } |
There was a problem hiding this comment.
Simplifying this a little bit (please double check), otherwise, LGTM.
… records may not include them causing parsing issues when replaying old history files
Guardiola31337
force-pushed
the
pg-history-event-mapper-waypoint-names
branch
from
32e6622
to
581b0a2
Compare
LukasPaczos
approved these changes
Mar 30, 2022
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.
Description
Adds empty waypoint names to
HistoryEventMapper#mapNavigationRouteas old records may not include them, causing parsing issues when replaying old history files.Follow up from #5614
This mapbox/mapbox-java#1386 is not needed anymore.
cc @SiarheiFedartsou @danpat @mskurydin