front: adds warped map in simulation #4995
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
Codecov Report
@@ Coverage Diff @@
## dev #4995 +/- ##
============================================
- Coverage 22.03% 21.62% -0.41%
Complexity 2455 2455
============================================
Files 852 863 +11
Lines 89224 90906 +1682
Branches 2483 2494 +11
============================================
+ Hits 19658 19659 +1
- Misses 68205 69875 +1670
- Partials 1361 1372 +11
Flags with carried forward coverage won't be shown. Click here to find out more.
|
jacomyal
commented
Sep 11, 2023
clarani
reviewed
Sep 13, 2023
...plications/operationalStudies/components/SimulationResults/SpaceTimeChart/SpaceTimeChart.jsx
Show resolved
Hide resolved
clarani
requested changes
Sep 13, 2023
clarani
approved these changes
Sep 14, 2023
Details: - Lots of new utils and helpers to get a transformation that "warps" a part of the map to something straighter - Hacky GeoJSON data loading using an hidden map - Drafts a rendering of the final transformed data
Details: - Deduplicates OSM queried features - Improves rendering and data querying
Details: - Simplifies code structure - Adapts new imports rules (ie "no relative import") - WarpedMap now renders already warped data, and no more calls any data or method from the store - SimulationWarpedMap loads everything it needs from the store (current path, selected train...), handles warping the data, and gives everything to a WarpedMap
Details: - Adds utils/useAsyncMemo to simplify async data retrieving code - Moves `getSimulationHoverPositions` and related helpers from SimulationResultsMap component code to new file SimulationResultsMap/helpers to make them reusable from elsewhere - Uses those helpers to get similar trains to display in SimulationWarpedMap (after some warping magic)
Details: - Updates SpaceTimeChart so that it calls `dispatchUpdateChart` when the graph is updated. I feel like it was missing, since this `dispatchUpdateChart` is called in `drawAllTrain` so the global chart is already "somehow" synchronized with the one in SpaceTimeChart - Allows WarpedMap to be given a bounding box, in which case interactions are disabled - Updates SimulationWarpedMap so that it computes a bounding box to fit SpaceTimeChart viewport, and gives it to WarpedMap
Details: - TrainHoverPosition no more reads train, allowancesSettings and viewport from global store, and requires them in props instead (this allows showing not the selected train, and not in the main map) - Adds the proper trains in the TrainPosition that are not related to the selected train - Adapts SimulationWarpedMap, WarpedMap and SimulationResultsMap to these changes
Most of the updates are: - Adds various comments - Clarifies getWarping output naming - Fixes some comment blocks syntax
clarani
force-pushed
the
ajy/warping
branch
from
be4a7c3 to
a33c757
Compare
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.
This PR solves issue #4882 (closes #4882).
Details:
utils/useAsyncMemoto help managing asynchronous states in React componentssrc/common/Map/WarpedMapthat displays a map that is warped along a given pathgetWarping.tsis a good start to understand how the warping worksWarpedMap.tsxis a reusable isolated componentSimulationWarpedMap.tsxis a component coupled to simulation stateTrainHoverPositionto make it usable with a train that is not selected, and with a map that is not the "main" mapSimulationResultsto mount aSimulationWarpedMapnext to theSpaceTimeChartSpaceTimeChartso that it properly dispatches anupdateChartevent when the chart changes