Merged
Conversation
ac66f4b to
5f0ff7a
Compare
Collaborator
|
Hey @billyc & @frievoe97, this got messy because I accidentally rebased to main and not staging when I looked at this branch on my end, but I reset all of the files back to their staging counterparts and now there are only three files to merge: GridMap, get-latest.sh (i un-deleted that, so it shows no changes), and wasm/matsim-event-streamer/src/matsim-event-streamer.rs, which i just checked and the "changes" that are coming in are making it the same file as the one in staging. |
Brendan-Lawton
approved these changes
May 20, 2025
27b53fe to
59e782a
Compare
Collaborator
|
Ok my comment above can be ignored - I reset the branch to Friedrich's commits this morning and then added my changes so only GridMap.vue has changes. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR adds the option of defining two columns to the grid map and displaying the difference between these two columns. This can be configured via the UI and via YAML.
A second column can be defined using
secondValueColumnanddiffcan be used to specify whether the difference should be displayed or not.Example Data: test-gridmap-diff.zip