Skip to content

apc bike class added #834

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

Merged
ahjyrkia merged 1 commit into from
Jul 15, 2025
Merged

apc bike class added #834

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
26 changes: 25 additions & 1 deletion graphql.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3169,7 +3169,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "ID",
"ofType": null
}
},
Expand Down Expand Up @@ -8192,6 +8192,30 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "bikesIn",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "Int",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "bikesOut",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "Int",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "_sort",
"description": null,
Expand Down
4 changes: 3 additions & 1 deletion schema-types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export type AreaEventsFilterInput = {

export type Cancellation = {
__typename?: 'Cancellation';
id: Scalars['Int'];
id: Scalars['ID'];
routeId: Scalars['String'];
direction: Scalars['Direction'];
departureDate: Scalars['Date'];
Expand Down Expand Up @@ -456,6 +456,8 @@ export type JourneyPassengerCountEvent = {
totalPassengersIn?: Maybe<Scalars['Int']>;
totalPassengersOut?: Maybe<Scalars['Int']>;
vehicleLoadRatioText?: Maybe<Scalars['String']>;
bikesIn?: Maybe<Scalars['Int']>;
bikesOut?: Maybe<Scalars['Int']>;
_sort?: Maybe<Scalars['Int']>;
};

Expand Down
12 changes: 12 additions & 0 deletions src/components/journeypanel/JourneyEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,18 @@ export const JourneyApcEvent = decorate(
<TlpPropertyValue>{event.vehicleLoad}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.bikesIn || event.bikesIn == 0) && (
<TlpPropertyBox>
{text("apc.bikesIn")}:{" "}
<TlpPropertyValue>{event.bikesIn}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.bikesOut || event.bikesOut == 0) && (
<TlpPropertyBox>
{text("apc.bikesOut")}:{" "}
<TlpPropertyValue>{event.bikesOut}</TlpPropertyValue>
</TlpPropertyBox>
)}
{vehicledLoadRatio && (
<TlpPropertyBox>
{text("apc.vehicleLoadRatio")}:{" "}
Expand Down
11 changes: 11 additions & 0 deletions src/components/map/ApcTooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,17 @@ const ApcTooltip = decorate(
<ApcPropertyValue>{event.vehicleLoad}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.bikesIn || event.bikesIn == 0) && (
<ApcDataRow>
{text("apc.bikesIn")}: <ApcPropertyValue>{event.bikesIn}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.bikesOut || event.bikesOut == 0) && (
<ApcDataRow>
{text("apc.bikesOut")}:{" "}
<ApcPropertyValue>{event.bikesOut}</ApcPropertyValue>
</ApcDataRow>
)}
{vehicledLoadRatio && (
<ApcDataRow>
{text("apc.vehicleLoadRatio")}:{" "}
Expand Down
2 changes: 2 additions & 0 deletions src/languages/ui/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@

"apc.totalPassengersIn": "Total passengers in",
"apc.totalPassengersOut": "Total passengers out",
"apc.bikesIn": "Bikes in",
"apc.bikesOut": "Bikes out",
"apc.vehicleLoad": "Vehicle load",
"apc.vehicleLoadRatio": "Vehicle load ratio",
"apc.empty": "Empty",
Expand Down
2 changes: 2 additions & 0 deletions src/languages/ui/fi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@

"apc.totalPassengersIn": "Matkustajat sisään",
"apc.totalPassengersOut": "Matkustajat ulos",
"apc.bikesIn": "Pyörät sisään",
"apc.bikesOut": "Pyörät ulos",
"apc.vehicleLoad": "Kuorma",
"apc.vehicleLoadRatio": "Täyttöaste",
"apc.empty": "Tyhjä",
Expand Down
2 changes: 2 additions & 0 deletions src/languages/ui/se.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@

"apc.totalPassengersIn": "Påstigande resenärer",
"apc.totalPassengersOut": "Avstigande resenär",
"apc.bikesIn": "Bikes in",
"apc.bikesOut": "Bikes out",
"apc.vehicleLoad": "Last",
"apc.vehicleLoadRatio": "Fyllnadsgrad",
"apc.empty": "Empty",
Expand Down
2 changes: 2 additions & 0 deletions src/queries/JourneyQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ export const journeyQuery = gql`
vehicleLoadRatio
totalPassengersIn
totalPassengersOut
bikesIn
bikesOut
vehicleLoadRatioText
}
... on JourneyStopEvent {
Expand Down
Loading