From 2248226cbdaa4d0213d44b4311933854d6337cfe Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Wed, 30 Jan 2013 13:07:45 +0000 Subject: [PATCH] Use actual data. --- javascripts/collections/lines.js | 5 -- stylesheets/main.css | 2 +- stylesheets/main.scss | 4 +- test-data/now.json | 1 - test-data/tomorrow.json | 149 ------------------------------ test-data/weekend.json | 150 ------------------------------- 6 files changed, 3 insertions(+), 308 deletions(-) delete mode 100644 test-data/now.json delete mode 100644 test-data/tomorrow.json delete mode 100644 test-data/weekend.json diff --git a/javascripts/collections/lines.js b/javascripts/collections/lines.js index 2ce0612..efd998a 100644 --- a/javascripts/collections/lines.js +++ b/javascripts/collections/lines.js @@ -2,7 +2,6 @@ define(['backbone', 'models/line'], function(Backbone, Line) { var LinesCollection = Backbone.Collection.extend({ // added callback=? to force jsonp - //url: "http://api.tubeupdates.com/?method=get.status&callback=?", url: "http://tubefeed.herokuapp.com/now.json?callback=?", urls: { now: "http://tubefeed.herokuapp.com/now.json?callback=?", @@ -10,10 +9,6 @@ define(['backbone', 'models/line'], function(Backbone, Line) { }, model: Line, - - parse: function(data) { - return data.response.lines; - } }); return LinesCollection; diff --git a/stylesheets/main.css b/stylesheets/main.css index e2861bd..4984f21 100644 --- a/stylesheets/main.css +++ b/stylesheets/main.css @@ -252,7 +252,7 @@ li .major-delays { background: #00782a; color: white; } -#docklands .name { +#dlr .name { background: #00a4a7; color: white; } diff --git a/stylesheets/main.scss b/stylesheets/main.scss index 3c59790..56098bc 100644 --- a/stylesheets/main.scss +++ b/stylesheets/main.scss @@ -189,7 +189,7 @@ $northern: #000000; $piccadilly: #003688; $victoria: #0098D4; $waterloocity: #95CDBA; -$docklands: #00A4A7; +$dlr: #00A4A7; $overground: #EE7C0E; $tramlink: #84B817; @@ -197,7 +197,7 @@ $tramlink: #84B817; #central .name { background: $central; color: white; } #circle .name { background: $circle; color: rgb(17, 59, 146); } #district .name { background: $district; color: white; } -#docklands .name { background: $docklands; color: white; } +#dlr .name { background: $dlr; color: white; } #hammersmithcity .name { background: $hammersmithcity; color: rgb(17, 59, 146); } #jubilee .name { background: $jubilee; color: white; } #metropolitan .name { background: $metropolitan; color: white; } diff --git a/test-data/now.json b/test-data/now.json deleted file mode 100644 index 653d30c..0000000 --- a/test-data/now.json +++ /dev/null @@ -1 +0,0 @@ -{"response":{"lines":[{"name":"Bakerloo","id":"bakerloo","status":"good service","messages":[],"status_starts":"Mon, 21 Jan 2013 13:43:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Central","id":"central","status":"good service","messages":[],"status_starts":"Wed, 23 Jan 2013 14:09:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Circle","id":"circle","status":"good service","messages":[],"status_starts":"Tue, 22 Jan 2013 11:50:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"District","id":"district","status":"good service","messages":[],"status_starts":"Tue, 22 Jan 2013 11:29:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"DLR","id":"docklands","status":"good service","messages":[],"status_starts":"Tue, 22 Jan 2013 08:33:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"H'smith & City","id":"hammersmithcity","status":"good service","messages":[],"status_starts":"Tue, 22 Jan 2013 01:35:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Jubilee","id":"jubilee","status":"good service","messages":[],"status_starts":"Mon, 21 Jan 2013 09:39:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Metropolitan","id":"metropolitan","status":"good service","messages":[],"status_starts":"Mon, 21 Jan 2013 12:39:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Northern","id":"northern","status":"good service","messages":[],"status_starts":"Wed, 23 Jan 2013 10:18:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Overground","id":"overground","status":"good service","messages":[],"status_starts":"Tue, 22 Jan 2013 15:02:02 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Piccadilly","id":"piccadilly","status":"good service","messages":[],"status_starts":"Mon, 21 Jan 2013 07:02:02 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Victoria","id":"victoria","status":"minor delays","messages":["Minor delays while we fix a signal failure at Highbury & Islington."],"status_starts":"Wed, 23 Jan 2013 16:24:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"},{"name":"Waterloo & City","id":"waterloocity","status":"good service","messages":[],"status_starts":"Mon, 21 Jan 2013 19:58:01 +0000","status_ends":"","status_requested":"Wed, 23 Jan 2013 16:31:31 +0000"}]}} diff --git a/test-data/tomorrow.json b/test-data/tomorrow.json deleted file mode 100644 index 90faa4b..0000000 --- a/test-data/tomorrow.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "response":{ - "lines":[ - { - "name":"Bakerloo", - "id":"bakerloo", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 13:43:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Central", - "id":"central", - "status":"good service", - "messages":[ - - ], - "status_starts":"Wed, 23 Jan 2013 14:09:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Circle", - "id":"circle", - "status":"good service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 11:50:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"District", - "id":"district", - "status":"part closure", - "messages":[ - "DISTRICT LINE: Sunday 1 March, suspended between Ealing Broadway and Hammersmith." - ], - "status_starts":"Tue, 22 Jan 2013 11:29:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"DLR", - "id":"docklands", - "status":"good service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 08:33:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"H'smith & City", - "id":"hammersmithcity", - "status":"good service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 01:35:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Jubilee", - "id":"jubilee", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 09:39:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Metropolitan", - "id":"metropolitan", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 12:39:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Northern", - "id":"northern", - "status":"good service", - "messages":[ - - ], - "status_starts":"Wed, 23 Jan 2013 10:18:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Overground", - "id":"overground", - "status":"good service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 15:02:02 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Piccadilly", - "id":"piccadilly", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 07:02:02 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Victoria", - "id":"victoria", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 19:31:02 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Waterloo & City", - "id":"waterloocity", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 19:58:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - } - ] - } -} diff --git a/test-data/weekend.json b/test-data/weekend.json deleted file mode 100644 index 18ea531..0000000 --- a/test-data/weekend.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "response":{ - "lines":[ - { - "name":"Bakerloo", - "id":"bakerloo", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 13:43:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Central", - "id":"central", - "status":"good service", - "messages":[ - - ], - "status_starts":"Wed, 23 Jan 2013 14:09:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Circle", - "id":"circle", - "status":"special service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 11:50:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"District", - "id":"district", - "status":"major delays", - "messages":[ - "MONUMENT AND BANK STATIONS: Please avoid using Monument Station to interchange with services from Bank.", - "DISTRICT LINE: Sunday 1 March, suspended between Ealing Broadway and Hammersmith." - ], - "status_starts":"Tue, 22 Jan 2013 11:29:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"DLR", - "id":"docklands", - "status":"good service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 08:33:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"H'smith & City", - "id":"hammersmithcity", - "status":"good service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 01:35:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Jubilee", - "id":"jubilee", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 09:39:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Metropolitan", - "id":"metropolitan", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 12:39:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Northern", - "id":"northern", - "status":"part closure", - "messages":[ - - ], - "status_starts":"Wed, 23 Jan 2013 10:18:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Overground", - "id":"overground", - "status":"good service", - "messages":[ - - ], - "status_starts":"Tue, 22 Jan 2013 15:02:02 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Piccadilly", - "id":"piccadilly", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 07:02:02 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Victoria", - "id":"victoria", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 19:31:02 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - }, - { - "name":"Waterloo & City", - "id":"waterloocity", - "status":"good service", - "messages":[ - - ], - "status_starts":"Mon, 21 Jan 2013 19:58:01 +0000", - "status_ends":"", - "status_requested":"Wed, 23 Jan 2013 14:53:42 +0000" - } - ] - } -}