Skip to content

Commit

Permalink
front: adapt to the new layer get angle directly
Browse files Browse the repository at this point in the history
  • Loading branch information
@flomonster
flomonster committed May 17, 2023
1 parent 3a58165 commit 73c2d24
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 35 deletions.
5 changes: 0 additions & 5 deletions front/src/applications/editor/tools/pointEdition/tool-factory.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ function getPointEditionTool<T extends EditorPoint>({
icon,
getNewEntity,
layersComponent,
requiresAngle,
}: PointEditionToolParams<T>): Tool<PointEditionState<T>> {
const id = layer.replace(/_/g, '-').replace(/s$/, '');

Expand Down Expand Up @@ -102,10 +101,6 @@ function getPointEditionTool<T extends EditorPoint>({
newEntity.properties = newEntity.properties || {};
newEntity.properties.track = nearestPoint.trackSectionID;

if (requiresAngle && newEntity.objType === 'Signal') {
(newEntity as SignalEntity).properties.extensions.sncf.angle_geo = nearestPoint.angle;
}

// retrieve the track section to be sure that the computation of the distance will be good
// we can't trust maplibre, because the stored gemetry is not necessary the real one
getEntity(infraID as number, newEntity.properties.track, 'TrackSection').then((track) => {
Expand Down
47 changes: 17 additions & 30 deletions front/src/common/Map/Layers/geoSignalsLayers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from 'common/Map/Consts/SignalsNames';

import { SIGNALS_PANELS } from 'common/Map/const';
import { SourceLayer, Theme, SymbolLayout, SymbolLayer, CircleLayer } from '../../../types';
import { CircleLayer, SourceLayer, SymbolLayer, SymbolLayout, Theme } from '../../../types';

const signalTextOffsetX = 5;
const signalTextOffsetY = -1;
Expand Down Expand Up @@ -53,10 +53,6 @@ export function getSignalsList(signalsSettings: SignalsSettings) {
return signalsList;
}

export function getAngleName(sourceLayer: SourceLayer) {
return sourceLayer === 'sch' ? 'extensions_sncf_angle_sch' : 'extensions_sncf_angle_geo';
}

export function getPointLayerProps({
signalsList,
sourceTable,
Expand Down Expand Up @@ -100,11 +96,8 @@ export function signalsToSprites(

export function getSignalMatLayerProps({
signalsList,
sourceLayer,
sourceTable,
}: SignalContext): Omit<SymbolLayer, 'id'> {
const angleName = getAngleName(sourceLayer);

const props: Omit<SymbolLayer, 'id'> = {
type: 'symbol',
minzoom: 12,
Expand All @@ -125,7 +118,7 @@ export function getSignalMatLayerProps({
'icon-size': 0.7,
'icon-rotation-alignment': 'map',
'icon-pitch-alignment': 'map',
'icon-rotate': ['get', angleName],
'icon-rotate': ['get', 'angle'],
'icon-allow-overlap': true,
'icon-ignore-placement': true,
'text-allow-overlap': true,
Expand All @@ -144,8 +137,7 @@ export function getSignalEmptyLayerProps(
iconOffset: SymbolLayout['icon-offset'],
libelle = 'extensions_sncf_value'
): Omit<SymbolLayer, 'id'> {
const { sourceLayer, sourceTable, colors } = context;
const angleName = getAngleName(sourceLayer);
const { sourceTable, colors } = context;
const excludeText = ['SIGNAUX A GAUCHE', 'SIGNAUX A DROITE'];

const props: Omit<SymbolLayer, 'id'> = {
Expand Down Expand Up @@ -183,8 +175,8 @@ export function getSignalEmptyLayerProps(
'icon-rotation-alignment': 'map',
'icon-pitch-alignment': 'map',
'text-rotation-alignment': 'map',
'icon-rotate': ['get', angleName],
'text-rotate': ['get', angleName],
'icon-rotate': ['get', 'angle'],
'text-rotate': ['get', 'angle'],
'icon-allow-overlap': true,
'icon-ignore-placement': true,
'text-allow-overlap': true,
Expand All @@ -203,12 +195,10 @@ export function getSignalEmptyLayerProps(
}

export function getSignalPNLayerProps(
{ sourceTable, sourceLayer }: SignalContext,
{ sourceTable }: SignalContext,
_type: string,
iconOffset: SymbolLayout['icon-offset']
): Omit<SymbolLayer, 'id'> {
const angleName = getAngleName(sourceLayer);

const props: Omit<SymbolLayer, 'id'> = {
type: 'symbol',
minzoom: 13,
Expand All @@ -232,8 +222,8 @@ export function getSignalPNLayerProps(
'icon-rotation-alignment': 'map',
'icon-pitch-alignment': 'map',
'text-rotation-alignment': 'map',
'icon-rotate': ['get', angleName],
'text-rotate': ['get', angleName],
'icon-rotate': ['get', 'angle'],
'text-rotate': ['get', 'angle'],
'icon-allow-overlap': true,
'icon-ignore-placement': true,
'text-allow-overlap': true,
Expand All @@ -254,9 +244,8 @@ export function getSignalALayerProps(
iconOffset: SymbolLayout['icon-offset'],
changeSignalContext: ChangeSignalContext
): Omit<SymbolLayer, 'id'> {
const { sourceTable, sourceLayer, colors } = context;
const { sourceTable, colors } = context;
const { yellowSignalIds = [] } = changeSignalContext;
const angleName = getAngleName(sourceLayer);
const typeFilter = _type.split(' ')[0];
const filterA = ['in', 'id'].concat(yellowSignalIds);
const props: Omit<SymbolLayer, 'id'> = {
Expand All @@ -282,8 +271,8 @@ export function getSignalALayerProps(
'icon-rotation-alignment': 'map',
'icon-pitch-alignment': 'map',
'text-rotation-alignment': 'map',
'icon-rotate': ['get', angleName],
'text-rotate': ['get', angleName],
'icon-rotate': ['get', 'angle'],
'text-rotate': ['get', 'angle'],
'icon-allow-overlap': true,
'icon-ignore-placement': true,
'text-allow-overlap': true,
Expand All @@ -308,8 +297,7 @@ export function getSignalVLLayerProps(
// eslint-disable-next-line @typescript-eslint/no-unused-vars
_changeSignalContext: ChangeSignalContext
): Omit<SymbolLayer, 'id'> {
const { sourceTable, sourceLayer, colors } = context;
const angleName = getAngleName(sourceLayer);
const { sourceTable, colors } = context;
const typeFilter = _type.split(' ')[0];
const props: Omit<SymbolLayer, 'id'> = {
type: 'symbol',
Expand All @@ -334,8 +322,8 @@ export function getSignalVLLayerProps(
'icon-rotation-alignment': 'map',
'icon-pitch-alignment': 'map',
'text-rotation-alignment': 'map',
'icon-rotate': ['get', angleName],
'text-rotate': ['get', angleName],
'icon-rotate': ['get', 'angle'],
'text-rotate': ['get', 'angle'],
'icon-allow-overlap': true,
'icon-ignore-placement': true,
'text-allow-overlap': true,
Expand All @@ -359,9 +347,8 @@ export function getSignalStopLayerProps(
iconOffset: SymbolLayout['icon-offset'],
changeSignalContext: ChangeSignalContext
): Omit<SymbolLayer, 'id'> {
const { sourceTable, sourceLayer, colors } = context;
const { sourceTable, colors } = context;
const { redSignalIds = [] } = changeSignalContext;
const angleName = getAngleName(sourceLayer);
const typeFilter = _type.split(' ')[0];
const filterA = ['in', 'id'].concat(redSignalIds);

Expand All @@ -388,8 +375,8 @@ export function getSignalStopLayerProps(
'icon-rotation-alignment': 'map',
'icon-pitch-alignment': 'map',
'text-rotation-alignment': 'map',
'icon-rotate': ['get', angleName],
'text-rotate': ['get', angleName],
'icon-rotate': ['get', 'angle'],
'text-rotate': ['get', 'angle'],
'icon-allow-overlap': true,
'icon-ignore-placement': true,
'text-allow-overlap': true,
Expand Down

0 comments on commit 73c2d24

Please sign in to comment.