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

ui-trackoccupancydiagram: display trough trains #747

Merged
merged 3 commits into from
Dec 20, 2024
Merged

ui-trackoccupancydiagram: display trough trains #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8091219
ui-trackoccupancydiagram: add through train
Yohh Dec 2, 2024
164e905
ui-trackoccupancydiagram: display simultaneous occupancy zones
Yohh Dec 13, 2024
d7b5903
ui-trackoccupancydiagram: highlight selected train
Yohh Dec 13, 2024
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
5 changes: 5 additions & 0 deletions storybook/stories/TrackOccupancyDiagram/TrackOccupancyDiagram.stories.tsx
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ type TrackOccupancyDiagramProps = {
yOffset: number;
spaceScaleType: 'linear' | 'proportional';
emptyData: boolean;
selectedTrainId: string;
};

const OP_ID = 'story';
const X_ZOOM_LEVEL = 6;
const Y_ZOOM_LEVEL = 3;
const SELECTED_TRAIN_ID = '5';

const TrackOccupancyDiagram = ({
xZoomLevel,
Expand Down Expand Up @@ -212,6 +214,7 @@ const TrackOccupancyDiagram = ({
opId={OP_ID}
useDraw={useDraw}
setCanvasesRoot={setCanvasesRoot}
selectedTrainId={SELECTED_TRAIN_ID}
/>
</div>
</CanvasContext.Provider>
Expand Down Expand Up @@ -246,6 +249,7 @@ const meta: Meta<typeof TrackOccupancyDiagram> = {
yOffset: 0,
spaceScaleType: 'linear',
emptyData: false,
selectedTrainId: SELECTED_TRAIN_ID,
},

render: (args) => <TrackOccupancyDiagram {...args} />,
Expand All @@ -261,5 +265,6 @@ export const TrackOccupancyDiagramStoryDefault: Story = {
xOffset: 0,
xZoomLevel: X_ZOOM_LEVEL,
yZoomLevel: Y_ZOOM_LEVEL,
selectedTrainId: SELECTED_TRAIN_ID,
},
};
305 changes: 301 additions & 4 deletions storybook/stories/samples/TrackOccupancyDiagramSamples/occupancyZones.ts
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const OccupancyZones = [
originStation: 'FOO',
destinationStation: 'BAR',
arrivalTime: new Date('2024/04/02 01:30'),
departureTime: new Date('2024/04/02 01:31'),
departureTime: new Date('2024/04/02 01:30'),
},
{
id: '2',
Expand Down Expand Up @@ -41,7 +41,7 @@ const OccupancyZones = [
arrivalTime: new Date('2024/04/02 00:24'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 01:29'),
departureTime: new Date('2024/04/02 00:50'),
},
{
id: '5',
Expand Down Expand Up @@ -96,7 +96,7 @@ const OccupancyZones = [
arrivalTime: new Date('2024/04/02 00:40'),
originStation: 'FOO',
destinationStation: 'BAR',
departureTime: new Date('2024/04/02 00:41'),
departureTime: new Date('2024/04/02 00:40'),
},
{
id: '10',
Expand Down Expand Up @@ -228,7 +228,304 @@ const OccupancyZones = [
originStation: 'FOO',
destinationStation: 'BAR',
arrivalTime: new Date('2024/04/02 02:59'),
departureTime: new Date('2024/04/02 03:00'),
departureTime: new Date('2024/04/02 02:59'),
},
{
id: '23',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:34'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 01:05'),
},
{
id: '24',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:57'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 01:02'),
},
{
id: '25',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:46'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 01:11'),
},
{
id: '26',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 01:49'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:14'),
},
{
id: '27',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 01:54'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:07'),
},
{
id: '28',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:00'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:11'),
},
{
id: '29',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:09'),
},
{
id: '30',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:10'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:17'),
},
{
id: '31',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:19'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:29'),
},
{
id: '32',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:24'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:26'),
},
{
id: '33',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:29'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:57'),
},
{
id: '34',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:34'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:53'),
},
{
id: '33',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:09'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 03:07'),
},
{
id: '34',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 02:12'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 02:59'),
},
{
id: '35',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 03:12'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 03:20'),
},
{
id: '36',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '37',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 01:20'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 01:25'),
},
{
id: '38',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '39',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '40',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '41',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '42',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '43',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '44',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '45',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '46',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
{
id: '47',
trackId: '4',
arrivalTrainName: '643152',
departureTrainName: '643153',
color: 'rgb(121, 118, 113)',
arrivalTime: new Date('2024/04/02 00:05'),
originStation: 'FOO',
destinationStation: 'FOO',
departureTime: new Date('2024/04/02 00:10'),
},
];

Expand Down
9 changes: 7 additions & 2 deletions ui-trackoccupancydiagram/src/components/TrackOccupancyCanvas.tsx
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,19 @@ new FontFace('IBM Plex Mono', 'url(/assets/IBMPlexMono-Regular.ttf)').load().the
document.fonts.add(result);
});

const TrackOccupancyCanvas = ({ opId, useDraw, setCanvasesRoot }: TrackOccupancyCanvasProps) => (
const TrackOccupancyCanvas = ({
opId,
useDraw,
setCanvasesRoot,
selectedTrainId,
}: TrackOccupancyCanvasProps) => (
<div
id={`track-occupancy-canvas-${opId}`}
className="bg-white-100 canvas-container"
ref={setCanvasesRoot}
>
<TracksLayer useDraw={useDraw} />
<OccupancyZonesLayer useDraw={useDraw} />
<OccupancyZonesLayer useDraw={useDraw} selectedTrainId={selectedTrainId} />
</div>
);

Expand Down
Loading
Loading