Skip to content

Commit cb78a63

Browse files
kmer2016clarani
authored andcommitted
front: rename panel to sign and LPV to PSL
1 parent 7e60fdd commit cb78a63

File tree

34 files changed

+619
-626
lines changed

34 files changed

+619
-626
lines changed

front/public/locales/en/map-settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"showIGNCadastre": "Cadastre ©IGN",
2424
"showOSM": "Map background OSM",
2525
"showOSMtracksections": "OSM tracks",
26-
"sncf_lpv": "Permanent speed limits",
26+
"sncf_psl": "Permanent speed limits",
2727
"speedlimits": "Speed limits",
2828
"stops": "Stop signs",
2929
"switches": "Switch",

front/public/locales/en/translation.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"catenaries": "Catenaries",
9898
"detectors": "Detectors",
9999
"errors": "Errors",
100-
"lpv-lpv_panels": "Permanent speed limits",
100+
"psl-psl_signs": "Permanent speed limits",
101101
"routes": "Routes",
102102
"signals": "Signals",
103103
"switches": "Switches",
@@ -327,30 +327,30 @@
327327
"reset-speed-section": "Cancel the current modifications"
328328
},
329329
"add-new-speed-limit": "Add new speed limit",
330-
"add-panel": "Add a panel from {{panelType}} type",
330+
"add-sign": "Add a sign from {{signType}} type",
331331
"add-track-range": "Click to link to:",
332332
"additional-speed-limit": "Additional speed limits",
333-
"hovered-panel": "Panel {{panelType}}",
333+
"hovered-sign": "Sign {{signType}}",
334334
"label": "Speed section tool",
335335
"main-speed-limit": "Default speed limit",
336336
"move-range-extremity": "Click to move the end:",
337337
"new-tag": "Composition code",
338-
"panel-angle-geo": "Angle Geo",
339-
"panel-angle-sch": "Angle Sch",
340-
"panel-category": "Panel(s) {{panelType}}",
341-
"panel-select": "Select",
342-
"panel-remove": "Remove panel",
343-
"panel-position": "Position",
344-
"panel-track-id": "Track section id",
345-
"panel-type": "Type",
346-
"panel-side": "Side",
347-
"panel-value": "Speed",
348-
"panels-section-list": "Section panels list",
338+
"sign-angle-geo": "Angle Geo",
339+
"sign-angle-sch": "Angle Sch",
340+
"sign-category": "Sign(s) {{signType}}",
341+
"sign-select": "Select",
342+
"sign-remove": "Remove sign",
343+
"sign-position": "Position",
344+
"sign-track-id": "Track section id",
345+
"sign-type": "Type",
346+
"sign-side": "Side",
347+
"sign-value": "Speed",
348+
"signs-section-list": "Section signs list",
349349
"remove-track-range": "Click to detatch from:",
350350
"save-existing-speed-section": "Save modifications",
351351
"save-new-speed-section": "Save the new speed limit",
352352
"speed-limits": "Speed limits",
353-
"toggle-lpv": "Permanent speed limit"
353+
"toggle-psl": "Permanent speed limit"
354354
},
355355
"range-edition": {
356356
"edit-track-range-start": "Edit departure point",

front/public/locales/fr/map-settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"showIGNCadastre": "Cadastre ©IGN",
2424
"showOSM": "Fond de carte OSM",
2525
"showOSMtracksections": "Voies OSM",
26-
"sncf_lpv": "Limites permanentes de vitesse",
26+
"sncf_psl": "Limites permanentes de vitesse",
2727
"speedlimits": "Vitesses limites",
2828
"stops": "Pancartes d'arrêt",
2929
"switches": "Appareils de voie",

front/public/locales/fr/translation.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"catenaries": "Électrifications",
9898
"detectors": "Détecteurs",
9999
"errors": "Erreurs",
100-
"lpv-lpv_panels": "Limites permanentes de vitesse",
100+
"psl-psl_signs": "Limites permanentes de vitesse",
101101
"routes": "Itinéraires",
102102
"signals": "Signaux",
103103
"switches": "Aiguillages",
@@ -327,30 +327,30 @@
327327
"reset-speed-section": "Annuler les modifications en cours"
328328
},
329329
"add-new-speed-limit": "Ajouter une nouvelle limitation",
330-
"add-panel": "Ajouter un panneau de type {{panelType}}",
330+
"add-sign": "Ajouter un panneau de type {{signType}}",
331331
"add-track-range": "Cliquer pour lier à :",
332332
"additional-speed-limit": "Limitation de vitesse additionnelles",
333-
"hovered-panel": "Panneau {{panelType}}",
333+
"hovered-sign": "Panneau {{signType}}",
334334
"label": "Outil \"Vitesse limite\"",
335335
"main-speed-limit": "Limitation de vitesse par défaut",
336336
"move-range-extremity": "Cliquer pour déplacer l'extrémité :",
337337
"new-tag": "Code de composition",
338-
"panel-angle-geo": "Angle Geo",
339-
"panel-angle-sch": "Angle Sch",
340-
"panel-category": "Panneau(x) {{panelType}}",
341-
"panel-select": "Sélectionner",
342-
"panel-remove": "Supprimer le panneau",
343-
"panel-position": "Position",
344-
"panel-track-id": "Track section id",
345-
"panel-type": "Type",
346-
"panel-side": "Côté",
347-
"panel-value": "Vitesse",
348-
"panels-section-list": "Liste des panneaux de la section",
338+
"sign-angle-geo": "Angle Geo",
339+
"sign-angle-sch": "Angle Sch",
340+
"sign-category": "Panneau(x) {{signType}}",
341+
"sign-select": "Sélectionner",
342+
"sign-remove": "Supprimer le panneau",
343+
"sign-position": "Position",
344+
"sign-track-id": "Track section id",
345+
"sign-type": "Type",
346+
"sign-side": "Côté",
347+
"sign-value": "Vitesse",
348+
"signs-section-list": "Liste des panneaux de la section",
349349
"remove-track-range": "Cliquer pour détacher de :",
350350
"save-existing-speed-section": "Sauvegarder les modifications",
351351
"save-new-speed-section": "Sauvegarder la nouvelle limite de vitesse",
352352
"speed-limits": "Limitations de vitesses",
353-
"toggle-lpv": "Limite permanente de vitesse"
353+
"toggle-psl": "Limite permanente de vitesse"
354354
},
355355
"range-edition": {
356356
"edit-track-range-start": "Modifier le point de départ",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import switchesIcon from 'assets/pictures/layersicons/switches.svg';
1010
import detectorsIcon from 'assets/pictures/layersicons/detectors.svg';
1111
import trackSectionsIcon from 'assets/pictures/layersicons/layer_adv.svg';
1212
import signalsIcon from 'assets/pictures/layersicons/layer_signal.svg';
13-
import lpvsIcon from 'assets/pictures/layersicons/layer_tivs.svg';
13+
import pslsIcon from 'assets/pictures/layersicons/layer_tivs.svg';
1414

1515
import SwitchSNCF from 'common/BootstrapSNCF/SwitchSNCF/SwitchSNCF';
1616
import { useModal, Modal } from 'common/BootstrapSNCF/ModalSNCF';
@@ -31,7 +31,7 @@ const LAYERS: Array<{ layers: LayerType[]; icon: string | JSX.Element }> = [
3131
{ layers: ['detectors'], icon: detectorsIcon },
3232
{ layers: ['switches'], icon: switchesIcon },
3333
{ layers: ['speed_sections'], icon: <MdSpeed style={{ width: '20px' }} className="mx-2" /> },
34-
{ layers: ['lpv', 'lpv_panels'], icon: lpvsIcon },
34+
{ layers: ['psl', 'psl_signs'], icon: pslsIcon },
3535
{ layers: ['catenaries'], icon: <GiElectric style={{ width: '20px' }} className="mx-2" /> },
3636
{
3737
layers: ['errors'],
@@ -69,7 +69,7 @@ const LayersModal: FC<LayersModalProps> = ({
6969
() =>
7070
selection
7171
? mapKeys(
72-
// TODO: ATM we don't know if a selected speed section should be considered as SpeedSection or LPV,
72+
// TODO: ATM we don't know if a selected speed section should be considered as SpeedSection or PSL,
7373
// which are two different layers.
7474
mapValues(groupBy(selection, 'objType'), (values) => values.length),
7575
(_values, key) => EDITOAST_TO_LAYER_DICT[key as EditoastType]

front/src/applications/editor/tools/rangeEdition/components.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ import {
1717
CatenaryEntity,
1818
EntityObjectOperationResult,
1919
SpeedSectionEntity,
20-
SpeedSectionLpvEntity,
20+
SpeedSectionPslEntity,
2121
} from '../../../../types';
2222
import { NEW_ENTITY_ID } from '../../data/utils';
2323
import { LoaderFill } from '../../../../common/Loader';
2424
import EntitySumUp from '../../components/EntitySumUp';
2525
import { save } from '../../../../reducers/editor';
26-
import EditLPVSection from './speedSection/EditLPVSection';
26+
import EditPSLSection from './speedSection/EditPSLSection';
2727
import { ExtendedEditorContextType, PartialOrReducer } from '../editorContextTypes';
28-
import { getPointAt, speedSectionIsLpv } from './utils';
28+
import { getPointAt, speedSectionIsPsl } from './utils';
2929
import SpeedSectionMetadataForm from './speedSection/SpeedSectionMetadataForm';
3030
import CatenaryMetadataForm from './catenary/CatenaryMetadataForm';
3131

@@ -211,7 +211,7 @@ export const RangeEditionLeftPanel: FC = () => {
211211
>;
212212
const isNew = entity.properties.id === NEW_ENTITY_ID;
213213
const [isLoading, setIsLoading] = useState(false);
214-
const isLPV = speedSectionIsLpv(entity as SpeedSectionEntity);
214+
const isPSL = speedSectionIsPsl(entity as SpeedSectionEntity);
215215

216216
const infraID = useSelector(getInfraID);
217217

@@ -308,19 +308,19 @@ export const RangeEditionLeftPanel: FC = () => {
308308
<div className="d-flex">
309309
<CheckboxRadioSNCF
310310
type="checkbox"
311-
id="is-lpv-checkbox"
312-
name="is-lpv-checkbox"
313-
checked={isLPV}
314-
label={t('Editor.tools.speed-edition.toggle-lpv')}
311+
id="is-psl-checkbox"
312+
name="is-psl-checkbox"
313+
checked={isPSL}
314+
label={t('Editor.tools.speed-edition.toggle-psl')}
315315
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
316316
let newExtension: SpeedSectionEntity['properties']['extensions'] = {
317-
lpv_sncf: null,
317+
psl_sncf: null,
318318
};
319319
if (e.target.checked) {
320320
const firstRange = (entity.properties?.track_ranges || [])[0];
321321
if (!firstRange) return;
322322
newExtension = {
323-
lpv_sncf: initialEntity.properties?.extensions?.lpv_sncf || {
323+
psl_sncf: initialEntity.properties?.extensions?.psl_sncf || {
324324
announcement: [],
325325
r: [],
326326
z: {
@@ -339,9 +339,9 @@ export const RangeEditionLeftPanel: FC = () => {
339339
}}
340340
/>
341341
</div>
342-
{isLPV && (
343-
<EditLPVSection
344-
entity={entity as SpeedSectionLpvEntity}
342+
{isPSL && (
343+
<EditPSLSection
344+
entity={entity as SpeedSectionPslEntity}
345345
setState={
346346
setState as (
347347
stateOrReducer: PartialOrReducer<RangeEditionState<SpeedSectionEntity>>

front/src/applications/editor/tools/rangeEdition/speedSection/EditLPVSection.tsx

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)