@@ -132,10 +132,12 @@
const ParserAbstract::Mode mode,
int trainrestrictions)
{
- lastsearch.from=departureStation;
- lastsearch.to=arrivalStation;
- lastsearch.restrictions=trainrestrictions;
- lastsearch.via=viaStation;
+ lastsearch.from = departureStation;
+ lastsearch.to = arrivalStation;
+ lastsearch.restrictions = trainrestrictions;
+ lastsearch.via = viaStation;
+ lastsearch.lastOption = dateTime;
+ lastsearch.mode = mode;
QUrl url(BASE_URL "/journeyadvice");
@@ -146,7 +148,7 @@
#endif
/*
- // this is for /journeyadvice-page
+ // this is for /journeyadvice-page
query.addQueryItem("from", departureStation.id.toString());
query.addQueryItem("to", arrivalStation.id.toString());
query.addQueryItem("searchType", mode == Mode::Arrival ? "arrival" : "departure");
@@ -190,7 +192,7 @@
#if defined(BUILD_FOR_QT5) || defined(BUILD_FOR_QT6)
QByteArray data = postData.query().toUtf8().replace(' ', '+') ;
- #else
+ #else
QByteArray data = postData.encodedQuery().toUtf8().replace(' ', '+') ;
#endif
@@ -202,14 +204,24 @@
void ParserNinetwo::searchJourneyLater()
{
- searchJourney(lastsearch.from, lastsearch.via, lastsearch.to, lastsearch.lastOption, Departure , lastsearch.restrictions);
+ QDateTime time = lastsearch.lastOption.addSecs(30*60);
+ searchJourney(lastsearch.from, lastsearch.via, lastsearch.to , time, lastsearch.mode, lastsearch.restrictions);
}
void ParserNinetwo::searchJourneyEarlier()
{
- QDateTime time = lastsearch.firstOption.addSecs(-30*60);
- searchJourney(lastsearch.from, lastsearch.via, lastsearch.to,time, Departure, lastsearch.restrictions);
+ QDateTime time = lastsearch.lastOption.addSecs(-30*60);
+ searchJourney(lastsearch.from, lastsearch.via, lastsearch.to , time, lastsearch.mode, lastsearch.restrictions);
+}
+void ParserNinetwo::parseSearchLaterJourney(QNetworkReply *)
+{
+
+}
+
+void ParserNinetwo::parseSearchEarlierJourney(QNetworkReply *)
+{
+
}
void ParserNinetwo::getJourneyDetails(const QString &id)
@@ -317,7 +329,7 @@
{
qDebug() << __PRETTY_FUNCTION__ << "PARSING STATIONS";
QByteArray allData = networkReply->readAll();
- qDebug() << "REPLY:>>>>>>>>>>>>\n" << allData;
+ //qDebug() << "REPLY:>>>>>>>>>>>>\n" << allData;
QVariantMap doc = parseJson(allData);
if (doc.isEmpty()) {
@@ -417,24 +429,11 @@
emit journeyResult(resultList.release());
}
-void ParserNinetwo::parseSearchLaterJourney(QNetworkReply *)
-{
-
-}
-
-void ParserNinetwo::parseSearchEarlierJourney(QNetworkReply *)
-{
-
-}
-
void ParserNinetwo::parseJourneyDetails(QNetworkReply *)
{
//should never happen
}
-
-
-
JourneyResultItem * ParserNinetwo::parseJourneyJson(const QString& jsonData)
{
// this really helps :)
@@ -442,11 +441,12 @@
std::unique_ptr<JourneyResultItem> response {new JourneyResultItem};
std::unique_ptr<JourneyDetailResultList> detail {new JourneyDetailResultList};
- //qWarning() << "journey" << "\n" << jsonData;
- //JourneyResultList *journeyList = new JourneyResultList();
+ // qWarning() << "journey" << "\n" << jsonData;
+ // JourneyResultList *journeyList = new JourneyResultList();
// wrap it in an object, bcause it is a naked list
auto json = parseJson("{\"legs\":" + jsonData.toUtf8() + "}");
+ // qWarning() << "leg" << "\n" << json;
if(json["legs"].type() != QVariant::List)
return nullptr;
QVariantList legs = json["legs"].toList();
@@ -454,6 +454,17 @@
QSet<QString> transportTypes;
int walkCount = 0;
int detailCount = 0;
+ QString durationC ;
+ QString callType; // board, visit, exit
+
+ QString tTypes; // transporttypes again
+
+ // using this to add last walking times
+ int walkingTime = 0;
+
+ // evil chaning scope to keep 'last value'
+ QDateTime arrivalTime;
+
for(auto const & legv: legs)
{
if(legv.type() != QVariant::Map)
@@ -465,7 +476,10 @@
QString mode = leg["Mode"].toMap()["ModeType"].toString();
transportTypes.insert(mode);
+
QString modeName = leg["Mode"].toMap()["Name"].toString();
+ tTypes += modeName.split(" ").at(0) + " ";
+
QString direction = leg["Destination"].toString();
// eg. B for metro line b
@@ -474,38 +488,76 @@
if(mode == "walk")
walkCount++;
+
QVariantList calls = leg["Calls"].toList();
+ /*
+ for (int i = 0; i < calls.count(); ++i) {
+ qWarning() << "Ctype: " << calls[i].toMap()["CallType"].toString();
+ }
+ */
+ int const lastCall = calls.count()-1;
//QString departureStation = calls[0].toMap()["Location"].toMap()["Cluster-Type"].toString() + " "
// + calls[0].toMap()["Location"].toMap()["Name"].toString();
QString departureStation = calls[0].toMap()["Location"].toMap()["Name"].toString();
-
QString departurePlatform = calls[0].toMap()["Platform"].toString();
- QDateTime departureTime = QDateTime::fromString(calls[0].toMap()["Departure"].toString(), Qt::ISODate);
- int const lastCall = calls.count()-1;
- //QString arrivalStation = calls[lastCall].toMap()["Location"].toMap()["Cluster-Type"].toString() + " "
- // + calls[lastCall].toMap()["Location"].toMap()["Name"].toString();
QString arrivalStation = calls[lastCall].toMap()["Location"].toMap()["Name"].toString();
-
- QDateTime arrivalTime = QDateTime::fromString(calls[lastCall].toMap()["Arrival"].toString(), Qt::ISODate);
QString arrivalPlatform = calls[lastCall].toMap()["Platform"].toString();
+ QDateTime departureTime = QDateTime::fromString(calls[0].toMap()["Departure"].toString(), Qt::ISODate);
+
+ qWarning() << "dtype: " << calls[0].toMap()["CallType"].toString();
+ qWarning() << "atype: " << calls[lastCall].toMap()["CallType"].toString();
+
+ // only set Arrival if we have it. not set for walk
+ if (calls[lastCall-1].toMap()["Arrival"].toString() != "")
+ arrivalTime = QDateTime::fromString(calls[lastCall].toMap()["Arrival"].toString(), Qt::ISODate);
+
JourneyDetailResultItem* item = new JourneyDetailResultItem;
item->setDirection(direction);
- if(mode == "walk")
- item->setTrain(tr("Walk"));
- else
+ // walk Mode has Duration set
+ durationC = leg["Duration"].toString();
+ durationC.replace(QString("00:"), QString(""));
+
+ if(mode == "walk") {
+ QString walkDuration;
+ walkDuration = mode + " " + durationC ;
+ // item->setTrain(tr("Walk"));
+ item->setTrain(walkDuration);
+ } else {
item->setTrain(modeName + ": " + service);
+ }
+ // only the last walkingtime, we hope
+ walkingTime = durationC.replace(QString(":00"), QString("")).toInt();
+
+ // reset :)
|
@@ -635,13 +635,13 @@
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="46"/>
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="57"/>
<source>Journey</source>
- <translation>Fahrt</translation>
+ <translation>Ausgewählte Fahrt</translation>
</message>
<message>
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="46"/>
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="65"/>
<source>Time Table</source>
- <translation>Fahrplan</translation>
+ <translation>Gesammter Fahrplan</translation>
</message>
<message>
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="51"/>
@@ -2039,13 +2039,13 @@
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="90"/>
<source>Airport transfer (bus)</source>
- <translation type="unfinished"></translation>
+ <translation>Flughafen Transfer (Bus)</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="91"/>
<location filename="../src/parser/parser_resrobot.cpp" line="92"/>
<source>replacement bus</source>
- <translation type="unfinished"></translation>
+ <translation>Ersatzbus</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="96"/>
@@ -2053,54 +2053,54 @@
<location filename="../src/parser/parser_resrobot.cpp" line="98"/>
<location filename="../src/parser/parser_resrobot.cpp" line="99"/>
<source>Express ferry</source>
- <translation type="unfinished"></translation>
+ <translation>Express Fähre</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="96"/>
<location filename="../src/parser/parser_resrobot.cpp" line="99"/>
<source>yellow dep</source>
- <translation type="unfinished"></translation>
+ <translation>Gelbes Depot</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="97"/>
<location filename="../src/parser/parser_resrobot.cpp" line="98"/>
<source>white dep</source>
- <translation type="unfinished"></translation>
+ <translation>Weißes Depot</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="101"/>
<source>Airport transfer (train)</source>
- <translation type="unfinished"></translation>
+ <translation>Flughafen transfer (Bahn)</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="107"/>
<source>Express train</source>
- <translation type="unfinished"></translation>
+ <translation>Schnellzug</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="124"/>
<source>Airport transfer (taxi)</source>
- <translation type="unfinished"></translation>
+ <translation>Flughafen transfer (Taxi)</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="126"/>
<source>Flight</source>
- <translation type="unfinished"></translation>
+ <translation>Flug</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="129"/>
<source>Helicopter</source>
- <translation type="unfinished"></translation>
+ <translation>Hubschrauber</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="132"/>
<source>Taxi</source>
- <translation type="unfinished">Taxi</translation>
+ <translation>Taxi</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="133"/>
<source>Rapid transit</source>
- <translation type="unfinished"></translation>
+ <translation>die Schnellbahn</translation>
</message>
<message>
<location filename="../src/parser/parser_resrobot.cpp" line="160"/>
@@ -2191,7 +2191,7 @@
<message>
<location filename="../src/parser/parser_sf_bay_efa.cpp" line="53"/>
<source>Blue & Gold Fleet</source>
- <translation>Blue & Gold-Flotte</translation>
+ <translation>Blau & Gold-Flotte</translation>
</message>
<message>
<location filename="../src/parser/parser_sf_bay_efa.cpp" line="54"/>
@@ -2690,13 +2690,13 @@
<message>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="341"/>
<source><span style="color:#b30;">%1 min late</span></source>
- <translation><span style="color:#b30;">%1 min Verspätung</span></translation>
+ <translation><span style="Farbe:#b30;">%1 min Verspätung</span></translation>
</message>
<message>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="343"/>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="489"/>
<source><span style="color:#093; font-weight: normal;">on time</span></source>
- <translation><span style="color:#093; font-weight: normal;">pünktlich</span></translation>
+ <translation><span style="Farbe:#093; Schriftstärke: normal;">pünktlich</span></translation>
</message>
<message>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="368"/>
@@ -2723,13 +2723,13 @@
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="450"/>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="465"/>
<source><br/><span style="color:#b30;">%1 min late</span></source>
- <translation><br/><span style="color:#b30;">%1 min Verspätung</span></translation>
+ <translation><br/><span style="Farbe:#b30;">%1 min Verspätung</span></translation>
</message>
<message>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="456"/>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="467"/>
<source><br/><span style="color:#093; font-weight: normal;">on time</span></source>
- <translation><br/><span style="color:#093; font-weight: normal;">pünktlich</span></translation>
+ <translation><br/><span style="Farbe:#093; Schriftstärke: normal;">pünktlich</span></translation>
</message>
<message>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="482"/>
@@ -2739,7 +2739,7 @@
<message>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="487"/>
<source><span style="color:#b30;">traffic warning</span></source>
- <translation><span style="color:#b30;">Verkehrswarnung</span></translation>
+ <translation><span style="Farbe:#b30;">Verkehrswarnung</span></translation>
</message>
<message>
<location filename="../src/parser/parser_xmlvasttrafikse.cpp" line="547"/>
@@ -3000,7 +3000,7 @@
<message>
<location filename="../src/gui/ubuntu/TimeTableResultsPage.qml" line="118"/>
<source>Pl. %1</source>
- <translation>Gl. %1</translation>
+ <translation>Gleis %1</translation>
</message>
</context>
<context>
@@ -3024,7 +3024,7 @@
<location filename="../src/gui/sailfishos/delegates/TimetableEntryDelegate.qml" line="69"/>
<location filename="../src/gui/symbian/delegates/TimetableEntryDelegate.qml" line="85"/>
<source>Pl. %1</source>
- <translation>Gl. %1</translation>
+ <translation>Gleis %1</translation>
</message>
</context>
<context>
@@ -3046,12 +3046,12 @@
<message>
<location filename="../src/gui/sailfishos/pages/TimetablePage.qml" line="81"/>
<source>Searching...</source>
- <translation type="unfinished">Suche...</translation>
+ <translation>Suche...</translation>
</message>
<message>
<location filename="../src/gui/sailfishos/pages/TimetablePage.qml" line="113"/>
<source>Error</source>
- <translation type="unfinished">Fehler</translation>
+ <translation>Fehler</translation>
</message>
</context>
<context>
|