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.

Sign up for GitHub

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

front: editor: improve buffer stops and detectors visibility #5726

Merged
merged 1 commit into from
Nov 17, 2023
Merged

front: editor: improve buffer stops and detectors visibility #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions front/src/applications/editor/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ const Editor: FC = () => {
const layersList = toolAndState.tool.requiredLayers
? new Set([...editorState.editorLayers, ...toolAndState.tool.requiredLayers])
: editorState.editorLayers;

// Remove the errors layer for better visibility in the route tool
if (toolAndState.tool.id === 'route-edition') layersList.delete('errors');
dispatch(selectLayers(layersList));

return () => {
Expand Down
18 changes: 11 additions & 7 deletions front/src/applications/editor/tools/routeEdition/components.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import React, { FC, useContext } from 'react';
import { useSelector } from 'react-redux';
import { useTranslation } from 'react-i18next';

import EditorContext from '../../context';
import colors from '../../../../common/Map/Consts/colors';
import GeoJSONs from '../../../../common/Map/Layers/GeoJSONs';
import { RouteEditionState } from './types';
import { compact, isEmpty } from 'lodash';
import EditorContext from 'applications/editor/context';
import colors from 'common/Map/Consts/colors';
import GeoJSONs from 'common/Map/Layers/GeoJSONs';
import { getMap } from 'reducers/map/selectors';
import { ExtendedEditorContextType } from 'applications/editor/tools/editorContextTypes';
import { EditRoutePathState, RouteEditionState } from './types';
import { EditRoutePathEditionLayers, EditRoutePathLeftPanel } from './components/EditRoutePath';
import { EditRouteMetadataLayers, EditRouteMetadataPanel } from './components/EditRouteMetadata';
import { getMap } from '../../../../reducers/map/selectors';
import { ExtendedEditorContextType } from '../editorContextTypes';

export const RouteEditionLeftPanel: FC = () => {
const { state } = useContext(EditorContext) as ExtendedEditorContextType<RouteEditionState>;
Expand All @@ -33,11 +34,14 @@ export const RouteEditionLayers: FC = () => {
} = useContext(EditorContext) as ExtendedEditorContextType<RouteEditionState>;
const { mapStyle, layersSettings, issuesSettings } = useSelector(getMap);

const { routeState } = state as EditRoutePathState;
const selectionList = compact([routeState.entryPoint?.id, routeState.exitPoint?.id]);

return (
<>
{/* Editor data layer */}
<GeoJSONs
selection={['placeholder']}
selection={selectionList.length > 1 ? selectionList : undefined}
colors={colors[mapStyle]}
layers={editorLayers}
fingerprint={renderingFingerprint}
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/editor/tools/routeEdition/tool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const RouteEditionTool: Tool<RouteEditionState> = {
id: 'route-edition',
icon: GiPathDistance,
labelTranslationKey: 'Editor.tools.routes-edition.label',
requiredLayers: new Set(['buffer_stops', 'detectors', 'track_sections']),
requiredLayers: new Set(['buffer_stops', 'detectors']),

getInitialState() {
return getEmptyCreateRouteState();
Expand Down
2 changes: 1 addition & 1 deletion front/src/common/Map/Layers/Detectors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function getDetectorsLayerProps(params: {
paint: {
'circle-stroke-color': params.colors.detectors.circle,
'circle-color': params.colors.detectors.circle,
'circle-radius': 3,
'circle-radius': 4,
},
};

Expand Down