-
{platform.name()}
-
+
+
{platform}
+
);
});
- // Heading does not account for circle line mapping, meh
return (
-
{station.name() + " " + predictionData.line()}
+ {station.stationName + " Station, " + station.lineName + " Line"}
{generatedPlatforms}
);
@@ -119,11 +106,13 @@ var Trains = React.createClass({
render: function() {
var generatedTrains = this.props.trains.map(function(train) {
+ var timeTo = utils.formattedTimeUntil(train.timeToStation);
+
return (
-
- | {train.timeTo()} |
- {train.destination()} |
- {train.location()} |
+
+ | {timeTo === "0:00" ? "-" : timeTo} |
+ {train.towards} |
+ {train.currentLocation} |
);
});
diff --git a/app/component/tube-tracker.js b/app/component/tube-tracker.jsx
similarity index 72%
rename from app/component/tube-tracker.js
rename to app/component/tube-tracker.jsx
index 4f74e4b..a5b8ad5 100644
--- a/app/component/tube-tracker.js
+++ b/app/component/tube-tracker.jsx
@@ -1,23 +1,18 @@
/** @jsx React.DOM */
var React = require("react");
-var Predictions = require("./predictions");
-var Network = require("./network");
-var utils = require("../utils");
+var utils = require("../common/utils");
+var Network = require("./network.jsx");
+var Predictions = require("./predictions.jsx");
var TubeTracker = React.createClass({
- validateUserInput: function(line, station) {
- return /^[A-Z]{1}$/.test(line) && /^[A-Z]{3}$/.test(station) &&
- utils.isStationOnLine(line, station, this.props.networkData);
- },
-
formatAndValidateUserInput: function(userLine, userStation) {
var line = null;
var station = null;
// We could have added extra states for invalid data
// but it's easier simply to ignore it.
- if (this.validateUserInput(userLine, userStation)) {
+ if (utils.isStationOnLine(userLine, userStation, this.props.networkData)) {
line = userLine;
station = userStation;
}
@@ -29,9 +24,11 @@ var TubeTracker = React.createClass({
},
getInitialState: function() {
+ var initialData = this.props.initialData;
+
return this.formatAndValidateUserInput(
- utils.queryStringProperty(utils.getQueryString(), "line"),
- utils.queryStringProperty(utils.getQueryString(), "station")
+ initialData ? initialData.request.lineCode : null,
+ initialData ? initialData.request.stationCode : null
);
},
@@ -49,7 +46,7 @@ var TubeTracker = React.createClass({
window.history.pushState(null, null, utils.formatQueryString(newState));
},
- componentWillMount: function() {
+ componentDidMount: function() {
window.addEventListener("tt:update", this.handleUpdate, false);
},
@@ -64,7 +61,7 @@ var TubeTracker = React.createClass({