Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kpublictransport for
openSUSE:Factory checked in at 2022-01-11 21:18:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpublictransport (Old)
and /work/SRC/openSUSE:Factory/.kpublictransport.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpublictransport"
Tue Jan 11 21:18:51 2022 rev:14 rq:944382 version:21.12.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpublictransport/kpublictransport.changes
2021-12-13 20:48:56.572579128 +0100
+++
/work/SRC/openSUSE:Factory/.kpublictransport.new.1892/kpublictransport.changes
2022-01-11 21:22:45.129105798 +0100
@@ -1,0 +2,12 @@
+Tue Jan 4 10:26:08 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.12.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/21.12.1/
+- Changes since 21.12.0:
+ * Also register RentalVehicleStation for use from QML
+ * Parse alternative Hafas platform format as well
+ * Remove superfluous export macro
+
+-------------------------------------------------------------------
Old:
----
kpublictransport-21.12.0.tar.xz
kpublictransport-21.12.0.tar.xz.sig
New:
----
kpublictransport-21.12.1.tar.xz
kpublictransport-21.12.1.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpublictransport.spec ++++++
--- /var/tmp/diff_new_pack.bkjOhS/_old 2022-01-11 21:22:45.641106158 +0100
+++ /var/tmp/diff_new_pack.bkjOhS/_new 2022-01-11 21:22:45.645106161 +0100
@@ -20,15 +20,15 @@
%global lname libKPublicTransport%{sover}
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
-%bcond_without lang
+%bcond_without released
Name: kpublictransport
-Version: 21.12.0
+Version: 21.12.1
Release: 0
Summary: QML imports for querying public transport data
License: LGPL-2.0-or-later
URL: https://www.kde.org
Source0:
https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-%if %{with lang}
+%if %{with released}
Source1:
https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
++++++ kpublictransport-21.12.0.tar.xz -> kpublictransport-21.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-21.12.0/CMakeLists.txt
new/kpublictransport-21.12.1/CMakeLists.txt
--- old/kpublictransport-21.12.0/CMakeLists.txt 2021-12-02 23:00:52.000000000
+0100
+++ new/kpublictransport-21.12.1/CMakeLists.txt 2022-01-03 22:15:01.000000000
+0100
@@ -6,7 +6,7 @@
# KDE Application Version, managed by release script
set (RELEASE_SERVICE_VERSION_MAJOR "21")
set (RELEASE_SERVICE_VERSION_MINOR "12")
-set (RELEASE_SERVICE_VERSION_MICRO "0")
+set (RELEASE_SERVICE_VERSION_MICRO "1")
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-21.12.0/autotests/data/hafas/journey-vsn-alternative-platform-data.in.json
new/kpublictransport-21.12.1/autotests/data/hafas/journey-vsn-alternative-platform-data.in.json
---
old/kpublictransport-21.12.0/autotests/data/hafas/journey-vsn-alternative-platform-data.in.json
1970-01-01 01:00:00.000000000 +0100
+++
new/kpublictransport-21.12.1/autotests/data/hafas/journey-vsn-alternative-platform-data.in.json
2022-01-03 22:15:01.000000000 +0100
@@ -0,0 +1 @@
+{"ver":"1.27","lang":"deu","err":"OK","graph":{"id":"standard","index":0},"subGraph":{"id":"global","index":0},"view":{"id":"standard","index":0,"type":"WGS84"},"svcResL":[{"meth":"TripSearch","err":"OK","res":{"common":{"locL":[{"lid":"A=1@O=Hannover
Messe/Laatzen@X=9792867@Y=52316896@U=80@L=8003487@","type":"S","name":"Hannover
Messe/Laatzen","icoX":0,"extId":"8003487","state":"F","crd":{"x":9792867,"y":52316896,"floor":0},"pCls":63,"gidL":["A??de:03241:9830"]},{"lid":"A=1@O=Hannover
Hbf@X=9741988@Y=52377375@U=80@L=8000152@","type":"S","name":"Hannover
Hbf","icoX":0,"extId":"8000152","state":"F","crd":{"x":9741988,"y":52377375,"floor":0},"pCls":31,"gidL":["A??de:03241:31"]},{"lid":"A=1@O=Hildesheim
Hbf@X=9953495@Y=52160627@U=80@L=8000169@","type":"S","name":"Hildesheim
Hbf","icoX":0,"extId":"8000169","state":"F","crd":{"x":9953495,"y":52160627,"floor":0},"pCls":31,"gidL":["A??de:03254:9922"]}],"prodL":[{"pid":"L::4::S::B0269298727::800244_S4::*","name":"S4","nameS":"S4","number":"
S4","icoX":2,"cls":16,"oprX":0,"prodCtx":{"name":"
S4","num":"36","line":"S4","matchId":"34434","catOut":"S
","catOutS":"s","catOutL":"S-Bahn","catIn":"s","catCode":"4","admin":"800244"}},{"pid":"L::4::S::B0269298727::800244_S4::*","name":"S4","nameS":"S4","number":"S4","icoX":2,"cls":16,"oprX":1,"prodCtx":{"name":"
S4","num":"36","line":"S4","lineId":"800244_S4","matchId":"34434","catOut":"S
","catOutS":"s","catOutL":"S-Bahn","catIn":"s","catCode":"4","admin":"800244"}}],"opL":[{"name":"DB
Regio AG Nord","icoX":3},{"name":"DB Regio AG
Nord","icoX":3,"id":"1689"}],"remL":[{"type":"A","code":"PF","prio":200,"icoX":4,"txtN":"Maskenpflicht
nach gesetzl. Regelung; denken Sie an eine
FFP2-Maske"},{"type":"A","code":"3G","prio":205,"icoX":4,"txtN":"Im Zug gilt
bundesweit 3G-Regel: ein g??ltiger Nachweis ist
mitzuf??hren"},{"type":"A","code":"FK","prio":260,"icoX":5,"txtN":"Fahrradmitnahme
begrenzt m??glich (Hannover Messe/Laatzen)"},{"type":"A","code":"FK","prio":260
,"icoX":5,"txtN":"Fahrradmitnahme begrenzt m??glich (Hannover
Hbf)"},{"type":"A","code":"AO","prio":350,"icoX":4,"txtN":"Konsum alkoholischer
Getr??nke im Zug
verboten"},{"type":"A","code":"EH","prio":560,"icoX":4,"txtN":"Fahrzeuggebundene
Einstiegshilfe
vorhanden"}],"himL":[{"hid":"25662","act":true,"head":"Corona-Pr??ventionsma??nahme","text":"3G-Regel
im ??PNV (geimpft, genesen oder getestet). Bitte beachten Sie die
Maskenpflicht!","icoX":6,"prio":1,"fLocX":2,"tLocX":2,"prod":65535,"src":99,"lModDate":"20211123","lModTime":"171447","sDate":"20211124","sTime":"000000","eDate":"20221231","eTime":"235900","sDaily":"000000","eDaily":"235900","comp":"VBN","catRefL":[0],"pubChL":[{"name":"TIMETABLE","fDate":"20211123","fTime":"171300","tDate":"20221231","tTime":"235900"}]}],"icoL":[{"res":"prod_ice","fg":{"r":255,"g":255,"b":255},"bg":{"r":150,"g":25,"b":29}},{"res":"rt_ont"},{"res":"prod_comm","fg":{"r":255,"g":255,"b":255},"bg":{"r":19,"g":148,"b":69}},{"res":"RE","txt":"DB
Regio AG
Nord"},{"res":"INFO"},{"res":"attr_bike"},{"res":"HIM2"},{"res":"cl_all"}],"himMsgCatL":[{"id":2}],"lDrawStyleL":[{"sIcoX":2,"type":"SOLID","bg":{"r":19,"g":148,"b":69}},{"type":"SOLID","bg":{"r":19,"g":148,"b":69}}]},"outConL":[{"cid":"C-0","date":"20211212","dur":"000800","chg":0,"sDays":{"sDaysR":"nicht
t??glich","sDaysI":"12. Dez 2021 bis 1. Apr
2022","sDaysB":"0003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE00000000000000000000000"},"dep":{"locX":0,"idx":5,"dProdX":0,"dPltfS":{"type":"PL","txt":"16"},"dPltfR":{"type":"PL","txt":"16"},"dTimeS":"123000","dTimeR":"123000","dProgType":"PROGNOSED","type":"N"},"arr":{"locX":1,"idx":7,"aProdX":0,"aPltfS":{"type":"PL","txt":"2"},"aPltfR":{"type":"PL","txt":"2"},"aTimeS":"123800","aTimeR":"123800","aProgType":"PROGNOSED","type":"N"},"secL":[{"type":"JNY","dep":{"locX":0,"idx":5,"dProdX":0,"dPltfS":{"type":"PL","txt":"16"},"dPltfR":{"type":"PL","txt":"16"},"dTimeS":"123000","dTimeR":"123000","dProgType":"PROGNOSED","
type":"N"},"arr":{"locX":1,"idx":7,"aProdX":0,"aPltfS":{"type":"PL","txt":"2"},"aPltfR":{"type":"PL","txt":"2"},"aTimeS":"123800","aTimeR":"123800","aProgType":"PROGNOSED","type":"N"},"jny":{"jid":"1|235190|6|80|12122021","prodX":1,"dirTxt":"Bennem??hlen","dirFlg":"2","status":"P","isRchbl":true,"pos":{"x":9792606,"y":52317363},"freq":{"minC":60,"maxC":60,"numC":3},"ctxRecon":"T$A=1@O=Hannover
Messe/Laatzen@L=8003487@a=128@$A=1@O=Hannover
Hbf@L=8000152@a=128@$202112121230$202112121238$
S4$$1$$$$$$","msgL":[{"type":"REM","remX":0,"sty":"I","fLocX":0,"tLocX":1,"tagL":["RES_JNY_DTL"],"sort":831520768},{"type":"REM","remX":1,"sty":"I","fLocX":0,"tLocX":1,"tagL":["RES_JNY_DTL"],"sort":832176128},{"type":"REM","remX":2,"sty":"I","fLocX":0,"tLocX":0,"tagL":["RES_JNY_DTL"],"sort":839385088},{"type":"REM","remX":3,"sty":"I","fLocX":1,"tLocX":1,"tagL":["RES_JNY_DTL"],"sort":839385088},{"type":"REM","remX":4,"sty":"I","fLocX":0,"tLocX":1,"tagL":["RES_JNY_DTL"],"sort":851181568},{"type":"R
EM","remX":5,"sty":"I","fLocX":0,"tLocX":1,"tagL":["RES_JNY_DTL"],"sort":878706688},{"type":"HIM","himX":0,"sty":"M","fLocX":0,"tagL":["RES_GLB_HDR_H3","SUM_GLB_HDR_H3"],"sort":269798358}],"subscr":"F","prodL":[{"prodX":1,"fLocX":0,"tLocX":1,"fIdx":5,"tIdx":7}],"sumLDrawStyleX":0,"resLDrawStyleX":1,"trainStartDate":"20211212","durS":"000800"}}],"ctxRecon":"??HKI??T$A=1@O=Hannover
Messe/Laatzen@L=8003487@a=128@$A=1@O=Hannover
Hbf@L=8000152@a=128@$202112121230$202112121238$
S4$$1$$$$$$","freq":{"minC":60},"trfRes":{"statusCode":"NA","statusText":"
[1104]","bkgData":{"common":{},"BOG":{},"errCode":1200,"errMsg":"no relation
between 32413487 and 32410152 on 20211212 for bits
2"}},"conSubscr":"F","recState":"U","cksum":"12bc658a_3","cksumDti":"310925bc_3","intvlSubscr":"F"}]}}]}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-21.12.0/autotests/data/hafas/journey-vsn-alternative-platform-data.out.json
new/kpublictransport-21.12.1/autotests/data/hafas/journey-vsn-alternative-platform-data.out.json
---
old/kpublictransport-21.12.0/autotests/data/hafas/journey-vsn-alternative-platform-data.out.json
1970-01-01 01:00:00.000000000 +0100
+++
new/kpublictransport-21.12.1/autotests/data/hafas/journey-vsn-alternative-platform-data.out.json
2022-01-03 22:15:01.000000000 +0100
@@ -0,0 +1,54 @@
+[
+ {
+ "sections": [
+ {
+ "disruptionEffect": "NormalService",
+ "distance": 7561,
+ "expectedArrivalPlatform": "2",
+ "expectedArrivalTime": "2021-12-12T12:38:00",
+ "expectedDeparturePlatform": "16",
+ "expectedDepartureTime": "2021-12-12T12:30:00",
+ "from": {
+ "identifier": {
+ "unit-test": "8003487"
+ },
+ "latitude": 52.31689453125,
+ "longitude": 9.792866706848145,
+ "name": "Hannover Messe/Laatzen",
+ "type": "Stop"
+ },
+ "mode": "PublicTransport",
+ "notes": [
+ "Maskenpflicht nach gesetzl. Regelung; denken Sie an eine
FFP2-Maske",
+ "Im Zug gilt bundesweit 3G-Regel: ein g??ltiger Nachweis
ist mitzuf??hren",
+ "Fahrradmitnahme begrenzt m??glich (Hannover
Messe/Laatzen)",
+ "Fahrradmitnahme begrenzt m??glich (Hannover Hbf)",
+ "Konsum alkoholischer Getr??nke im Zug verboten",
+ "Fahrzeuggebundene Einstiegshilfe vorhanden",
+ "Corona-Pr??ventionsma??nahme\n\n3G-Regel im ??PNV
(geimpft, genesen oder getestet). Bitte beachten Sie die Maskenpflicht!"
+ ],
+ "route": {
+ "direction": "Bennem??hlen",
+ "line": {
+ "color": "#139445",
+ "name": "S4",
+ "textColor": "#ffffff"
+ }
+ },
+ "scheduledArrivalPlatform": "2",
+ "scheduledArrivalTime": "2021-12-12T12:38:00",
+ "scheduledDeparturePlatform": "16",
+ "scheduledDepartureTime": "2021-12-12T12:30:00",
+ "to": {
+ "identifier": {
+ "unit-test": "8000152"
+ },
+ "latitude": 52.377376556396484,
+ "longitude": 9.741988182067871,
+ "name": "Hannover Hbf",
+ "type": "Stop"
+ }
+ }
+ ]
+ }
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-21.12.0/autotests/hafasmgateparsertest.cpp
new/kpublictransport-21.12.1/autotests/hafasmgateparsertest.cpp
--- old/kpublictransport-21.12.0/autotests/hafasmgateparsertest.cpp
2021-12-02 23:00:52.000000000 +0100
+++ new/kpublictransport-21.12.1/autotests/hafasmgateparsertest.cpp
2022-01-03 22:15:01.000000000 +0100
@@ -139,6 +139,9 @@
QTest::newRow("de-bvg-alternative-load-messages")
<< s(SOURCE_DIR "/data/hafas/journey-bvg-load-messages.in.json")
<< s(SOURCE_DIR "/data/hafas/journey-bvg-load-messages.out.json");
+ QTest::newRow("de-vsn-alternative-platform-data")
+ << s(SOURCE_DIR
"/data/hafas/journey-vsn-alternative-platform-data.in.json")
+ << s(SOURCE_DIR
"/data/hafas/journey-vsn-alternative-platform-data.out.json");
}
void testParseJourneys()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-21.12.0/src/lib/backends/hafasmgateparser.cpp
new/kpublictransport-21.12.1/src/lib/backends/hafasmgateparser.cpp
--- old/kpublictransport-21.12.0/src/lib/backends/hafasmgateparser.cpp
2021-12-02 23:00:52.000000000 +0100
+++ new/kpublictransport-21.12.1/src/lib/backends/hafasmgateparser.cpp
2022-01-03 22:15:01.000000000 +0100
@@ -271,6 +271,17 @@
return lines;
}
+static QString parsePlatform(const QJsonObject &obj, char ad, char rs)
+{
+ const auto p = obj.value(QLatin1Char(ad) + QLatin1String("Platf") +
QLatin1Char(rs)).toString();
+ if (!p.isEmpty()) {
+ return p;
+ }
+
+ const auto pObj = obj.value(QLatin1Char(ad) + QLatin1String("Pltf") +
QLatin1Char(rs)).toObject();
+ return pObj.value(QLatin1String("txt")).toString();
+}
+
std::vector<Stopover> HafasMgateParser::parseStationBoardResponse(const
QJsonObject &obj) const
{
const auto commonObj = obj.value(QLatin1String("common")).toObject();
@@ -302,13 +313,13 @@
dep.setScheduledArrivalTime(parseDateTime(dateStr,
stbStop.value(QLatin1String("aTimeS")),
stbStop.value(QLatin1String("aTZOffset"))));
dep.setExpectedArrivalTime(parseDateTime(dateStr,
stbStop.value(QLatin1String("aTimeR")),
stbStop.value(QLatin1String("aTZOffset"))));
-
dep.setScheduledPlatform(stbStop.value(QLatin1String("dPlatfS")).toString());
-
dep.setExpectedPlatform(stbStop.value(QLatin1String("dPlatfR")).toString());
+ dep.setScheduledPlatform(parsePlatform(stbStop, 'd', 'S'));
+ dep.setExpectedPlatform(parsePlatform(stbStop, 'd', 'R'));
if (dep.scheduledPlatform().isEmpty()) {
-
dep.setScheduledPlatform(stbStop.value(QLatin1String("aPlatfS")).toString());
+ dep.setScheduledPlatform(parsePlatform(stbStop, 'a', 'S'));
}
if (dep.expectedPlatform().isEmpty()) {
-
dep.setExpectedPlatform(stbStop.value(QLatin1String("aPlatfR")).toString());
+ dep.setExpectedPlatform(parsePlatform(stbStop, 'a', 'R'));
}
if (stbStop.value(QLatin1String("dCncl")).toBool()) {
dep.setDisruptionEffect(Disruption::NoService);
@@ -634,8 +645,8 @@
parseMcpData(dep, loc);
section.setFrom(std::move(loc));
}
-
section.setScheduledDeparturePlatform(dep.value(QLatin1String("dPlatfS")).toString());
-
section.setExpectedDeparturePlatform(dep.value(QLatin1String("dPlatfR")).toString());
+ section.setScheduledDeparturePlatform(parsePlatform(dep, 'd',
'S'));
+ section.setExpectedDeparturePlatform(parsePlatform(dep, 'd', 'R'));
if (dep.value(QLatin1String("dCncl")).toBool()) {
section.setDisruptionEffect(Disruption::NoService);
}
@@ -649,8 +660,8 @@
parseMcpData(arr, loc);
section.setTo(loc);
}
-
section.setScheduledArrivalPlatform(arr.value(QLatin1String("aPlatfS")).toString());
-
section.setExpectedArrivalPlatform(arr.value(QLatin1String("aPlatfR")).toString());
+ section.setScheduledArrivalPlatform(parsePlatform(arr, 'a', 'S'));
+ section.setExpectedArrivalPlatform(parsePlatform(arr, 'a', 'R'));
if (arr.value(QLatin1String("aCncl")).toBool()) {
section.setDisruptionEffect(Disruption::NoService);
}
@@ -687,8 +698,8 @@
stop.setExpectedDepartureTime(parseDateTime(dateStr,
stopObj.value(QLatin1String("dTimeR")),
stopObj.value(QLatin1String("dTZOffset"))));
stop.setScheduledArrivalTime(parseDateTime(dateStr,
stopObj.value(QLatin1String("aTimeS")),
stopObj.value(QLatin1String("aTZOffset"))));
stop.setExpectedArrivalTime(parseDateTime(dateStr,
stopObj.value(QLatin1String("aTimeR")),
stopObj.value(QLatin1String("aTZOffset"))));
-
stop.setScheduledPlatform(stopObj.value(QLatin1String("dPlatfS")).toString());
-
stop.setExpectedPlatform(stopObj.value(QLatin1String("dPlatfR")).toString());
+ stop.setScheduledPlatform(parsePlatform(stopObj, 'd',
'S'));
+ stop.setExpectedPlatform(parsePlatform(stopObj, 'd',
'R'));
if (stopObj.value(QLatin1String("aCncl")).toBool() ||
stopObj.value(QLatin1String("dCncl")).toBool()) {
stop.setDisruptionEffect(Disruption::NoService);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-21.12.0/src/lib/gbfs/gbfsservice.h
new/kpublictransport-21.12.1/src/lib/gbfs/gbfsservice.h
--- old/kpublictransport-21.12.0/src/lib/gbfs/gbfsservice.h 2021-12-02
23:00:52.000000000 +0100
+++ new/kpublictransport-21.12.1/src/lib/gbfs/gbfsservice.h 2022-01-03
22:15:01.000000000 +0100
@@ -39,7 +39,7 @@
*/
void generateSystemId();
- static KPUBLICTRANSPORT_EXPORT QJsonObject toJson(const GBFSService
&service);
+ static QJsonObject toJson(const GBFSService &service);
static GBFSService fromJson(const QJsonObject &obj);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-21.12.0/src/qmlplugin/kpublictransportqmlplugin.cpp
new/kpublictransport-21.12.1/src/qmlplugin/kpublictransportqmlplugin.cpp
--- old/kpublictransport-21.12.0/src/qmlplugin/kpublictransportqmlplugin.cpp
2021-12-02 23:00:52.000000000 +0100
+++ new/kpublictransport-21.12.1/src/qmlplugin/kpublictransportqmlplugin.cpp
2022-01-03 22:15:01.000000000 +0100
@@ -39,6 +39,7 @@
qRegisterMetaType<KPublicTransport::Location>();
qRegisterMetaType<KPublicTransport::Platform>();
qRegisterMetaType<KPublicTransport::RentalVehicle>();
+ qRegisterMetaType<KPublicTransport::RentalVehicleStation>();
qRegisterMetaType<KPublicTransport::Stopover>();
qRegisterMetaType<KPublicTransport::IndividualTransport>();
// backward compat
