Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kpublictransport for
openSUSE:Factory checked in at 2023-11-10 12:32:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpublictransport (Old)
and /work/SRC/openSUSE:Factory/.kpublictransport.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpublictransport"
Fri Nov 10 12:32:19 2023 rev:36 rq:1124619 version:23.08.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpublictransport/kpublictransport.changes
2023-10-12 23:46:04.873525417 +0200
+++
/work/SRC/openSUSE:Factory/.kpublictransport.new.17445/kpublictransport.changes
2023-11-10 12:35:36.269554809 +0100
@@ -1,0 +2,12 @@
+Tue Nov 7 17:05:09 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.08.3
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/23.08.3/
+- Changes since 23.08.2:
+ * Correctly detect past canceled stops in DB ICE onboard journey data
+ * Fix asymmetric location type comparison
+ * Handle canceled stops in DB ICE onboard API journey data
+
+-------------------------------------------------------------------
Old:
----
kpublictransport-23.08.2.tar.xz
kpublictransport-23.08.2.tar.xz.sig
New:
----
kpublictransport-23.08.3.tar.xz
kpublictransport-23.08.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpublictransport.spec ++++++
--- /var/tmp/diff_new_pack.WPDI8i/_old 2023-11-10 12:35:36.949579976 +0100
+++ /var/tmp/diff_new_pack.WPDI8i/_new 2023-11-10 12:35:36.949579976 +0100
@@ -20,7 +20,7 @@
%global lname libKPublicTransport%{sover}
%bcond_without released
Name: kpublictransport
-Version: 23.08.2
+Version: 23.08.3
Release: 0
Summary: QML imports for querying public transport data
License: LGPL-2.0-or-later
++++++ kpublictransport-23.08.2.tar.xz -> kpublictransport-23.08.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.08.2/CMakeLists.txt
new/kpublictransport-23.08.3/CMakeLists.txt
--- old/kpublictransport-23.08.2/CMakeLists.txt 2023-10-10 05:13:07.000000000
+0200
+++ new/kpublictransport-23.08.3/CMakeLists.txt 2023-11-04 11:43:08.000000000
+0100
@@ -6,7 +6,7 @@
# KDE Application Version, managed by release script
set (RELEASE_SERVICE_VERSION_MAJOR "23")
set (RELEASE_SERVICE_VERSION_MINOR "08")
-set (RELEASE_SERVICE_VERSION_MICRO "2")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
set (RELEASE_SERVICE_VERSION
"${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(KPublicTransport VERSION ${RELEASE_SERVICE_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.08.2/autotests/data/onboard-journey/db-ice-canceled-stops.in.json
new/kpublictransport-23.08.3/autotests/data/onboard-journey/db-ice-canceled-stops.in.json
---
old/kpublictransport-23.08.2/autotests/data/onboard-journey/db-ice-canceled-stops.in.json
1970-01-01 01:00:00.000000000 +0100
+++
new/kpublictransport-23.08.3/autotests/data/onboard-journey/db-ice-canceled-stops.in.json
2023-11-04 11:43:08.000000000 +0100
@@ -0,0 +1 @@
+{"trip":{"tripDate":"2023-11-02","trainType":"ICE","vzn":"943","actualPosition":0,"distanceFromLastStop":3900,"totalDistance":506420,"stopInfo":{"scheduledNext":"8000082","actualNext":"8000082","actualLast":"8000085","actualLastStarted":"8000082","finalStationName":"Berlin
Ostbahnhof","finalStationEvaNr":"8010255"},"stops":[{"station":{"evaNr":"8000085","name":"Düsseldorf
Hbf","code":null,"geocoordinates":{"latitude":51.219962,"longitude":6.794319}},"timetable":{"scheduledArrivalTime":null,"actualArrivalTime":null,"showActualArrivalTime":null,"arrivalDelay":"","scheduledDepartureTime":1698936540000,"actualDepartureTime":1698936741000,"showActualDepartureTime":true,"departureDelay":"+3"},"track":{"scheduled":"19","actual":"19"},"info":{"status":0,"passed":true,"positionStatus":"departed","distance":0,"distanceFromStart":0},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8000082","name":"Düsseldorf
Flughafen","code":null,"geocoordinates":{"latitude"
:51.292009,"longitude":6.786836}},"timetable":{"scheduledArrivalTime":1698937020000,"actualArrivalTime":1698937200000,"showActualArrivalTime":true,"arrivalDelay":"+3","scheduledDepartureTime":1698937080000,"actualDepartureTime":1698937260000,"showActualDepartureTime":true,"departureDelay":"+3"},"track":{"scheduled":"1","actual":"1"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":8030,"distanceFromStart":8030},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8000086","name":"Duisburg
Hbf","code":null,"geocoordinates":{"latitude":51.429785,"longitude":6.775903}},"timetable":{"scheduledArrivalTime":1698937680000,"actualArrivalTime":1698937860000,"showActualArrivalTime":true,"arrivalDelay":"+3","scheduledDepartureTime":1698937740000,"actualDepartureTime":1698938040000,"showActualDepartureTime":true,"departureDelay":"+5"},"track":{"scheduled":"13","actual":"12"},"info":{"status":0,"passed":false,"positionStatus":"future","distance"
:15343,"distanceFromStart":23373},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8000098","name":"Essen
Hbf","code":null,"geocoordinates":{"latitude":51.451355,"longitude":7.014793}},"timetable":{"scheduledArrivalTime":1698938460000,"actualArrivalTime":1698938460000,"showActualArrivalTime":true,"arrivalDelay":"","scheduledDepartureTime":1698938520000,"actualDepartureTime":1698938520000,"showActualDepartureTime":true,"departureDelay":""},"track":{"scheduled":"6","actual":"6"},"info":{"status":1,"passed":false,"positionStatus":null,"distance":0,"distanceFromStart":0},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8000041","name":"Bochum
Hbf","code":null,"geocoordinates":{"latitude":51.478609,"longitude":7.223275}},"timetable":{"scheduledArrivalTime":1698939180000,"actualArrivalTime":1698939180000,"showActualArrivalTime":true,"arrivalDelay":"","scheduledDepartureTime":1698939240000,"actualDepartureTime":1698939240000
,"showActualDepartureTime":true,"departureDelay":""},"track":{"scheduled":"5","actual":"5"},"info":{"status":1,"passed":false,"positionStatus":null,"distance":0,"distanceFromStart":0},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8000080","name":"Dortmund
Hbf","code":null,"geocoordinates":{"latitude":51.517896,"longitude":7.45929}},"timetable":{"scheduledArrivalTime":1698939900000,"actualArrivalTime":1698941100000,"showActualArrivalTime":true,"arrivalDelay":"+20","scheduledDepartureTime":1698940020000,"actualDepartureTime":1698941220000,"showActualDepartureTime":true,"departureDelay":"+20"},"track":{"scheduled":"8","actual":"8"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":48348,"distanceFromStart":71721},"delayReasons":[{"code":"58","text":"Umleitung
des
Zuges"}]},{"station":{"evaNr":"8000149","name":"Hamm(Westf)Hbf","code":null,"geocoordinates":{"latitude":51.678078,"longitude":7.807821}},"timetable":{"scheduledArrivalT
ime":1698941220000,"actualArrivalTime":1698942420000,"showActualArrivalTime":true,"arrivalDelay":"+20","scheduledDepartureTime":1698941460000,"actualDepartureTime":1698942660000,"showActualDepartureTime":true,"departureDelay":"+20"},"track":{"scheduled":"5","actual":"5"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":29955,"distanceFromStart":101676},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8000152","name":"Hannover
Hbf","code":null,"geocoordinates":{"latitude":52.376761,"longitude":9.741021}},"timetable":{"scheduledArrivalTime":1698946080000,"actualArrivalTime":1698947280000,"showActualArrivalTime":true,"arrivalDelay":"+20","scheduledDepartureTime":1698946260000,"actualDepartureTime":1698947460000,"showActualDepartureTime":true,"departureDelay":"+20"},"track":{"scheduled":"9","actual":"9"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":153428,"distanceFromStart":255104},"delayReasons":[{"code":
"58","text":"Umleitung des
Zuges"}]},{"station":{"evaNr":"8006552","name":"Wolfsburg
Hbf","code":null,"geocoordinates":{"latitude":52.429498,"longitude":10.787784}},"timetable":{"scheduledArrivalTime":1698948180000,"actualArrivalTime":1698949380000,"showActualArrivalTime":true,"arrivalDelay":"+20","scheduledDepartureTime":1698948240000,"actualDepartureTime":1698949440000,"showActualDepartureTime":true,"departureDelay":"+20"},"track":{"scheduled":"5","actual":"5"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":71274,"distanceFromStart":326378},"delayReasons":[{"code":"58","text":"Umleitung
des
Zuges"}]},{"station":{"evaNr":"8010404","name":"Berlin-Spandau","code":null,"geocoordinates":{"latitude":52.5346481,"longitude":13.1968975}},"timetable":{"scheduledArrivalTime":1698951480000,"actualArrivalTime":1698952680000,"showActualArrivalTime":true,"arrivalDelay":"+20","scheduledDepartureTime":1698951600000,"actualDepartureTime":1698952800000,"showActualDepartureTim
e":true,"departureDelay":"+20"},"track":{"scheduled":"6","actual":"6"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":163599,"distanceFromStart":489977},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8011160","name":"Berlin
Hbf","code":null,"geocoordinates":{"latitude":52.525592,"longitude":13.369545}},"timetable":{"scheduledArrivalTime":1698952500000,"actualArrivalTime":1698953700000,"showActualArrivalTime":true,"arrivalDelay":"+20","scheduledDepartureTime":1698952740000,"actualDepartureTime":1698953820000,"showActualDepartureTime":true,"departureDelay":"+18"},"track":{"scheduled":"11","actual":"11"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":11725,"distanceFromStart":501702},"delayReasons":[{"code":"58","text":"Umleitung
des Zuges"}]},{"station":{"evaNr":"8010255","name":"Berlin
Ostbahnhof","code":null,"geocoordinates":{"latitude":52.5104881,"longitude":13.4346807}},"timetable":{"scheduledArriva
lTime":1698953220000,"actualArrivalTime":1698954300000,"showActualArrivalTime":true,"arrivalDelay":"+18","scheduledDepartureTime":null,"actualDepartureTime":null,"showActualDepartureTime":null,"departureDelay":""},"track":{"scheduled":"3","actual":"3"},"info":{"status":0,"passed":false,"positionStatus":"future","distance":4718,"distanceFromStart":506420},"delayReasons":[{"code":"58","text":"Umleitung
des
Zuges"}]}]},"connection":{"trainType":null,"vzn":null,"trainNumber":null,"station":null,"timetable":null,"track":null,"info":null,"stops":null,"conflict":"NO_CONFLICT"},"active":null}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.08.2/autotests/data/onboard-journey/db-ice-canceled-stops.out.json
new/kpublictransport-23.08.3/autotests/data/onboard-journey/db-ice-canceled-stops.out.json
---
old/kpublictransport-23.08.2/autotests/data/onboard-journey/db-ice-canceled-stops.out.json
1970-01-01 01:00:00.000000000 +0100
+++
new/kpublictransport-23.08.3/autotests/data/onboard-journey/db-ice-canceled-stops.out.json
2023-11-04 11:43:08.000000000 +0100
@@ -0,0 +1,386 @@
+{
+ "sections": [
+ {
+ "disruptionEffect": "NormalService",
+ "distance": 506420,
+ "expectedArrivalPlatform": "3",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:45:00+01:00"
+ },
+ "expectedDeparturePlatform": "19",
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T15:52:21+01:00"
+ },
+ "from": {
+ "identifier": {
+ "ibnr": "8000085"
+ },
+ "latitude": 51.21996307373047,
+ "longitude": 6.794319152832031,
+ "name": "Düsseldorf Hbf",
+ "type": "Stop"
+ },
+ "intermediateStops": [
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:00:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:01:00+01:00"
+ },
+ "expectedPlatform": "1",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T15:57:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T15:58:00+01:00"
+ },
+ "scheduledPlatform": "1",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8000082"
+ },
+ "latitude": 51.29200744628906,
+ "longitude": 6.78683614730835,
+ "name": "Düsseldorf Flughafen",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:11:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:14:00+01:00"
+ },
+ "expectedPlatform": "12",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:08:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:09:00+01:00"
+ },
+ "scheduledPlatform": "13",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8000086"
+ },
+ "latitude": 51.429786682128906,
+ "longitude": 6.775903224945068,
+ "name": "Duisburg Hbf",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NoService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:21:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:22:00+01:00"
+ },
+ "expectedPlatform": "6",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:21:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:22:00+01:00"
+ },
+ "scheduledPlatform": "6",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8000098"
+ },
+ "latitude": 51.45135498046875,
+ "longitude": 7.0147929191589355,
+ "name": "Essen Hbf",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NoService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:33:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:34:00+01:00"
+ },
+ "expectedPlatform": "5",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:33:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:34:00+01:00"
+ },
+ "scheduledPlatform": "5",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8000041"
+ },
+ "latitude": 51.478607177734375,
+ "longitude": 7.223275184631348,
+ "name": "Bochum Hbf",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T17:05:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T17:07:00+01:00"
+ },
+ "expectedPlatform": "8",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:45:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T16:47:00+01:00"
+ },
+ "scheduledPlatform": "8",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8000080"
+ },
+ "latitude": 51.51789474487305,
+ "longitude": 7.459290027618408,
+ "name": "Dortmund Hbf",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T17:27:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T17:31:00+01:00"
+ },
+ "expectedPlatform": "5",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T17:07:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T17:11:00+01:00"
+ },
+ "scheduledPlatform": "5",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8000149"
+ },
+ "latitude": 51.678077697753906,
+ "longitude": 7.807820796966553,
+ "name": "Hamm(Westf)Hbf",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T18:48:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T18:51:00+01:00"
+ },
+ "expectedPlatform": "9",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T18:28:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T18:31:00+01:00"
+ },
+ "scheduledPlatform": "9",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8000152"
+ },
+ "latitude": 52.37676239013672,
+ "longitude": 9.741021156311035,
+ "name": "Hannover Hbf",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T19:23:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T19:24:00+01:00"
+ },
+ "expectedPlatform": "5",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T19:03:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T19:04:00+01:00"
+ },
+ "scheduledPlatform": "5",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8006552"
+ },
+ "latitude": 52.42949676513672,
+ "longitude": 10.7877836227417,
+ "name": "Wolfsburg Hbf",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:18:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:20:00+01:00"
+ },
+ "expectedPlatform": "6",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T19:58:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:00:00+01:00"
+ },
+ "scheduledPlatform": "6",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8010404"
+ },
+ "latitude": 52.53464889526367,
+ "longitude": 13.196897506713867,
+ "name": "Berlin-Spandau",
+ "type": "Stop"
+ }
+ },
+ {
+ "disruptionEffect": "NormalService",
+ "expectedArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:35:00+01:00"
+ },
+ "expectedDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:37:00+01:00"
+ },
+ "expectedPlatform": "11",
+ "notes": [
+ "Umleitung des Zuges"
+ ],
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:15:00+01:00"
+ },
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:19:00+01:00"
+ },
+ "scheduledPlatform": "11",
+ "stopPoint": {
+ "identifier": {
+ "ibnr": "8011160"
+ },
+ "latitude": 52.52559280395508,
+ "longitude": 13.369544982910156,
+ "name": "Berlin Hbf",
+ "type": "Stop"
+ }
+ }
+ ],
+ "mode": "PublicTransport",
+ "route": {
+ "direction": "Berlin Ostbahnhof",
+ "line": {
+ "mode": "LongDistanceTrain",
+ "name": "ICE 943"
+ }
+ },
+ "scheduledArrivalPlatform": "3",
+ "scheduledArrivalTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T20:27:00+01:00"
+ },
+ "scheduledDeparturePlatform": "19",
+ "scheduledDepartureTime": {
+ "timezone": "Europe/Berlin",
+ "value": "2023-11-02T15:49:00+01:00"
+ },
+ "to": {
+ "identifier": {
+ "ibnr": "8010255"
+ },
+ "latitude": 52.5104866027832,
+ "longitude": 13.434680938720703,
+ "name": "Berlin Ostbahnhof",
+ "type": "Stop"
+ }
+ }
+ ]
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.08.2/autotests/onboardstatustest.cpp
new/kpublictransport-23.08.3/autotests/onboardstatustest.cpp
--- old/kpublictransport-23.08.2/autotests/onboardstatustest.cpp
2023-10-10 05:13:07.000000000 +0200
+++ new/kpublictransport-23.08.3/autotests/onboardstatustest.cpp
2023-11-04 11:43:08.000000000 +0100
@@ -105,6 +105,7 @@
QTest::newRow("cd-railjet") << s("ceskedrahy") << s("cd-railjet");
QTest::newRow("db-ice") << s("deutschebahn-ice") << s("db-ice");
+ QTest::newRow("db-ice-canceled-stops") << s("deutschebahn-ice") <<
s("db-ice-canceled-stops");
QTest::newRow("db-zugportal") << s("deutschebahn-zugportal") <<
s("db-zugportal");
QTest::newRow("db-zugportal-canceled") << s("deutschebahn-zugportal")
<< s("db-zugportal-canceled");
QTest::newRow("sncf-inoui") << s("sncf-tgv") << s("sncf-inoui");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.08.2/src/lib/datatypes/location.cpp
new/kpublictransport-23.08.3/src/lib/datatypes/location.cpp
--- old/kpublictransport-23.08.2/src/lib/datatypes/location.cpp 2023-10-10
05:13:07.000000000 +0200
+++ new/kpublictransport-23.08.3/src/lib/datatypes/location.cpp 2023-11-04
11:43:08.000000000 +0100
@@ -234,13 +234,9 @@
static bool isCompatibleLocationType(Location::Type lhs, Location::Type rhs)
{
- if (lhs == rhs) {
- return true;
- }
- if (rhs != Location::Place) {
- return false;
- }
- return lhs == Location::Stop;
+ return lhs == rhs
+ || (lhs == Location::Place && rhs == Location::Stop)
+ || (rhs == Location::Place && lhs == Location::Stop);
}
static int isSameDistanceThreshold(Location::Type type)
@@ -267,7 +263,7 @@
return false;
}
// incompatible types are also unmergable
- if (!isCompatibleLocationType(lhs.type(), rhs.type()) ||
!isCompatibleLocationType(rhs.type(), lhs.type())) {
+ if (!isCompatibleLocationType(lhs.type(), rhs.type())) {
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.08.2/src/onboard/data/deutschebahn.js
new/kpublictransport-23.08.3/src/onboard/data/deutschebahn.js
--- old/kpublictransport-23.08.2/src/onboard/data/deutschebahn.js
2023-10-10 05:13:07.000000000 +0200
+++ new/kpublictransport-23.08.3/src/onboard/data/deutschebahn.js
2023-11-04 11:43:08.000000000 +0100
@@ -49,6 +49,9 @@
stop.notes.push(d.text);
}
}
+ if (s.info.status === 1 && s.info.distanceFromStart === 0) {
+ stop.disruptionEffect = 'NoService';
+ }
section.intermediateStops.push(stop);
}
