Changes: parses comprehensive route data

[ptas] / zouba / src / routedata.h

diff --git a/zouba/src/routedata.h b/zouba/src/routedata.h
index 8600b2b..b1bec0b 100644 (file)
--- a/zouba/src/routedata.h
+++ b/zouba/src/routedata.h
@@ -2,23 +2,90 @@
 #define ROUTEDATA_H
 
 #include <QString>
+#include <QList>
+
+struct LegData
+{
+  LegData() :
+    m_how(),
+    m_tripTime(),
+    m_tripDistance(),
+    m_departureTime(),
+    m_arrivalTime(),
+    m_lineCode()
+  {
+  };
+
+  LegData( QString how, QString tripTime, QString tripDistance, QString departureTime, QString arrivalTime, QString lineCode=QString() ) :
+    m_how(how),
+    m_tripTime(tripTime),
+    m_tripDistance(tripDistance),
+    m_departureTime(departureTime),
+    m_arrivalTime(arrivalTime),
+    m_lineCode(lineCode)
+  {
+  };
+
+  void clear()
+  {
+    m_how = "";
+    m_tripTime = "";
+    m_tripDistance = "";
+    m_departureTime = "";
+    m_arrivalTime = "";
+    m_lineCode = "";
+  };
+
+  QString m_how;
+  QString m_tripTime;
+  QString m_tripDistance;
+  QString m_departureTime;
+  QString m_arrivalTime;
+  QString m_lineCode;
+
+};
 
 struct RouteData
 {
   RouteData():
-    lineCode(),
-    arrivalTime()
+    m_tripTime(),
+    m_tripDistance(),
+    m_departureTime(),
+    m_lineCode(),
+    m_legData()
+  {
+  };
+
+  RouteData( QString tripTime, QString tripDistance, QString departureTime, QString lineCode ):
+    m_tripTime(tripTime),
+    m_tripDistance(tripDistance),
+    m_departureTime(departureTime),
+    m_lineCode(lineCode),
+    m_legData()
   {
   };
 
-  RouteData( QString lineCode, QString arrivalTime ):
-    lineCode(lineCode),
-    arrivalTime(arrivalTime)
+  RouteData &operator <<(const LegData &legData)
   {
+    m_legData.append( legData );
+    return *this;
   };
 
-  QString lineCode;
-  QString arrivalTime;
+  void clear()
+  {
+    m_tripTime = "";
+    m_tripDistance = "";
+    m_departureTime = "";
+    m_lineCode = "";
+    m_legData.clear();
+  };
+
+  QString m_tripTime;
+  QString m_tripDistance;
+  QString m_departureTime;
+  QString m_lineCode;
+  QList<LegData> m_legData;
+
 };
 
 #endif // ROUTEDATA_H