Skip to content
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.

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

New signal sprites system 🚦 #5166

Merged
merged 6 commits into from
Oct 20, 2023
Merged

New signal sprites system 🚦 #5166

merged 6 commits into from
Oct 20, 2023

Conversation

flomonster
Copy link
Contributor

@flomonster flomonster commented Sep 29, 2023

What is done:

  • Signals atlas is stored and handled by editoast
  • A config file specifies how match sprites with their parameters
  • Editoast is using the config file to generate its signal layer
  • Editoast handle all signaling systems
    • BAL
    • TVM
    • BAPR
  • The front uses the new atlas
  • The front uses the new system in its map style

@flomonster flomonster changed the title New signal sprites system New signal sprites system 🚦 Sep 29, 2023
@codecov
Copy link

codecov bot commented Sep 29, 2023

Codecov Report

Merging #5166 (5296048) into dev (1c0d031) will increase coverage by 0.09%.
The diff coverage is 21.39%.

@@             Coverage Diff              @@
##                dev    #5166      +/-   ##
============================================
+ Coverage     18.74%   18.84%   +0.09%     
  Complexity     2315     2315              
============================================
  Files           849      851       +2     
  Lines        103001   102677     -324     
  Branches       2403     2403              
============================================
+ Hits          19309    19346      +37     
+ Misses        82351    81990     -361     
  Partials       1341     1341              
Flag Coverage Δ
editoast 69.55% <21.42%> (-0.50%) ⬇️
front 7.16% <21.36%> (+0.06%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
editoast/src/infra_cache/mod.rs 76.58% <ø> (ø)
editoast/src/schema/mod.rs 94.02% <ø> (ø)
editoast/src/schema/sprite_config.rs 100.00% <100.00%> (ø)
editoast/src/views/mod.rs 98.43% <ø> (ø)
front/src/common/api/osrdEditoastApi.ts 91.95% <92.59%> (+<0.01%) ⬆️
editoast/src/client/mod.rs 57.14% <0.00%> (-42.86%) ⬇️
editoast/src/schema/signal.rs 69.23% <0.00%> (-5.77%) ⬇️
front/src/common/Map/WarpedMap/DataLoader.tsx 0.00% <0.00%> (ø)
...ainschedule/components/ManageTrainSchedule/Map.tsx 0.00% <0.00%> (ø)
editoast/src/tables.rs 42.74% <0.00%> (-0.35%) ⬇️
... and 10 more

... and 2 files with indirect coverage changes

@flomonster flomonster linked an issue Oct 4, 2023 that may be closed by this pull request
3 tasks
@flomonster flomonster force-pushed the fam/new-signal-sprites branch 5 times, most recently from 0094596 to 36b3c6f Compare October 11, 2023 16:59
@flomonster flomonster force-pushed the fam/new-signal-sprites branch 2 times, most recently from 698c561 to 038c23f Compare October 12, 2023 15:26
Copy link
Contributor

@leovalais leovalais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested the back only. Left a few, mostly cosmetic, comments.
Some CI tests fail. Thanks for adding the SVGs! 🚥

editoast/src/assets/signal_sprites/BAPR/sprites.json Outdated Show resolved Hide resolved
editoast/src/assets/signal_sprites/BAPR/sprites@3x.json Outdated Show resolved Hide resolved
editoast/src/assets/signal_sprites/TVM/sprites.json Outdated Show resolved Hide resolved
editoast/src/assets/signal_sprites/TVM/sprites@2x.json Outdated Show resolved Hide resolved
editoast/src/assets/signal_sprites/TVM/sprites@3x.json Outdated Show resolved Hide resolved
editoast/src/client/mod.rs Outdated Show resolved Hide resolved
editoast/src/generated_data/signal.rs Outdated Show resolved Hide resolved
editoast/src/generated_data/signal.rs Outdated Show resolved Hide resolved
@flomonster flomonster force-pushed the fam/new-signal-sprites branch 3 times, most recently from b1bad5e to 4c448e3 Compare October 19, 2023 10:08
@nicolaswurtz nicolaswurtz mentioned this pull request Oct 19, 2023
@flomonster flomonster marked this pull request as ready for review October 20, 2023 07:38
@flomonster flomonster requested review from a team as code owners October 20, 2023 07:38
@flomonster flomonster force-pushed the fam/new-signal-sprites branch 3 times, most recently from 0464f2d to a9cf0a7 Compare October 20, 2023 09:07
@flomonster flomonster merged commit ad4ac05 into dev Oct 20, 2023
8 of 9 checks passed
@flomonster flomonster deleted the fam/new-signal-sprites branch October 20, 2023 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adapt how signals are displayed
4 participants