Skip to content

apc class fixes #839

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
Aug 11, 2025
Merged

apc class fixes #839

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
32 changes: 4 additions & 28 deletions src/components/journeypanel/JourneyEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,54 +604,30 @@ export const JourneyApcEvent = decorate(
<TlpPropertyValue>{event.vehicleLoad}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.bikesIn || event.bikesIn == 0) && (
{Number(event.bikesIn) > 0 && (
<TlpPropertyBox>
{text("apc.bikesIn")}:{" "}
<TlpPropertyValue>{event.bikesIn}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.bikesOut || event.bikesOut == 0) && (
{Number(event.bikesOut) > 0 && (
<TlpPropertyBox>
{text("apc.bikesOut")}:{" "}
<TlpPropertyValue>{event.bikesOut}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.wheelchairsIn || event.wheelchairsIn == 0) && (
{Number(event.wheelchairsIn) > 0 && (
<TlpPropertyBox>
{text("apc.wheelchairsIn")}:{" "}
<TlpPropertyValue>{event.wheelchairsIn}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.wheelchairsOut || event.wheelchairsOut == 0) && (
{Number(event.wheelchairsOut) > 0 && (
<TlpPropertyBox>
{text("apc.wheelchairsOut")}:{" "}
<TlpPropertyValue>{event.wheelchairsOut}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.pramsIn || event.pramsIn == 0) && (
<TlpPropertyBox>
{text("apc.pramsIn")}:{" "}
<TlpPropertyValue>{event.pramsIn}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.pramsOut || event.pramsOut == 0) && (
<TlpPropertyBox>
{text("apc.pramsOut")}:{" "}
<TlpPropertyValue>{event.pramsOut}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.otherIn || event.otherIn == 0) && (
<TlpPropertyBox>
{text("apc.otherIn")}:{" "}
<TlpPropertyValue>{event.otherIn}</TlpPropertyValue>
</TlpPropertyBox>
)}
{(event.otherOut || event.otherOut == 0) && (
<TlpPropertyBox>
{text("apc.otherOut")}:{" "}
<TlpPropertyValue>{event.otherOut}</TlpPropertyValue>
</TlpPropertyBox>
)}
{vehicledLoadRatio && (
<TlpPropertyBox>
{text("apc.vehicleLoadRatio")}:{" "}
Expand Down
30 changes: 4 additions & 26 deletions src/components/map/ApcTooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,51 +92,29 @@ const ApcTooltip = decorate(
<ApcPropertyValue>{event.vehicleLoad}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.bikesIn || event.bikesIn == 0) && (
{Number(event.bikesIn) > 0 && (
<ApcDataRow>
{text("apc.bikesIn")}: <ApcPropertyValue>{event.bikesIn}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.bikesOut || event.bikesOut == 0) && (
{Number(event.bikesOut) > 0 && (
<ApcDataRow>
{text("apc.bikesOut")}:{" "}
<ApcPropertyValue>{event.bikesOut}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.wheelchairsIn || event.wheelchairsIn == 0) && (
{Number(event.wheelchairsIn) > 0 && (
<ApcDataRow>
{text("apc.wheelchairsIn")}:{" "}
<ApcPropertyValue>{event.wheelchairsIn}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.wheelchairsOut || event.wheelchairsOut == 0) && (
{Number(event.wheelchairsOut) > 0 && (
<ApcDataRow>
{text("apc.wheelchairsOut")}:{" "}
<ApcPropertyValue>{event.wheelchairsOut}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.pramsIn || event.pramsIn == 0) && (
<ApcDataRow>
{text("apc.pramsIn")}: <ApcPropertyValue>{event.pramsIn}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.pramsOut || event.pramsOut == 0) && (
<ApcDataRow>
{text("apc.pramsOut")}:{" "}
<ApcPropertyValue>{event.pramsOut}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.otherIn || event.otherIn == 0) && (
<ApcDataRow>
{text("apc.otherIn")}: <ApcPropertyValue>{event.otherIn}</ApcPropertyValue>
</ApcDataRow>
)}
{(event.otherOut || event.otherOut == 0) && (
<ApcDataRow>
{text("apc.otherOut")}:{" "}
<ApcPropertyValue>{event.otherOut}</ApcPropertyValue>
</ApcDataRow>
)}
{vehicledLoadRatio && (
<ApcDataRow>
{text("apc.vehicleLoadRatio")}:{" "}
Expand Down
4 changes: 2 additions & 2 deletions src/languages/ui/fi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@
"apc.totalPassengersOut": "Matkustajat ulos",
"apc.bikesIn": "Pyörät sisään",
"apc.bikesOut": "Pyörät ulos",
"apc.wheelchairsIn": "Wheelchairs in",
"apc.wheelchairsOut": "Wheelchairs out",
"apc.wheelchairsIn": "Pyörätuolit sisään",
"apc.wheelchairsOut": "Pyörätuolit ulos",
"apc.pramsIn": "Prams in",
"apc.pramsOut": "Prams out",
"apc.otherIn": "Other in",
Expand Down
10 changes: 5 additions & 5 deletions src/languages/ui/se.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"filterpanel.time_increment": "Tidsändring (sek.)",
"filterpanel.area_search_range": "Områdssökningens tidslängd (min.)",
"filterpanel.speed_search_limit": "Gräns för hastighetssökning (Km/h)",
"filterpanel.speed_search_text_1":"Händelser som överskrider hastighetsbegränsningen på",
"filterpanel.speed_search_text_1": "Händelser som överskrider hastighetsbegränsningen på",
"filterpanel.simulate.start": "Simulera",
"filterpanel.simulate.stop": "Sluta simulera",
"filterpanel.filter_by_vehicle": "Sök fordon",
Expand Down Expand Up @@ -207,10 +207,10 @@

"apc.totalPassengersIn": "Påstigande resenärer",
"apc.totalPassengersOut": "Avstigande resenär",
"apc.bikesIn": "Bikes in",
"apc.bikesOut": "Bikes out",
"apc.wheelchairsIn": "Wheelchairs in",
"apc.wheelchairsOut": "Wheelchairs out",
"apc.bikesIn": "Cyklar påstigna",
"apc.bikesOut": "Cyklar avstigna",
"apc.wheelchairsIn": "Rullstolar påstigna",
"apc.wheelchairsOut": "Rullstolar avstigna",
"apc.pramsIn": "Prams in",
"apc.pramsOut": "Prams out",
"apc.otherIn": "Other in",
Expand Down
4 changes: 0 additions & 4 deletions src/queries/JourneyQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ export const journeyQuery = gql`
bikesOut
wheelchairsIn
wheelchairsOut
pramsIn
pramsOut
otherIn
otherOut
vehicleLoadRatioText
}
... on JourneyStopEvent {
Expand Down
Loading