use line id and not name to get correct transportation type

umglurf · Jan 23, 2016 · 0c52d10 · 0c52d10
1 parent 48eea16
commit 0c52d10
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/qml/pages/RealTime.qml b/qml/pages/RealTime.qml
@@ -165,7 +165,7 @@ Page {
                         TransportIcon {
                             width: lineLabel.height
                             height: lineLabel.height
-                            transportation: RuteFisk.lines[linenumber] === undefined ? "3" : RuteFisk.lines[linenumber]
+                            transportation: RuteFisk.lines[lineRef] === undefined ? "3" : RuteFisk.lines[lineRef]
                         }
                         Label {
                           id: lineLabel
@@ -320,6 +320,7 @@ Page {
               line['line'] = data[index]['MonitoredVehicleJourney']['PublishedLineName'] + data[index]['MonitoredVehicleJourney']['DestinationName'];
               line['lineColor'] = "#" + data[index]['Extensions']['LineColour'];
               line['linenumber'] = data[index]['MonitoredVehicleJourney']['PublishedLineName'];
+              line['lineRef'] = data[index]['MonitoredVehicleJourney']['LineRef'];
               line['destination'] = data[index]['MonitoredVehicleJourney']['DestinationName'];
               line['origin'] = data[index]['MonitoredVehicleJourney']['OriginName'] ? data[index]['MonitoredVehicleJourney']['OriginName'] : "";
               line['departures'] = [];

diff --git a/qml/pages/TravelFromToOptions.qml b/qml/pages/TravelFromToOptions.qml
@@ -52,8 +52,8 @@ Page {
   }
 
   Component.onCompleted: {
-    for(var line in RuteFisk.lines) {
-        if(RuteFisk.lines.hasOwnProperty(line)) {
+    for(var line in RuteFisk.lineNumbers) {
+        if(RuteFisk.lineNumbers.hasOwnProperty(line)) {
           if(lines.indexOf(line) == -1) {
             available_lines[line] = 1;
           } else {

diff --git a/qml/scripts/rutefisk.js b/qml/scripts/rutefisk.js
@@ -63,6 +63,7 @@ function non_tz_date_parse(timestr) {
 }
 
 var lines = {};
+var lineNumbers = {};
 var lines_finished = false;
 if (!lines_finished) {
     get_lines();
@@ -75,7 +76,8 @@ function get_lines() {
       lines_finished = true;
       var data = JSON.parse(xhr.responseText);
       for(var index=0; index < data.length; index++) {
-          lines[data[index]['Name']] = data[index]['Transportation'];
+          lines[data[index]['ID']] = data[index]['Transportation'];
+          lineNumbers[data[index]['Name']] = data[index]['ID'];
       };
     };
   };

diff --git a/translations/harbour-rutefisk-sv.ts b/translations/harbour-rutefisk-sv.ts
@@ -196,17 +196,17 @@
         <translation>Plattform %1</translation>
     </message>
     <message>
-        <location filename="../qml/pages/RealTime.qml" line="337"/>
+        <location filename="../qml/pages/RealTime.qml" line="338"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../qml/pages/RealTime.qml" line="339"/>
+        <location filename="../qml/pages/RealTime.qml" line="340"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qml/pages/RealTime.qml" line="375"/>
+        <location filename="../qml/pages/RealTime.qml" line="376"/>
         <source>Error getting stop information</source>
         <translation>Kunde inte hämta hållplatsinformation</translation>
     </message>

diff --git a/translations/harbour-rutefisk.ts b/translations/harbour-rutefisk.ts
@@ -196,17 +196,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/RealTime.qml" line="337"/>
+        <location filename="../qml/pages/RealTime.qml" line="338"/>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/RealTime.qml" line="339"/>
+        <location filename="../qml/pages/RealTime.qml" line="340"/>
         <source>min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/RealTime.qml" line="375"/>
+        <location filename="../qml/pages/RealTime.qml" line="376"/>
         <source>Error getting stop information</source>
         <translation type="unfinished"></translation>
     </message>