Display neutral section signs #6227

younesschrifi · 2023-12-27T12:40:12Z

closes /~https://github.com/osrd-project/osrd-confidential/issues/263

editoast/src/generated_data/sql/generate_neutral_sign_layer.sql

codecov · 2024-01-08T09:13:29Z

Codecov Report

Attention: 300 lines in your changes are missing coverage. Please review.

Comparison is base (4b044d0) 28.01% compared to head (16d8ae2) 28.00%.

Files	Patch %	Lines
...Map/Layers/extensions/SNCF/NeutralSectionSigns.tsx	0.00%	94 Missing and 1 partial ⚠️
...mon/Map/Layers/extensions/SNCF/NeutralSections.tsx	0.00%	60 Missing and 1 partial ⚠️
front/src/common/Map/Layers/mastLayerProps.ts	0.00%	42 Missing and 1 partial ⚠️
editoast/src/generated_data/neutral_sign.rs	60.97%	16 Missing ⚠️
editoast/src/tables.rs	11.11%	16 Missing ⚠️
front/src/common/Map/Layers/GeoJSONs.tsx	0.00%	14 Missing ⚠️
front/src/common/Map/Layers/types.ts	0.00%	12 Missing ⚠️
...src/common/Map/Layers/extensions/SNCF/PSLSigns.tsx	0.00%	9 Missing ⚠️
front/src/common/Map/Layers/Signals.tsx	0.00%	8 Missing ⚠️
...mulationResult/components/SimulationResultsMap.tsx	0.00%	5 Missing ⚠️
... and 10 more

Additional details and impacted files

@@             Coverage Diff              @@
##                dev    #6227      +/-   ##
============================================
- Coverage     28.01%   28.00%   -0.01%     
  Complexity     2170     2170              
============================================
  Files          1033     1036       +3     
  Lines        127782   127909     +127     
  Branches       2604     2606       +2     
============================================
+ Hits          35792    35817      +25     
- Misses        90474    90574     +100     
- Partials       1516     1518       +2

Flag	Coverage Δ
core	`78.53% <ø> (ø)`
editoast	`75.28% <48.43%> (-0.11%)`	⬇️
front	`8.61% <0.74%> (-0.01%)`	⬇️
gateway	`2.50% <ø> (ø)`
railjson_generator	`87.25% <100.00%> (ø)`
tests	`81.95% <ø> (ø)`

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

editoast/src/schema/neutral_section.rs

tykayn · 2024-01-26T14:43:33Z

Features display of elements, refacto of Masts in their own layer, add params to KP layer's orientation.
It is quite a big PR because we needed to have the backend and the frontend at the same time.

nicolaswurtz

@tykayn Thx for the PR.
My review is not done, I have to test it deeply, but before you can already take my comments in consideration. Thx!

front/public/locales/fr/translation.json

front/src/applications/editor/components/LayersModal.tsx

front/src/applications/editor/tools/types.ts

front/src/assets/pictures/layersicons/layer_cc_exe.svg

front/src/common/Map/Layers/extensions/SNCF/NeutralSectionsSigns.tsx

front/src/common/Map/Layers/MastLayers.tsx

editoast/src/generated_data/neutral_sign.rs

editoast/src/schema/neutral_section.rs

eckter

The python module versions need to be updated (for osrd_schemas, railjson_generator, and tests).

Other than that, LGTM on the python and core parts

front/src/applications/editor/tools/types.ts

clarani

I left some comments, feel free to text me if you don't understand one of my comments :)

front/src/common/Map/Layers/MastsLayers.tsx

front/src/common/Map/Layers/extensions/SNCF/NeutralSections.tsx

front/src/common/Map/Layers/extensions/SNCF/PSLSigns.tsx

front/src/common/Map/Layers/types.ts

front/src/reducers/osrdconf/infra_schema.json

clarani

Left some last comments 👍

front/src/common/Map/Layers/mastLayer.tsx

front/src/common/Map/Layers/KPLabel.ts

front/src/common/Map/Layers/extensions/SNCF/NeutralSectionSigns.tsx

front/src/reducers/osrdconf/infra_schema.json

clarani

code LGTM, I only need to test

clarani

Tested, every thing seems to work on the map ✅

Tguisnet

LGTM and tested !

- fix psl signs angles

- generic mast layer added

Tguisnet · 2024-02-09T13:43:44Z

close #6277

younesschrifi self-assigned this Dec 27, 2023

younesschrifi force-pushed the ble/bpcc-display-on-map branch 4 times, most recently from ff9d499 to 5d93a78 Compare January 3, 2024 13:29

Castavo reviewed Jan 4, 2024

View reviewed changes

editoast/src/generated_data/sql/generate_neutral_sign_layer.sql Outdated Show resolved Hide resolved

younesschrifi force-pushed the ble/bpcc-display-on-map branch 2 times, most recently from a8dd1a8 to fa8592c Compare January 8, 2024 09:10

Castavo reviewed Jan 8, 2024

View reviewed changes

editoast/src/schema/neutral_section.rs Outdated Show resolved Hide resolved

younesschrifi force-pushed the ble/bpcc-display-on-map branch from 506c45d to 016b9ee Compare January 15, 2024 14:42

younesschrifi force-pushed the ble/bpcc-display-on-map branch from fd4afe1 to 3fe7405 Compare January 22, 2024 16:24

tykayn force-pushed the ble/bpcc-display-on-map branch from 2dcff69 to 635dd28 Compare January 24, 2024 10:34

younesschrifi force-pushed the ble/bpcc-display-on-map branch 3 times, most recently from b1c0d8e to cb8c51f Compare January 24, 2024 11:44

tykayn force-pushed the ble/bpcc-display-on-map branch from 623edae to abac273 Compare January 24, 2024 15:19

younesschrifi force-pushed the ble/bpcc-display-on-map branch from abac273 to 5319d38 Compare January 24, 2024 15:21

tykayn force-pushed the ble/bpcc-display-on-map branch from 45076a6 to 26ec62d Compare January 24, 2024 15:41

younesschrifi force-pushed the ble/bpcc-display-on-map branch from c3bd1b7 to 0881f0a Compare January 25, 2024 09:51

flomonster changed the title ~~front:map: add icons and settings for neutral section signs layer~~ Display neutral section signs Jan 25, 2024

tykayn force-pushed the ble/bpcc-display-on-map branch 2 times, most recently from a7bf1fc to 93b2e82 Compare January 25, 2024 13:46

tykayn marked this pull request as ready for review January 26, 2024 11:13

tykayn requested review from a team as code owners January 26, 2024 11:13

nicolaswurtz suggested changes Jan 26, 2024

View reviewed changes

younesschrifi force-pushed the ble/bpcc-display-on-map branch from 93b2e82 to 014f239 Compare January 29, 2024 14:16

Tguisnet requested changes Jan 29, 2024

View reviewed changes

editoast/src/generated_data/neutral_sign.rs Outdated Show resolved Hide resolved

editoast/src/schema/neutral_section.rs Outdated Show resolved Hide resolved

eckter reviewed Feb 5, 2024

View reviewed changes

younesschrifi force-pushed the ble/bpcc-display-on-map branch from a7e2358 to b4184a2 Compare February 5, 2024 09:46

nicolaswurtz reviewed Feb 6, 2024

View reviewed changes

front/src/applications/editor/tools/types.ts Outdated Show resolved Hide resolved

front/src/applications/editor/tools/types.ts Outdated Show resolved Hide resolved

clarani requested changes Feb 6, 2024

View reviewed changes

nicolaswurtz force-pushed the ble/bpcc-display-on-map branch 7 times, most recently from aefeb41 to 46361b5 Compare February 7, 2024 13:05

clarani reviewed Feb 7, 2024

View reviewed changes

nicolaswurtz force-pushed the ble/bpcc-display-on-map branch from 205445a to 4fc3936 Compare February 7, 2024 15:28

nicolaswurtz approved these changes Feb 7, 2024

View reviewed changes

clarani reviewed Feb 7, 2024

View reviewed changes

clarani approved these changes Feb 7, 2024

View reviewed changes

nicolaswurtz force-pushed the ble/bpcc-display-on-map branch 2 times, most recently from cbe0350 to cccc14c Compare February 7, 2024 18:02

Tguisnet approved these changes Feb 7, 2024

View reviewed changes

younesschrifi requested a review from eckter February 7, 2024 21:58

nicolaswurtz enabled auto-merge February 7, 2024 22:59

nicolaswurtz added 2 commits February 8, 2024 02:09

editoast: add neutral signs

ebc5ac0

- fix psl signs angles

front: add neutral signs

16d8ae2

- generic mast layer added

younesschrifi force-pushed the ble/bpcc-display-on-map branch from cccc14c to 16d8ae2 Compare February 8, 2024 01:09

eckter approved these changes Feb 8, 2024

View reviewed changes

nicolaswurtz added this pull request to the merge queue Feb 8, 2024

Merged via the queue into dev with commit f5b6aec Feb 8, 2024
22 checks passed

nicolaswurtz deleted the ble/bpcc-display-on-map branch February 8, 2024 09:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display neutral section signs #6227

Display neutral section signs #6227

younesschrifi commented Dec 27, 2023 •

edited by clarani

Loading

codecov bot commented Jan 8, 2024 •

edited

Loading

tykayn commented Jan 26, 2024

nicolaswurtz left a comment

eckter left a comment

clarani left a comment

clarani left a comment

clarani left a comment

clarani left a comment

Tguisnet left a comment

Tguisnet commented Feb 9, 2024

Display neutral section signs #6227

Display neutral section signs #6227

Conversation

younesschrifi commented Dec 27, 2023 • edited by clarani Loading

codecov bot commented Jan 8, 2024 • edited Loading

Codecov Report

tykayn commented Jan 26, 2024

nicolaswurtz left a comment

Choose a reason for hiding this comment

eckter left a comment

Choose a reason for hiding this comment

clarani left a comment

Choose a reason for hiding this comment

clarani left a comment

Choose a reason for hiding this comment

clarani left a comment

Choose a reason for hiding this comment

clarani left a comment

Choose a reason for hiding this comment

Tguisnet left a comment

Choose a reason for hiding this comment

Tguisnet commented Feb 9, 2024

younesschrifi commented Dec 27, 2023 •

edited by clarani

Loading

codecov bot commented Jan 8, 2024 •

edited

Loading