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-07-07 15:49:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpublictransport (Old)
and /work/SRC/openSUSE:Factory/.kpublictransport.new.23466 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpublictransport"
Fri Jul 7 15:49:07 2023 rev:32 rq:1097323 version:23.04.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpublictransport/kpublictransport.changes
2023-06-09 20:41:40.480030538 +0200
+++
/work/SRC/openSUSE:Factory/.kpublictransport.new.23466/kpublictransport.changes
2023-07-07 15:51:36.085726131 +0200
@@ -1,0 +2,19 @@
+Tue Jul 4 10:20:10 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.04.3
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/23.04.3/
+- Changes since 23.04.2:
+ * Drop implausible section paths
+ * Apply check for physical limits also to walking sections
+ * Fix long distance bus line mode for VOR
+ * Remove dead OTP endpoints in Münster and Ulm
+ * Also request the top-level transport mode for Entur stopover queries
+ * Parse OTP transit legs without a transport mode subtype correctly
+ * Make VRS work again
+ * Add support for PKCS#12 client certificate bundles
+ * Apply SSL configuration to IVV ASS network requests as well
+ * Don't crash when setting custom QNAM when there isn't a default one yet
+
+-------------------------------------------------------------------
Old:
----
kpublictransport-23.04.2.tar.xz
kpublictransport-23.04.2.tar.xz.sig
New:
----
kpublictransport-23.04.3.tar.xz
kpublictransport-23.04.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpublictransport.spec ++++++
--- /var/tmp/diff_new_pack.S30X4c/_old 2023-07-07 15:51:36.577729062 +0200
+++ /var/tmp/diff_new_pack.S30X4c/_new 2023-07-07 15:51:36.577729062 +0200
@@ -20,7 +20,7 @@
%global lname libKPublicTransport%{sover}
%bcond_without released
Name: kpublictransport
-Version: 23.04.2
+Version: 23.04.3
Release: 0
Summary: QML imports for querying public transport data
License: LGPL-2.0-or-later
++++++ kpublictransport-23.04.2.tar.xz -> kpublictransport-23.04.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.2/.reuse/dep5
new/kpublictransport-23.04.3/.reuse/dep5
--- old/kpublictransport-23.04.2/.reuse/dep5 2023-06-02 20:35:14.000000000
+0200
+++ new/kpublictransport-23.04.3/.reuse/dep5 2023-06-30 16:19:37.000000000
+0200
@@ -11,7 +11,7 @@
Copyright: none
License: CC0-1.0
-Files: src/lib/networks/certs/*.pem
+Files: src/lib/networks/certs/*.pem src/lib/networks/certs/*.pfx
Copyright: none
License: CC0-1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.2/CMakeLists.txt
new/kpublictransport-23.04.3/CMakeLists.txt
--- old/kpublictransport-23.04.2/CMakeLists.txt 2023-06-02 20:35:14.000000000
+0200
+++ new/kpublictransport-23.04.3/CMakeLists.txt 2023-06-30 16:19:37.000000000
+0200
@@ -6,7 +6,7 @@
# KDE Application Version, managed by release script
set (RELEASE_SERVICE_VERSION_MAJOR "23")
set (RELEASE_SERVICE_VERSION_MINOR "04")
-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.04.2/autotests/data/otp/de-ulm-rentalbike-journey.in.json
new/kpublictransport-23.04.3/autotests/data/otp/de-ulm-rentalbike-journey.in.json
---
old/kpublictransport-23.04.2/autotests/data/otp/de-ulm-rentalbike-journey.in.json
2023-06-02 20:35:14.000000000 +0200
+++
new/kpublictransport-23.04.3/autotests/data/otp/de-ulm-rentalbike-journey.in.json
2023-06-30 16:19:37.000000000 +0200
@@ -28,7 +28,7 @@
"id": "QmlrZVJlbnRhbFN0YXRpb246Nw==",
"stationId": "7",
"networks": [
- "openbike"
+ "regiorad"
],
"bikesAvailable": 2
}
@@ -53,7 +53,7 @@
"bikeRentalStation": {
"id": "QmlrZVJlbnRhbFN0YXRpb246Nw==",
"networks": [
- "openbike"
+ "regiorad"
],
"bikesAvailable": 2,
"spacesAvailable": 8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/autotests/data/otp/de-ulm-rentalbike-journey.out.json
new/kpublictransport-23.04.3/autotests/data/otp/de-ulm-rentalbike-journey.out.json
---
old/kpublictransport-23.04.2/autotests/data/otp/de-ulm-rentalbike-journey.out.json
2023-06-02 20:35:14.000000000 +0200
+++
new/kpublictransport-23.04.3/autotests/data/otp/de-ulm-rentalbike-journey.out.json
2023-06-30 16:19:37.000000000 +0200
@@ -23,7 +23,7 @@
"availableVehicles": 2,
"capacity": -1,
"network": {
- "name": "OpenBike Ulm",
+ "name": "RegioRad",
"vehicleTypes": "Bicycle"
}
},
@@ -44,7 +44,7 @@
"availableVehicles": 2,
"capacity": 8,
"network": {
- "name": "OpenBike Ulm",
+ "name": "RegioRad",
"vehicleTypes": "Bicycle"
}
},
@@ -53,7 +53,7 @@
"mode": "RentedVehicle",
"rentalVehicle": {
"network": {
- "name": "OpenBike Ulm",
+ "name": "RegioRad",
"vehicleTypes": "Bicycle"
},
"type": "Bicycle"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.2/autotests/otpparsertest.cpp
new/kpublictransport-23.04.3/autotests/otpparsertest.cpp
--- old/kpublictransport-23.04.2/autotests/otpparsertest.cpp 2023-06-02
20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/autotests/otpparsertest.cpp 2023-06-30
16:19:37.000000000 +0200
@@ -158,7 +158,7 @@
QTest::newRow("de-ulm-rentalbike-journey")
<< s(SOURCE_DIR "/data/otp/de-ulm-rentalbike-journey.in.json")
<< s(SOURCE_DIR "/data/otp/de-ulm-rentalbike-journey.out.json")
- << s(SOURCE_DIR "/../src/lib/networks/de_bw_ulm.json");
+ << s(SOURCE_DIR "/../src/lib/networks/de_bw_stadtnavi.json");
QTest::newRow("de-stadtnavi-carpool-journey")
<< s(SOURCE_DIR "/data/otp/de-stadtnavi-carpool-journey.in.json")
<< s(SOURCE_DIR "/data/otp/de-stadtnavi-carpool-journey.out.json")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/backends/abstractbackend.cpp
new/kpublictransport-23.04.3/src/lib/backends/abstractbackend.cpp
--- old/kpublictransport-23.04.2/src/lib/backends/abstractbackend.cpp
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/backends/abstractbackend.cpp
2023-06-30 16:19:37.000000000 +0200
@@ -231,13 +231,30 @@
m_customCaCerts = QSslCertificate::fromDevice(&f, QSsl::Pem);
}
-void AbstractBackend::applySslConfiguration(QNetworkRequest &request) const
+void AbstractBackend::setPkcs12(const QString &pkcs12Name)
{
- if (m_customCaCerts.empty()) {
+ QFile f(QLatin1String(":/org.kde.kpublictransport/network-certificates/")
+ pkcs12Name);
+ if (!f.open(QFile::ReadOnly)) {
+ qCWarning(Log) << f.fileName() << f.errorString();
return;
}
+ const auto r = QSslCertificate::importPkcs12(&f, &m_privateKey,
&m_clientCert, &m_customCaCerts, "");
+ if (!r) {
+ qCWarning(Log) << "Failed to load PKCS#12 bundle" << f.fileName();
+ }
+}
+void AbstractBackend::applySslConfiguration(QNetworkRequest &request) const
+{
auto sslConfig = request.sslConfiguration();
- sslConfig.setCaCertificates(m_customCaCerts);
+ if (!m_customCaCerts.empty()) {
+ sslConfig.setCaCertificates(m_customCaCerts);
+ }
+ if (!m_clientCert.isNull()) {
+ sslConfig.setLocalCertificate(m_clientCert);
+ }
+ if (!m_privateKey.isNull()) {
+ sslConfig.setPrivateKey(m_privateKey);
+ }
request.setSslConfiguration(std::move(sslConfig));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/backends/abstractbackend.h
new/kpublictransport-23.04.3/src/lib/backends/abstractbackend.h
--- old/kpublictransport-23.04.2/src/lib/backends/abstractbackend.h
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/backends/abstractbackend.h
2023-06-30 16:19:37.000000000 +0200
@@ -18,6 +18,7 @@
#include <QJsonObject>
#include <QPolygonF>
#include <QSslCertificate>
+#include <QSslKey>
#include <QTimeZone>
#include <QVariant>
@@ -44,6 +45,8 @@
{
Q_GADGET
Q_PROPERTY(QString customCaCertificate WRITE setCustomCaCertificate)
+ /** PKCS#12 client certificate bundle. */
+ Q_PROPERTY(QString pkcs12 WRITE setPkcs12)
public:
AbstractBackend();
virtual ~AbstractBackend();
@@ -201,12 +204,15 @@
void logRequest(const char *typeName, const QJsonObject &requestData,
const QNetworkRequest &netRequest, const QByteArray &postData) const;
void logReply(const char *typeName, QNetworkReply *netReply, const
QByteArray &data) const;
void setCustomCaCertificate(const QString &caCert);
+ void setPkcs12(const QString &pkcs12Name);
QString m_backendId;
Attribution m_attribution;
QTimeZone m_timeZone;
QStringList m_supportedLanguages;
QList<QSslCertificate> m_customCaCerts;
+ QSslCertificate m_clientCert;
+ QSslKey m_privateKey;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractBackend::Capabilities)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/backends/ivvassbackend.cpp
new/kpublictransport-23.04.3/src/lib/backends/ivvassbackend.cpp
--- old/kpublictransport-23.04.2/src/lib/backends/ivvassbackend.cpp
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/backends/ivvassbackend.cpp
2023-06-30 16:19:37.000000000 +0200
@@ -62,6 +62,7 @@
url.setQuery(query);
QNetworkRequest netRequest(url);
+ applySslConfiguration(netRequest);
logRequest(req, netRequest);
auto netReply = nam->get(netRequest);
netReply->setParent(reply);
@@ -111,6 +112,7 @@
url.setQuery(query);
QNetworkRequest netRequest(url);
+ applySslConfiguration(netRequest);
logRequest(req, netRequest);
auto netReply = nam->get(netRequest);
netReply->setParent(reply);
@@ -176,6 +178,7 @@
url.setQuery(query);
QNetworkRequest netRequest(url);
+ applySslConfiguration(netRequest);
logRequest(req, netRequest);
auto netReply = nam->get(netRequest);
netReply->setParent(reply);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/backends/opentripplannerparser.cpp
new/kpublictransport-23.04.3/src/lib/backends/opentripplannerparser.cpp
--- old/kpublictransport-23.04.2/src/lib/backends/opentripplannerparser.cpp
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/backends/opentripplannerparser.cpp
2023-06-30 16:19:37.000000000 +0200
@@ -243,8 +243,10 @@
const auto type = obj.value(QLatin1String("type"));
if (type.isString()) {
line.setMode(Gtfs::Hvt::typeToMode(type.toString()));
- } else {
+ } else if (type.isDouble()) {
line.setMode(Gtfs::Hvt::typeToMode(type.toInt(-1)));
+ } else {
+
line.setMode(Gtfs::Hvt::typeToMode(obj.value(QLatin1String("transportMode")).toString()));
}
auto presentation = obj.value(QLatin1String("presentation")).toObject();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/backends/otp/entur/departure.graphql
new/kpublictransport-23.04.3/src/lib/backends/otp/entur/departure.graphql
--- old/kpublictransport-23.04.2/src/lib/backends/otp/entur/departure.graphql
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/backends/otp/entur/departure.graphql
2023-06-30 16:19:37.000000000 +0200
@@ -25,6 +25,7 @@
realtime
trip: serviceJourney {
route: line {
+ transportMode
type: transportSubmode
shortName: publicCode
longName: name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.2/src/lib/journeyreply.cpp
new/kpublictransport-23.04.3/src/lib/journeyreply.cpp
--- old/kpublictransport-23.04.2/src/lib/journeyreply.cpp 2023-06-02
20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/journeyreply.cpp 2023-06-30
16:19:37.000000000 +0200
@@ -88,14 +88,16 @@
static bool isImplausibleSection(const JourneySection §ion)
{
- if (section.mode() == JourneySection::Transfer &&
section.from().hasCoordinate() && section.to().hasCoordinate()) {
+ if ((section.mode() == JourneySection::Transfer || section.mode() ==
JourneySection::Walking)
+ && section.from().hasCoordinate() && section.to().hasCoordinate())
+ {
const auto distance = Location::distance(section.from(), section.to());
if (section.duration() > 0 && (distance / section.duration()) > 30) {
- qCDebug(Log) << "discarding journey based on insane transfer
speed:" << (distance / section.duration()) << "m/s";
+ qCDebug(Log) << "discarding journey based on insane
transfer/walking speed:" << (distance / section.duration()) << "m/s";
return true;
}
if (distance > 100000) {
- qCDebug(Log) << "discarding journey with insane transfer
distance:" << distance << "m" << section.from().name() << section.to().name();
+ qCDebug(Log) << "discarding journey with insane transfer/walking
distance:" << distance << "m" << section.from().name() << section.to().name();
return true;
}
}
@@ -155,6 +157,21 @@
// remove pointless sections such as 0-length walks
sections.erase(std::remove_if(sections.begin(), sections.end(),
isPointlessSection), sections.end());
+
+ // remove implausible paths
+ for (auto §ion : sections) {
+ if (!section.from().hasCoordinate() ||
!section.to().hasCoordinate() || section.path().isEmpty()) {
+ continue;
+ }
+
+ const auto pointDist = Location::distance(section.from(),
section.to());
+ const auto pathDist = section.path().distance();
+ if (pathDist > pointDist * 10) {
+ qCDebug(Log) << "Dropping implausibly long path:" << pointDist
<< pathDist;
+ section.setPath({});
+ }
+ }
+
journey.setSections(std::move(sections));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.2/src/lib/manager.cpp
new/kpublictransport-23.04.3/src/lib/manager.cpp
--- old/kpublictransport-23.04.2/src/lib/manager.cpp 2023-06-02
20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/manager.cpp 2023-06-30
16:19:37.000000000 +0200
@@ -474,7 +474,7 @@
return;
}
- if (d->m_nam->parent() == this) {
+ if (d->m_nam && d->m_nam->parent() == this) {
delete d->m_nam;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/networks/at_3_vor.json
new/kpublictransport-23.04.3/src/lib/networks/at_3_vor.json
--- old/kpublictransport-23.04.2/src/lib/networks/at_3_vor.json 2023-06-02
20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/networks/at_3_vor.json 2023-06-30
16:19:37.000000000 +0200
@@ -128,7 +128,7 @@
"bitmasks": [
32
],
- "mode": "LocalTrain"
+ "mode": "Coach"
},
{
"bitmasks": [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/networks/certs/network_certs.qrc
new/kpublictransport-23.04.3/src/lib/networks/certs/network_certs.qrc
--- old/kpublictransport-23.04.2/src/lib/networks/certs/network_certs.qrc
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/networks/certs/network_certs.qrc
2023-06-30 16:19:37.000000000 +0200
@@ -8,5 +8,6 @@
<file>digicert-sha2-secure-server-ca.pem</file>
<file>sectigo-rsa-domain-validation-secure-server-ca.pem</file>
<file>thawte-rsa-ca-2018.pem</file>
+ <file>vrs-client-cert.pfx</file>
</qresource>
</RCC>
Binary files
old/kpublictransport-23.04.2/src/lib/networks/certs/vrs-client-cert.pfx and
new/kpublictransport-23.04.3/src/lib/networks/certs/vrs-client-cert.pfx differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/networks/de_bw_ulm.json
new/kpublictransport-23.04.3/src/lib/networks/de_bw_ulm.json
--- old/kpublictransport-23.04.2/src/lib/networks/de_bw_ulm.json
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/networks/de_bw_ulm.json
1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-{
- "KPlugin": {
- "Description": "Local public transport in and around Ulm, Germany.",
- "Description[ca@valencia]": "Transport públic local a Ulm i rodalia,
Alemanya.",
- "Description[ca]": "Transport públic local a Ulm i rodalia,
Alemanya.",
- "Description[cs]": "MÃstnà doprava v Ulmu a okolÃ, NÄmecko.",
- "Description[de]": "Lokale öffentliche Verkehrsmittel in und um Ulm,
Deutschland.",
- "Description[en_GB]": "Local public transport in and around Ulm,
Germany.",
- "Description[es]": "Transporte público local de Ulm y alrededores,
Alemania.",
- "Description[et]": "Saksamaa Ulmi ja selle ümbruse kohalik
ühistransport.",
- "Description[fi]": "Paikallinen julkinen liikenne Saksan Ulmissa
ympäristöineen.",
- "Description[fr]": "Transports publics régionaux dans la région de
Ulm, Allemagne.",
- "Description[it]": "Trasporto pubblico locale a Ulm e dintorni,
Germania.",
- "Description[ka]": "áááááá£á á á¡áá¯áá á á¢á
ááá¡ááá á¢á á£ááá¨á, ááá ááááá áá
ááá¡ ááá á¨ááá.",
- "Description[ko]": "ë
ì¼ ì¸ë¦ ë° ê´ìê¶ ëì¤ êµíµì
ëë¤.",
- "Description[nl]": "Lokaal openbaar vervoer in en om Ulm, Duitsland.",
- "Description[pl]": "Lokalny transport publiczny w i wokóŠUlm,
Niemcy.",
- "Description[pt]": "Transportes públicos locais na região de Ulm,
Alemanha.",
- "Description[pt_BR]": "Transporte público local na região de Ulm,
Alemanha.",
- "Description[ru]": "ÐеÑÑнÑй обÑеÑÑвеннÑй
ÑÑанÑпоÑÑ Ð² УлÑме и окÑеÑÑноÑÑÑÑ
,
ÐеÑманиÑ.",
- "Description[sl]": "Lokalni javni prevoz v Ulmu in okolici, NemÄija.",
- "Description[sv]": "Lokal kollektivtrafik i och omkring Ulm,
Tyskland.",
- "Description[tr]": "Almanya, Ulm içi ve çevresi yerel toplu
taÅıma.",
- "Description[uk]": "ÐÑÑÑевий ÑÑанÑпоÑÑ Ð² УлÑмÑ
Ñ Ð¾ÐºÐ¾Ð»Ð¸ÑÑÑ
, ÐÑмеÑÑина.",
- "Description[x-test]": "xxLocal public transport in and around Ulm,
Germany.xx",
- "Description[zh_CN]": "å¾·å½ä¹å°å§åå
¶å¨è¾¹å°åºçå
Œ
±äº¤éã",
- "Name": "Ulm, Germany",
- "Name[ca@valencia]": "Ulm, Alemanya",
- "Name[ca]": "Ulm, Alemanya",
- "Name[cs]": "Ulm, NÄmecko",
- "Name[de]": "Ulm, Deutschland",
- "Name[en_GB]": "Ulm, Germany",
- "Name[es]": "Ulm, Alemania",
- "Name[et]": "Ulm, Saksamaa",
- "Name[fi]": "Ulm, Saksa",
- "Name[fr]": "Ulm, Allemagne",
- "Name[it]": "Ulm, Germania",
- "Name[ka]": "á£ááá, ááá ááááá",
- "Name[ko]": "ë
ì¼ ì¸ë¦",
- "Name[nl]": "Ulm, Duitsland",
- "Name[pl]": "Ulm, Niemcy",
- "Name[pt]": "Ulm, Alemanha",
- "Name[pt_BR]": "Ulm, Germany",
- "Name[ru]": "Ulm, Germany",
- "Name[sl]": "Ulm, NemÄija",
- "Name[sv]": "Ulm, Tyskland",
- "Name[tr]": "Ulm, Almanya",
- "Name[uk]": "УлÑм, ÐÑмеÑÑина",
- "Name[x-test]": "xxUlm, Germanyxx"
- },
- "attribution": {
- "homepage":
"https://digitransit.im.verschwoerhaus.de/tietoja-palvelusta";,
- "mixedLicenses": true,
- "name": "Verschwörhaus"
- },
- "comment": "see
https://github.com/verschwoerhaus/digitransit-ui/blob/ulm/app/configurations/config.vsh.js
for rental vehicle config",
- "coverage": {
- "realtimeCoverage": {
- "area": {
- "coordinates": [
- [
- [
- 8.6407794,
- 49.0365089
- ],
- [
- 11.3182223,
- 49.0365089
- ],
- [
- 11.3182223,
- 48.2892591
- ],
- [
- 8.6407794,
- 48.2892591
- ],
- [
- 8.6407794,
- 49.0365089
- ]
- ]
- ],
- "type": "Polygon"
- },
- "region": [
- "DE-BW"
- ]
- }
- },
- "options": {
- "endpoint":
"https://api.digitransit.im.verschwoerhaus.de/routing/v1/routers/vsh/";,
- "ifoptPrefix": "1",
- "rentalVehicleNetworks": {
- "bird": {
- "name": "Bird",
- "vehicleTypes": "ElectricKickScooter"
- },
- "openbike": {
- "name": "OpenBike Ulm",
- "vehicleTypes": "Bicycle"
- },
- "zeus": {
- "name": "Zeus",
- "vehicleTypes": "ElectricKickScooter"
- }
- },
- "supportedTransitModes": [
- "TRANSIT",
- "CARPOOL"
- ]
- },
- "supportedLanguages": [
- "de"
- ],
- "timezone": "Europe/Berlin",
- "type": {
- "otpGraphQl": true
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/networks/de_nw_muenster.json
new/kpublictransport-23.04.3/src/lib/networks/de_nw_muenster.json
--- old/kpublictransport-23.04.2/src/lib/networks/de_nw_muenster.json
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/networks/de_nw_muenster.json
1970-01-01 01:00:00.000000000 +0100
@@ -1,96 +0,0 @@
-{
- "KPlugin": {
- "Description": "Local public transport in and around Münster,
Germany.",
- "Description[ca@valencia]": "Transport públic local a Münster i
rodalia, Alemanya.",
- "Description[ca]": "Transport públic local a Münster i rodalia,
Alemanya.",
- "Description[cs]": "MÃstnà doprava v Münsteru a okolÃ, NÄmecko.",
- "Description[de]": "Lokale öffentliche Verkehrsmittel in und um
Münster, Deutschland.",
- "Description[en_GB]": "Local public transport in and around Münster,
Germany.",
- "Description[es]": "Transporte público local de Münster y
alrededores, Alemania.",
- "Description[et]": "Saksamaa Münsteri ja selle ümbruse kohalik
ühistransport.",
- "Description[fi]": "Paikallinen julkinen liikenne Saksan Münsterissä
ympäristöineen.",
- "Description[fr]": "Transports régionaux dans la région de Münster,
Allemagne.",
- "Description[it]": "Trasporto pubblico locale a Münster e dintorni,
Germania.",
- "Description[ka]": "áááááá£á á á¡áá¯áá á á¢á
ááá¡ááá á¢á ááá£áá¨á¢áá á¨á, ááá
ááááá áá ááá¡ ááá á¨ááá.",
- "Description[ko]": "ë
ì¼ ë®ì¤í° ë° ê´ìê¶ ëì¤ êµíµì
ëë¤.",
- "Description[nl]": "Lokaal openbaar vervoer in en om Münster,
Duitsland.",
- "Description[pl]": "Lokalny transport publiczny w i wokóŠMünster,
Niemcy.",
- "Description[pt]": "Transportes públicos locais na região de
Münster, Alemanha.",
- "Description[pt_BR]": "Transporte público local na região de
Münster, Alemanha.",
- "Description[ru]": "ÐеÑÑнÑй обÑеÑÑвеннÑй
ÑÑанÑпоÑÑ Ð² ÐÑнÑÑеÑе и окÑеÑÑноÑÑÑÑ
,
ÐеÑманиÑ.",
- "Description[sl]": "Lokalni javni prevoz v mestu Münster in okolici v
NemÄiji.",
- "Description[sv]": "Lokal transportoperatör i och omkring Münster,
Tyskland.",
- "Description[tr]": "Almanya, Münster içi ve çevresi yerel toplu
taÅıma.",
- "Description[uk]": "ÐÑÑÑевий ÑÑанÑпоÑÑ Ñ
ÐÑнÑÑеÑÑ Ñ Ð¾ÐºÐ¾Ð»Ð¸ÑÑÑ
, ÐÑмеÑÑина.",
- "Description[x-test]": "xxLocal public transport in and around
Münster, Germany.xx",
- "Description[zh_CN]": "å¾·å½ææ¯ç¹åå
¶å¨è¾¹å°åºçå
Œ
±äº¤éã",
- "Name": "Münster, Germany",
- "Name[ca@valencia]": "Münster, Alemanya",
- "Name[ca]": "Münster, Alemanya",
- "Name[cs]": "Münster, NÄmecko",
- "Name[de]": "Münster, Deutschland",
- "Name[en_GB]": "Münster, Germany",
- "Name[es]": "Münster, Alemania",
- "Name[et]": "Münster, Saksamaa",
- "Name[fi]": "Münster, Saksa",
- "Name[fr]": "Münster, Allemagne",
- "Name[it]": "Münster, Germania",
- "Name[ka]": "Münster, Germany",
- "Name[ko]": "ë
ì¼ ë®ì¤í°",
- "Name[nl]": "Münster, Duitsland",
- "Name[pl]": "Münster, Germany",
- "Name[pt]": "Münster, Alemanha",
- "Name[pt_BR]": "Münster, Alemanha",
- "Name[ru]": "Münster, Germany",
- "Name[sl]": "Münster, NemÄija",
- "Name[sv]": "Münster, Tyskland",
- "Name[tr]": "Münster, Almanya",
- "Name[uk]": "ÐÑнÑÑеÑ, ÐÑмеÑÑина",
- "Name[x-test]": "xxMünster, Germanyxx"
- },
- "attribution": {
- "name": "Code for Münster",
- "url": "https://codeformuenster.org/";
- },
- "coverage": {
- "anyCoverage": {
- "area": {
- "coordinates": [
- [
- [
- 6.245927900000001,
- 52.483627500000004
- ],
- [
- 8.3234834,
- 52.483627500000004
- ],
- [
- 8.3234834,
- 51.4769823
- ],
- [
- 6.245927900000001,
- 51.4769823
- ],
- [
- 6.245927900000001,
- 52.483627500000004
- ]
- ]
- ],
- "type": "Polygon"
- },
- "region": [
- "DE-NW"
- ]
- }
- },
- "options": {
- "endpoint":
"https://api.digitransit.codeformuenster.org/routing/v1/routers/cfm/";
- },
- "timezone": "Europe/Berlin",
- "type": {
- "otpGraphQl": true
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/networks/de_nw_vrs.json
new/kpublictransport-23.04.3/src/lib/networks/de_nw_vrs.json
--- old/kpublictransport-23.04.2/src/lib/networks/de_nw_vrs.json
2023-06-02 20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/networks/de_nw_vrs.json
2023-06-30 16:19:37.000000000 +0200
@@ -85,7 +85,8 @@
}
},
"options": {
- "endpoint": "https://ekapweb.vrs.de/";
+ "endpoint": "https://ekap-app.vrs.de/index.php";,
+ "pkcs12": "vrs-client-cert.pfx"
},
"timezone": "Europe/Berlin",
"type": {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/networks/networks.qrc
new/kpublictransport-23.04.3/src/lib/networks/networks.qrc
--- old/kpublictransport-23.04.2/src/lib/networks/networks.qrc 2023-06-02
20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/networks/networks.qrc 2023-06-30
16:19:37.000000000 +0200
@@ -50,7 +50,6 @@
<file>de_bw_bwegt.json</file>
<file>de_bw_kvv.json</file>
<file>de_bw_stadtnavi.json</file>
- <file>de_bw_ulm.json</file>
<file>de_bw_vvs.json</file>
<file>de_by_bayern.json</file>
<file>de_by_invg.json</file>
@@ -66,7 +65,6 @@
<file>de_ni_vbn.json</file>
<file>de_ni_vsn.json</file>
<file>de_nw_avv.json</file>
- <file>de_nw_muenster.json</file>
<file>de_nw_vrr.json</file>
<file>de_nw_vrs.json</file>
<file>de_nw_zks.json</file>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.2/src/lib/networks/un_gbfs.json
new/kpublictransport-23.04.3/src/lib/networks/un_gbfs.json
--- old/kpublictransport-23.04.2/src/lib/networks/un_gbfs.json 2023-06-02
20:35:14.000000000 +0200
+++ new/kpublictransport-23.04.3/src/lib/networks/un_gbfs.json 2023-06-30
16:19:37.000000000 +0200
@@ -25,7 +25,7 @@
"Name": "Shared bikes/scooters",
"Name[ca@valencia]": "Bicicletes/motos compartides",
"Name[ca]": "Bicicletes/motos compartides",
- "Name[cs]": "SdÃlená kola/skůtry",
+ "Name[cs]": "SdÃlená kola/skútry",
"Name[de]": "Bereitgestellte Fahrräder/Roller",
"Name[en_GB]": "Shared bikes/scooters",
"Name[es]": "Bicicletas/ciclomotores compartidos",
