Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Itinerary
Commits
2f28daa1
Commit
2f28daa1
authored
Jun 16, 2021
by
Volker Krause
Browse files
Adapt to KPublicTransport API changes
Use non-deprecated vehicle type enum values, and request all journey details.
parent
9778350d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/app/publictransport.cpp
View file @
2f28daa1
...
...
@@ -149,8 +149,10 @@ QString PublicTransport::rentalVehicleIcon(const KPublicTransport::RentalVehicle
case
RentalVehicle
::
Unknown
:
return
{};
case
RentalVehicle
::
Bicycle
:
case
RentalVehicle
::
Pedelec
:
// TODO
return
QStringLiteral
(
"qrc:///images/bike.svg"
);
case
RentalVehicle
::
ElectricScooter
:
case
RentalVehicle
::
ElectricMoped
:
case
RentalVehicle
::
ElectricKickScooter
:
return
QStringLiteral
(
"question"
);
// TODO
case
RentalVehicle
::
Car
:
return
QStringLiteral
(
"qrc:///images/car.svg"
);
...
...
@@ -351,7 +353,9 @@ bool PublicTransport::warnAboutSection(const KPublicTransport::JourneySection &s
return
false
;
case
RentalVehicle
::
Bicycle
:
return
section
.
duration
()
>
60
*
60
||
section
.
distance
()
>
20000
;
case
RentalVehicle
::
ElectricScooter
:
case
RentalVehicle
::
ElectricKickScooter
:
case
RentalVehicle
::
ElectricMoped
:
case
RentalVehicle
::
Pedelec
:
case
RentalVehicle
::
Car
:
return
false
;
// ???
}
...
...
src/app/timelinedelegatecontroller.cpp
View file @
2f28daa1
...
...
@@ -417,6 +417,8 @@ KPublicTransport::JourneyRequest TimelineDelegateController::journeyRequest() co
req
.
setDateTime
(
std
::
max
(
QDateTime
::
currentDateTime
(),
SortUtil
::
startDateTime
(
res
)));
req
.
setDateTimeMode
(
KPublicTransport
::
JourneyRequest
::
Departure
);
req
.
setDownloadAssets
(
true
);
req
.
setIncludeIntermediateStops
(
true
);
req
.
setIncludePaths
(
true
);
// find full journey by looking at subsequent elements
auto
prevRes
=
res
;
...
...
src/app/transfermanager.cpp
View file @
2f28daa1
...
...
@@ -507,6 +507,8 @@ KPublicTransport::JourneyRequest TransferManager::journeyRequestForTransfer(cons
req
.
setDateTime
(
transfer
.
journeyTime
());
req
.
setDateTimeMode
(
transfer
.
alignment
()
==
Transfer
::
Before
?
JourneyRequest
::
Arrival
:
JourneyRequest
::
Departure
);
req
.
setDownloadAssets
(
true
);
req
.
setIncludeIntermediateStops
(
true
);
req
.
setIncludePaths
(
true
);
return
req
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment