projects / bus.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
Fix character escaping
Fix character escaping

file:a/betweenpoint.submit.php -> file:b/betweenpoint.submit.php 
--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -6,8 +6,8 @@
 }

 print_r($_REQUEST);

 $reverse=$_REQUEST["reverse"];

-$from=$_REQUEST["from"];

-$to=$_REQUEST["to"];

+$from=pg_escape_string($_REQUEST["from"]);

+$to=pg_escape_string($_REQUEST["to"]);

 $routes=$_REQUEST["routes"] ;

 $points=$_REQUEST["between_points"];

    $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";
file:a/busui/common.inc.php -> file:b/busui/common.inc.php 
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -19,6 +19,9 @@
 }
 
 function include_header($pageTitle, $opendiv = true, $geolocate = false) {
+ // this starts the session 
+ session_start(); 
+ 
     // if (isDebug()) // set php error level high
     echo '
 <!DOCTYPE html>
file:a/display.php -> file:b/display.php 
--- a/display.php
+++ b/display.php
@@ -18,7 +18,7 @@
 		// create the ol map object
 		var map = new OpenLayers.Map('map', options);
     
-var osmtiles = new OpenLayers.Layer.OSM("local", "http://10.0.1.153/tiles/${z}/${x}/${y}.png");
+var osmtiles = new OpenLayers.Layer.OSM("local", "http://localhost/tiles/${z}/${x}/${y}.png");
 // use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
  var graphic = new OpenLayers.Layer.Image(
                 'Weekday Bus Map',
file:a/maxious-canberra-transit-feed/04-locatebetweenpoints.reversegeocode.php -> file:b/maxious-canberra-transit-feed/04-locatebetweenpoints.reversegeocode.php 
--- a/maxious-canberra-transit-feed/04-locatebetweenpoints.reversegeocode.php
+++ b/maxious-canberra-transit-feed/04-locatebetweenpoints.reversegeocode.php
@@ -15,21 +15,24 @@
   echo "An error occured.\n";
   exit;
 }
-$sql = "Select * from stops where name is null";
+$sql = "Select * from stops where name is null or suburb is null";
      $result_stops = pg_query($conn, $sql);
      if (!$result_stops) {
-	cho("Error in SQL query: " . pg_last_error() ."<br>\n");
+	echo("Error in SQL query: " . pg_last_error() ."<br>\n");
      }
      while ($stop = pg_fetch_assoc($result_stops)) {
       echo "Processing ".$stop['geohash'] . " ... ";
       $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?around=".($stop['lat']/10000000).",".($stop['lng']/10000000)."&distance=closest&object_type=road";
       $contents = json_decode(getPage($url));
+      print_r($contents);
       $name = $contents->features[0]->properties->name;
+      //todo suburb/locality select * from suburbs where the_geom @> 'POINT(149.075704592122 -35.21751569325)'::geometry
       echo "Saving $name ! <br>" ;
       $result_save = pg_query($conn, "UPDATE stops set name = '".pg_escape_string($name)."' where geohash = '{$stop['geohash']}' ");
 			      if (!$result_save) {
 	echo("Error in SQL query: " . pg_last_error() ."<br>\n");
      }
+     die();
      flush();
      }
file:a/maxious-canberra-transit-feed/cbrtable.yml -> file:b/maxious-canberra-transit-feed/cbrtable.yml 
--- a/maxious-canberra-transit-feed/cbrtable.yml
+++ b/maxious-canberra-transit-feed/cbrtable.yml
@@ -1682,7 +1682,36 @@
   - { name: Parkinson Street,stop_code: WjrX-0-, lat: -35.3424839, lng: 149.052828}
   - { name: Backler Place,stop_code: WjrXZv5, lat: -35.3432647, lng: 149.0558034}
   - { name: Gilmore Crescent,stop_code: Wjz3BfO, lat: -35.3434784, lng: 149.1088951}
+  - { name: Edinburgh Avenue,stop_code: Wjz5EKJ, lat: -35.28346, lng: 149.1252}
 routes:
+  -  
+    time_points: [Gungahlin Marketplace, Flemington Rd / Sandford St, Northbourne Avenue / Antill St, Macarthur / Northbourne Ave, City Bus Station (Platform 9), Russell Offices, Kings Ave / National Circuit, Railway Station Kingston, Fyshwick Direct Factory Outlet]
+    long_name: To Fyshwick DirectFactory Outlet
+    between_stops: 
+      Russell Offices-Kings Ave / National Circuit: [Wjz4RFJ, Wjz4RwH, Wjz4Quk]
+      Northbourne Avenue / Antill St-Macarthur / Northbourne Ave: [Wjz5SDc, Wjz5Sux, Wjz5SrO, Wjz5Sqk, Wjz5RvC, Wjz5Rsi, Wjz5RkN]
+      Macarthur / Northbourne Ave-City Bus Station (Platform 9): [Wjz5QmR, Wjz5Qmu, Wjz5Qgn, Wjz5Qi2, Wjz5Pl0, Wjz5PdJ, Wjz5P8K, Wjz5P8n, Wjz5Oci, Wjz5O3Q]
+      City Bus Station (Platform 9)-Russell Offices: [Wjz5Nht, Wjz5MsD, Wjz5MsT, Wjz5MEL, Wjz4T-X, Wjz4_jm, Wjz4_wS, Wjz4-KO, Wjz4-Rc, Wjz4-WL, Wjz4-WZ]
+    short_name: "200"
+    stop_times: [[701a, 709a, 715a, 718a, 723a, 732a, 736a, 742a, 749a], [716a, 724a, 731a, 737a, 747a, 757a, 801a, 807a, 814a], [731a, 740a, 749a, 755a, 805a, 815a, 819a, 825a, 832a], [746a, 755a, 804a, 810a, 820a, 830a, 834a, 840a, 847a], [801a, 810a, 819a, 825a, 835a, 845a, 849a, 855a, 902a], [816a, 825a, 834a, 840a, 850a, 900a, 904a, 910a, 917a], [831a, 840a, 849a, 855a, 902a, 910a, 914a, 920a, 927a], [846a, 855a, 902a, 905a, 910a, 918a, 922a, 928a, 935a], [901a, 909a, 915a, 918a, 923a, 931a, 935a, 941a, 948a], [916a, 924a, 930a, 933a, 938a, 946a, 950a, 956a, 1003a], [931a, 939a, 945a, 948a, 953a, 1001a, 1005a, 1011a, 1018a], [946a, 954a, 1000a, 1003a, 1008a, 1016a, 1020a, 1026a, 1033a], [1001a, 1009a, 1015a, 1018a, 1023a, 1031a, 1035a, 1041a, 1048a], [1016a, 1024a, 1030a, 1033a, 1038a, 1046a, 1050a, 1056a, 1103a], [1031a, 1039a, 1045a, 1048a, 1053a, 1101a, 1105a, 1111a, 1118a], [1046a, 1054a, 1100a, 1103a, 1108a, 1116a, 1120a, 1126a, 1133a], [1101a, 1109a, 1115a, 1118a, 1123a, 1131a, 1135a, 1141a, 1148a], [1116a, 1124a, 1130a, 1133a, 1138a, 1146a, 1150a, 1156a, 1203p], [1131a, 1139a, 1145a, 1148a, 1153a, 1201p, 1205p, 1211p, 1218p], [1146a, 1154a, 1200p, 1203p, 1208p, 1216p, 1220p, 1226p, 1233p], [1201p, 1209p, 1215p, 1218p, 1223p, 1231p, 1235p, 1241p, 1248p], [1216p, 1224p, 1230p, 1233p, 1238p, 1246p, 1250p, 1256p, 103p], [1233p, 1241p, 1247p, 1250p, 1255p, 103p, 107p, 113p, 120p], [1246p, 1254p, 100p, 103p, 108p, 116p, 120p, 126p, 133p], [101p, 109p, 115p, 118p, 123p, 131p, 135p, 141p, 148p], [116p, 124p, 130p, 133p, 138p, 146p, 150p, 156p, 203p], [131p, 139p, 145p, 148p, 153p, 201p, 205p, 211p, 218p], [146p, 154p, 200p, 203p, 208p, 216p, 220p, 226p, 233p], [201p, 209p, 215p, 218p, 223p, 231p, 235p, 241p, 248p], [216p, 224p, 230p, 233p, 238p, 246p, 250p, 256p, 303p], [231p, 239p, 245p, 248p, 253p, 301p, 305p, 311p, 318p], [246p, 254p, 300p, 303p, 308p, 316p, 320p, 326p, 333p], [301p, 309p, 315p, 318p, 323p, 331p, 335p, 341p, 348p], [316p, 324p, 330p, 333p, 338p, 346p, 350p, 356p, 404p], [331p, 339p, 345p, 348p, 353p, 402p, 407p, 415p, 424p], [346p, 354p, 400p, 403p, 412p, 422p, 427p, 435p, 444p], [401p, 410p, 417p, 420p, 429p, 439p, 444p, 452p, 501p], [416p, 425p, 432p, 435p, 444p, 454p, 459p, 507p, 516p], [431p, 440p, 447p, 450p, 459p, 509p, 514p, 522p, 531p], [446p, 455p, 502p, 505p, 514p, 524p, 529p, 537p, 546p], [501p, 510p, 517p, 520p, 529p, 539p, 544p, 552p, 600p], [516p, 525p, 532p, 535p, 544p, 554p, 559p, 605p, 612p], [531p, 540p, 547p, 550p, 559p, 607p, 611p, 617p, 624p], [546p, 555p, 601p, 604p, 609p, 617p, 621p, 627p, 634p], [601p, 609p, 615p, 618p, 623p, 631p, 635p, 641p, 648p], [616p, 624p, 630p, 633p, 638p, 646p, 650p, 656p, 703p], [631p, 639p, 645p, 648p, 653p, 701p, 705p, 711p, 718p], [646p, 654p, 700p, 703p, 708p, 716p, 720p, 726p, 733p]]
+  -  
+    time_points: [Cohen Street Bus Station (Platform 1), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 2), Chuculba / William Slim Dr, Mirrabei Drive / Dam Wall, Paul Coe / Mirrabei Dr, Katherine Ave / Horse Park Drive, Gungahlin Marketplace, Hibberson / Kate Crace, Flemington Rd / Sandford St, Northbourne Avenue / Antill St]
+    long_name: To Northbourne Avenue / Antill St
+    between_stops: 
+      Belconnen Community Bus Station (Platform 2)-Chuculba / William Slim Dr: [Wjz69gA, Wjz69ht, Wjz69uI, Wjz69vO, Wjz6mip]
+      Cohen Street Bus Station (Platform 1)-Westfield Bus Station (Platform 1): []
+      Westfield Bus Station (Platform 1)-Belconnen Community Bus Station (Platform 2): []
+    short_name: "59"
+    stop_times: [["-", "-", "-", "-", 537a, 541a, 547a, 603a, 606a, "-", "-"], ["-", "-", "-", "-", 612a, 616a, 622a, 638a, 641a, "-", "-"], ["-", "-", "-", "-", 646a, 650a, 656a, 711a, 714a, 717a, 724a], ["-", "-", "-", "-", 702a, 706a, 712a, 727a, 730a, 733a, 740a], ["-", "-", "-", "-", 712a, 716a, 722a, 737a, 740a, 743a, 753a], ["-", "-", "-", "-", 733a, 737a, 743a, 758a, 801a, 806a, 817a], ["-", "-", "-", "-", 809a, 813a, 819a, 834a, 837a, 842a, 853a], ["-", "-", "-", "-", 820a, 824a, 830a, 845a, 848a, 853a, 903a], ["-", "-", "-", "-", 849a, 853a, 859a, 914a, 917a, 920a, 927a], [900a, 902a, 906a, 923a, "-", 933a, 939a, 955a, 958a, "-", "-"], [1000a, 1002a, 1006a, 1023a, "-", 1033a, 1039a, 1055a, 1058a, "-", "-"], [1100a, 1102a, 1106a, 1123a, "-", 1133a, 1139a, 1155a, 1158a, "-", "-"], [1200p, 1202p, 1206p, 1223p, "-", 1233p, 1239p, 1255p, 1258p, "-", "-"], [100p, 102p, 106p, 123p, "-", 133p, 139p, 155p, 158p, "-", "-"], [200p, 202p, 206p, 223p, "-", 233p, 239p, 255p, 258p, "-", "-"], [240p, 242p, 246p, 303p, "-", 313p, 319p, 335p, 338p, "-", "-"], [318p, 320p, 324p, 342p, "-", 352p, 358p, 414p, 417p, "-", "-"], [333p, 335p, 339p, 357p, "-", 407p, 413p, 429p, 432p, "-", "-"], [348p, 350p, 354p, 412p, "-", 422p, 428p, 444p, 447p, "-", "-"], [403p, 405p, 409p, 427p, "-", 437p, 443p, 459p, 502p, "-", "-"], [418p, 420p, 424p, 442p, "-", 452p, 458p, 514p, 517p, "-", "-"], [433p, 435p, 439p, 457p, "-", 507p, 513p, 529p, 532p, "-", "-"], [448p, 450p, 454p, 512p, "-", 522p, 528p, 544p, 547p, "-", "-"], [503p, 505p, 509p, 527p, "-", 537p, 543p, 559p, 602p, "-", "-"], [518p, 520p, 524p, 542p, "-", 552p, 558p, 614p, 617p, "-", "-"], [530p, 532p, 536p, 554p, "-", 604p, 610p, 626p, 629p, "-", "-"], [548p, 550p, 554p, 611p, "-", 620p, 626p, 642p, 645p, "-", "-"], [603p, 605p, 609p, 626p, "-", 635p, 641p, 657p, 700p, "-", "-"], [703p, 705p, 709p, 726p, "-", 735p, 741p, 757p, 800p, "-", "-"], [803p, 805p, 809p, 826p, "-", 835p, 841p, 857p, 900p, "-", "-"], [903p, 905p, 909p, 926p, "-", 935p, 941p, 957p, 1000p, "-", "-"], [1003p, 1005p, 1009p, 1026p, "-", 1035p, 1041p, 1057p, 1100p, "-", "-"], [1103p, 1105p, 1109p, 1126p, "-", 1135p, 1141p, 1157p, 1200a, "-", "-"]]
+  -  
+    time_points: [Cohen Street Bus Station (Platform 1), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 2), Chuculba / William Slim Dr, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Marketplace]
+    long_name: To Gungahlin Marketplace
+    between_stops: 
+      Belconnen Community Bus Station (Platform 2)-Chuculba / William Slim Dr: [Wjz69gA, Wjz69ht, Wjz69uI, Wjz69vO, Wjz6mip]
+      Cohen Street Bus Station (Platform 1)-Westfield Bus Station (Platform 1): []
+      Westfield Bus Station (Platform 1)-Belconnen Community Bus Station (Platform 2): []
+    short_name: "951"
+    stop_times_sunday: [[920a, 922a, 926a, 934a, 939a, 944a, 954a, 1004a], [1020a, 1022a, 1026a, 1034a, 1039a, 1044a, 1054a, 1104a], [1120a, 1122a, 1126a, 1134a, 1139a, 1144a, 1154a, 1204p], [1220p, 1222p, 1226p, 1234p, 1239p, 1244p, 1254p, 104p], [120p, 122p, 126p, 134p, 139p, 144p, 154p, 204p], [220p, 222p, 226p, 234p, 239p, 244p, 254p, 304p], [320p, 322p, 326p, 334p, 339p, 344p, 354p, 404p], [420p, 422p, 426p, 434p, 439p, 444p, 454p, 504p], [520p, 522p, 526p, 534p, 539p, 544p, 554p, 604p], [620p, 622p, 626p, 634p, 639p, 644p, 654p, 704p]]
   -  
     time_points: [Belconnen Community Bus Station (Platform 5), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 5), Kippax, Macgregor, Charnwood, Macgregor, Kippax, Cohen Street Bus Station, Westfield Bus Station, Belconnen Community Bus Station]
     long_name: To Belconnen Community Bus Station
@@ -1694,15 +1723,6 @@
     short_name: "43"
     stop_times: [["-", "-", "-", "-", 621a, 629a, 638a, 643a, 648a, 650a, 654a], ["-", "-", "-", "-", 640a, 648a, 657a, 702a, 707a, 709a, 713a], [644a, 646a, 650a, 655a, 700a, 708a, 717a, 722a, 727a, 729a, 733a], ["-", "-", "-", "-", 720a, 728a, 739a, 744a, 752a, 754a, 758a], ["-", "-", "-", "-", 741a, 749a, 800a, 805a, 813a, 815a, 819a], ["-", "-", "-", "-", 802a, 810a, 821a, 826a, 834a, 836a, 840a], ["-", "-", "-", "-", 824a, 832a, 843a, 848a, 856a, 858a, 902a], [823a, 825a, 829a, 837a, 842a, 850a, 901a, 906a, 914a, 916a, 920a], [843a, 845a, 849a, 857a, 902a, 910a, 921a, 926a, 933a, 935a, 939a], [903a, 905a, 909a, 917a, 922a, 930a, 939a, 944a, 952a, 954a, 958a], [1003a, 1005a, 1009a, 1015a, 1020a, 1028a, 1037a, 1042a, 1048a, 1050a, 1054a], [1103a, 1105a, 1109a, 1115a, 1120a, 1128a, 1137a, 1142a, 1148a, 1150a, 1154a], [1203p, 1205p, 1209p, 1215p, 1220p, 1228p, 1237p, 1242p, 1248p, 1250p, 1254p], [103p, 105p, 109p, 115p, 120p, 128p, 137p, 142p, 148p, 150p, 154p], [203p, 205p, 209p, 215p, 220p, 228p, 237p, 242p, 248p, 250p, 254p], [254p, 256p, 300p, 308p, 313p, 321p, 332p, 337p, 345p, 347p, 351p], [323p, 325p, 329p, 337p, 342p, 350p, 401p, 406p, 414p, 416p, 420p], [343p, 345p, 349p, 357p, 402p, 410p, 421p, 426p, 434p, 436p, 440p], [403p, 405p, 409p, 417p, 422p, 430p, 441p, 446p, 454p, 456p, 500p], [423p, 425p, 429p, 437p, 442p, 450p, 501p, 506p, 514p, 516p, 520p], [443p, 445p, 449p, 457p, 502p, 510p, 521p, 526p, 534p, 536p, 540p], [503p, 505p, 509p, 517p, 522p, 530p, 541p, 546p, 554p, 556p, 600p], [523p, 525p, 529p, 537p, 542p, 550p, 601p, 606p, 614p, 616p, 620p], [602p, 604p, 608p, 616p, 621p, 629p, 638p, 643p, 648p, 650p, 654p], [702p, 704p, 708p, 713p, 718p, 726p, 735p, 740p, 745p, 747p, 751p], [802p, 804p, 808p, 813p, 818p, 826p, 835p, 840p, 845p, 847p, 851p], [902p, 904p, 908p, 913p, 918p, 926p, 935p, 940p, 945p, 947p, 951p], [1002p, 1004p, 1008p, 1013p, 1018p, 1026p, 1035p, 1040p, 1045p, 1047p, 1051p], [1102p, 1104p, 1108p, 1113p, 1118p, 1126p, 1135p, "-", "-", "-", "-"], []]
   -  
-    time_points: [Cohen Street Bus Station (Platform 1), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 2), Chuculba / William Slim Dr, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Marketplace]
-    long_name: To Gungahlin Marketplace
-    between_stops: 
-      Belconnen Community Bus Station (Platform 2)-Chuculba / William Slim Dr: [Wjz69gA, Wjz69ht, Wjz69uI, Wjz69vO, Wjz6mip]
-      Cohen Street Bus Station (Platform 1)-Westfield Bus Station (Platform 1): []
-      Westfield Bus Station (Platform 1)-Belconnen Community Bus Station (Platform 2): []
-    short_name: "951"
-    stop_times_sunday: [[920a, 922a, 926a, 934a, 939a, 944a, 954a, 1004a], [1020a, 1022a, 1026a, 1034a, 1039a, 1044a, 1054a, 1104a], [1120a, 1122a, 1126a, 1134a, 1139a, 1144a, 1154a, 1204p], [1220p, 1222p, 1226p, 1234p, 1239p, 1244p, 1254p, 104p], [120p, 122p, 126p, 134p, 139p, 144p, 154p, 204p], [220p, 222p, 226p, 234p, 239p, 244p, 254p, 304p], [320p, 322p, 326p, 334p, 339p, 344p, 354p, 404p], [420p, 422p, 426p, 434p, 439p, 444p, 454p, 504p], [520p, 522p, 526p, 534p, 539p, 544p, 554p, 604p], [620p, 622p, 626p, 634p, 639p, 644p, 654p, 704p]]
-  -  
     time_points: [City Bus Station (Platform 8), Macarthur / Northbourne Ave, Flemington Rd / Sandford St, Flemington Rd / Nullabor Ave, Anthony Rolfe Av / Moonlight Av, Gungahlin Marketplace, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba / William Slim Dr, Belconnen Community Bus Station, Westfield Bus Station, Cohen Street Bus Station]
     long_name: To Cohen Street Bus Station
     between_stops: 
@@ -1720,13 +1740,12 @@
     short_name: "786"
     stop_times: [[646a, 656a, 716a, 726a], [706a, 716a, 736a, 746a], [727a, 737a, 804a, 814a]]
   -  
-    time_points: [City Bus Station (Platform 8), Macarthur / Northbourne Ave, Northbourne Avenue / Antill St, Flemington Rd / Sandford St, Hoskins Street / Oodgeroo Ave, Manning Clarke / Oodgeroo, Gungahlin Marketplace]
-    long_name: To Gungahlin Marketplace
-    between_stops: 
-      Macarthur / Northbourne Ave-Northbourne Avenue / Antill St: [Wjz5RkN, Wjz5Rsi, Wjz5RvC, Wjz5Sqk, Wjz5SrO, Wjz5Sux, Wjz5SDc]
-      City Bus Station (Platform 8)-Macarthur / Northbourne Ave: [Wjz5O3Q, Wjz5Oci, Wjz5P8n, Wjz5P8K, Wjz5PdJ, Wjz5Pl0, Wjz5Qi2, Wjz5Qgn, Wjz5Qmu, Wjz5QmR]
-    short_name: "57"
-    stop_times: [[655a, 701a, 703a, 709a, 717a, 720a, 724a], [725a, 731a, 733a, 739a, 747a, 750a, 754a], [755a, 802a, 804a, 810a, 818a, 821a, 825a], [825a, 832a, 834a, 840a, 848a, 851a, 855a], [855a, 902a, 904a, 910a, 918a, 921a, 925a], [957a, 1003a, 1005a, 1011a, 1019a, 1022a, 1026a], [1055a, 1101a, 1103a, 1109a, 1117a, 1120a, 1124a], [1155a, 1201p, 1203p, 1209p, 1217p, 1220p, 1224p], [1255p, 101p, 103p, 109p, 117p, 120p, 124p], [155p, 201p, 203p, 209p, 217p, 220p, 224p], [255p, 301p, 303p, 310p, 318p, 321p, 325p], [355p, 402p, 404p, 411p, 419p, 422p, 426p], [425p, 432p, 434p, 441p, 449p, 452p, 456p], [455p, 502p, 504p, 511p, 519p, 522p, 526p], [525p, 532p, 534p, 541p, 549p, 552p, 556p], [555p, 602p, 604p, 609p, 617p, 620p, 624p], [625p, 631p, 633p, 638p, 646p, 649p, 653p], [655p, 701p, 703p, 708p, 716p, 719p, 723p]]
+    time_points: [Woden Bus Station (Platform 14), Canberra Hospital, Red Hill, Manuka, Kings Ave / National Circuit, City Bus Station (Platform 4), Lyneham / Wattle St, North Lyneham, Dickson / Antill St]
+    long_name: To Dickson
+    between_stops: 
+      Woden Bus Station (Platform 14)-Canberra Hospital: [Wjz3mAg, Wjz3mPO, Wjz3mWn]
+    short_name: "6"
+    stop_times: [[618a, 626a, 638a, 645a, 650a, 701a, 713a, 719a, 725a], [653a, 701a, 713a, 720a, 725a, 737a, 751a, 759a, 806a], [723a, 731a, 745a, 753a, 758a, 812a, 826a, 834a, 841a], [753a, 803a, 817a, 825a, 830a, 844a, 858a, 906a, 913a], [823a, 833a, 847a, 855a, 900a, 914a, 928a, 936a, 943a], [853a, 903a, 917a, 925a, 930a, 944a, 956a, 1004a, 1011a], [923a, 933a, 945a, 952a, 957a, 1011a, 1023a, 1031a, 1038a], [1023a, 1033a, 1045a, 1052a, 1057a, 1111a, 1123a, 1131a, 1138a], [1123a, 1133a, 1145a, 1152a, 1157a, 1211p, 1223p, 1231p, 1238p], [1223p, 1233p, 1245p, 1252p, 1257p, 111p, 123p, 131p, 138p], [123p, 133p, 145p, 152p, 157p, 211p, 223p, 231p, 238p], [223p, 233p, 245p, 252p, 257p, 311p, 325p, 333p, 340p], ["-", "-", "-", "-", "-", 344p, 358p, 406p, 413p], [323p, 333p, 347p, 355p, 400p, 414p, 428p, 436p, 443p], [353p, 403p, 417p, 425p, 430p, 444p, 458p, 506p, 513p], [423p, 433p, 447p, 455p, 500p, 514p, 528p, 536p, 543p], [453p, 503p, 517p, 525p, 530p, 544p, 558p, 606p, 613p], [516p, 526p, 540p, 548p, 553p, 607p, 621p, 629p, 635p], [553p, 603p, 617p, 625p, 630p, 640p, 650p, 656p, 702p], [630p, 638p, 648p, 655p, 700p, 710p, 720p, 726p, 732p], [730p, 738p, 748p, 755p, 800p, 810p, 820p, 826p, 832p], [830p, 838p, 848p, 855p, 900p, 910p, 920p, 926p, 932p], [930p, 938p, 948p, 955p, 1000p, 1010p, 1020p, 1026p, 1032p], [1030p, 1038p, 1048p, 1055p, 1100p, 1110p, 1120p, 1126p, 1132p]]
   -  
     time_points: [Cooleman Court, Duffy, Holder, Weston Primary, Woden Bus Station]
     long_name: To Woden Bus Station
@@ -1753,15 +1772,15 @@
     short_name: 19 319
     stop_times: [["-", "-", "-", "-", "-", 705a, 711a, 716a, 725a, 731a], ["-", "-", "-", "-", "-", 740a, 747a, 754a, 803a, 810a], [700a, 702a, 706a, 726a, 743a, 801a, 808a, 815a, 824a, 831a], [730a, 732a, 736a, 758a, 815a, 833a, 840a, 847a, 856a, 903a], ["-", "-", "-", "-", "-", 901a, 908a, 915a, 924a, 930a], ["-", "-", "-", "-", "-", 930a, 936a, 941a, 950a, 956a], [900a, 902a, 906a, 928a, 945a, 1001a, 1007a, 1012a, 1021a, 1027a], [930a, 932a, 936a, 956a, 1013a, 1029a, 1035a, 1040a, 1049a, 1055a], [1000a, 1002a, 1006a, 1026a, 1043a, 1059a, 1105a, 1110a, 1119a, 1125a], [1030a, 1032a, 1036a, 1056a, 1113a, 1129a, 1135a, 1140a, 1149a, 1155a], [1100a, 1102a, 1106a, 1126a, 1143a, 1159a, 1205p, 1210p, 1219p, 1225p], [1130a, 1132a, 1136a, 1156a, 1213p, 1229p, 1235p, 1240p, 1249p, 1255p], [1200p, 1202p, 1206p, 1226p, 1243p, 1259p, 105p, 110p, 119p, 125p], [1230p, 1232p, 1236p, 1256p, 113p, 129p, 135p, 140p, 149p, 155p], [100p, 102p, 106p, 126p, 143p, 159p, 205p, 210p, 219p, 225p], [130p, 132p, 136p, 156p, 213p, 229p, 235p, 240p, 249p, 255p], [200p, 202p, 206p, 226p, 243p, 259p, 306p, 313p, 322p, 329p], [230p, 232p, 236p, 256p, 313p, 333p, 340p, 347p, 356p, 403p], ["-", "-", "-", "-", 332p, 352p, 359p, 406p, 415p, 422p], [300p, 302p, 306p, 328p, 345p, 405p, 412p, 419p, 428p, 435p], [330p, 332p, 336p, 358p, 415p, 435p, 442p, 449p, 458p, 505p], [400p, 402p, 406p, 428p, 445p, 505p, 512p, 519p, 528p, 535p], [430p, 432p, 436p, 458p, 515p, 535p, 542p, 549p, 558p, 605p], [450p, 452p, 456p, 518p, 535p, 555p, 602p, 609p, 618p, 625p], [510p, 512p, 516p, 538p, 555p, 615p, 622p, 629p, 638p, 644p], [530p, 532p, 536p, 558p, 615p, 634p, 640p, 645p, 654p, 700p], [600p, 602p, 606p, 628p, 642p, 658p, 704p, 709p, 718p, 724p], [630p, 632p, 636p, 655p, 709p, 725p, 731p, 736p, 745p, 751p], ["-", "-", "-", "-", "-", 818p, 824p, 829p, 838p, 844p], ["-", "-", "-", "-", "-", 918p, 924p, 929p, 938p, 944p], ["-", "-", "-", "-", "-", 1018p, 1024p, 1029p, 1038p, 1044p], ["-", "-", "-", "-", "-", 1118p, 1124p, 1129p, 1138p, 1144p]]
   -  
-    time_points: [Cohen Street Bus Station (Platform 1), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 3), Copland College, Tillyard / Spalding, Charnwood, Kerrigan / Lhotsky, Charnwood, Tillyard / Spalding, Copland College, Belconnen Community Bus Station, Westfield Bus Station, Cohen Street Bus Station]
+    time_points: [Cohen Street Bus Station (Platform 1), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 3), Gwydir Square Kaleen, Kaleen Village / Marybrynong, Giralang, Kaleen Village / Marybrynong, Gwydir Square Kaleen, Belconnen Community Bus Station, Westfield Bus Station, Cohen Street Bus Station]
     long_name: To Cohen Street Bus Station
     between_stops: 
       Westfield Bus Station-Cohen Street Bus Station: []
       Belconnen Community Bus Station-Westfield Bus Station: []
       Westfield Bus Station (Platform 1)-Belconnen Community Bus Station (Platform 3): []
       Cohen Street Bus Station (Platform 1)-Westfield Bus Station (Platform 1): []
-    short_name: "45"
-    stop_times: [["-", "-", "-", "-", "-", 627a, 632a, 638a, 640a, 648a, 658a, 700a, 705a], ["-", "-", "-", "-", "-", 657a, 702a, 708a, 710a, 718a, 728a, 730a, 735a], ["-", "-", "-", "-", "-", 729a, 734a, 740a, 742a, 750a, 800a, 802a, 807a], ["-", "-", "-", "-", "-", 759a, 804a, 810a, 812a, 820a, 830a, 832a, 837a], ["-", "-", "-", "-", "-", 822a, 827a, 833a, 835a, 843a, 853a, 855a, 900a], ["-", "-", "-", "-", "-", 844a, 849a, 855a, 857a, 905a, 915a, 917a, 922a], [828a, 830a, 834a, 842a, 850a, 852a, 857a, 903a, 905a, 913a, 923a, 925a, 930a], [858a, 900a, 904a, 912a, 920a, 922a, 927a, 933a, 935a, 943a, 953a, 955a, 1000a], [921a, 923a, 927a, 935a, 943a, 945a, 950a, 956a, 958a, 1006a, 1016a, 1018a, 1023a], [1021a, 1023a, 1027a, 1035a, 1043a, 1045a, 1050a, 1056a, 1058a, 1106a, 1116a, 1118a, 1123a], [1121a, 1123a, 1127a, 1135a, 1143a, 1145a, 1150a, 1156a, 1158a, 1206p, 1216p, 1218p, 1223p], [1221p, 1223p, 1227p, 1235p, 1243p, 1245p, 1250p, 1256p, 1258p, 106p, 116p, 118p, 123p], [121p, 123p, 127p, 135p, 143p, 145p, 150p, 156p, 158p, 206p, 216p, 218p, 223p], [221p, 223p, 227p, 235p, 243p, 245p, 250p, 256p, 258p, 306p, 316p, 318p, 323p], [258p, 300p, 304p, 312p, 320p, 322p, 327p, 333p, 335p, 343p, 353p, 355p, 400p], [328p, 330p, 334p, 342p, 350p, 352p, 357p, 403p, 405p, 413p, 423p, 425p, 430p], [358p, 400p, 404p, 412p, 420p, 422p, 427p, 433p, 435p, 443p, 453p, 455p, 500p], [428p, 430p, 434p, 442p, 450p, 452p, 457p, 503p, 505p, 513p, 523p, 525p, 530p], [458p, 500p, 504p, 512p, 520p, 522p, 527p, 533p, 535p, 543p, 553p, 555p, 600p], [528p, 530p, 534p, 542p, 550p, 552p, 557p, 603p, 605p, 613p, 623p, 625p, 630p], [558p, 600p, 604p, 612p, 620p, 622p, 627p, 633p, 635p, 643p, 652p, 654p, 659p], [621p, 623p, 627p, 634p, 642p, 644p, 649p, 655p, 657p, 705p, 714p, 716p, 721p], [720p, 722p, 726p, 733p, 741p, 743p, 748p, 754p, 756p, 804p, 813p, 815p, 820p], [820p, 822p, 826p, 833p, 841p, 843p, 848p, 854p, 856p, 904p, 913p, 915p, 920p], [920p, 922p, 926p, 933p, 941p, 943p, 948p, 954p, 956p, 1004p, 1013p, 1015p, 1020p], [1020p, 1022p, 1026p, 1033p, 1041p, 1043p, 1048p, 1054p, 1056p, 1104p, 1113p, 1115p, 1120p], [1120p, 1122p, 1126p, 1133p, 1141p, 1143p, 1148p, 1154p, "-", "-", "-", "-", "-"], []]
+    short_name: "71"
+    stop_times: [[927a, 929a, 933a, 943a, 948a, 957a, 959a, 1004a, 1014a, 1016a, 1021a], [1027a, 1029a, 1033a, 1043a, 1048a, 1057a, 1059a, 1104a, 1114a, 1116a, 1121a], [1127a, 1129a, 1133a, 1143a, 1148a, 1157a, 1159a, 1204p, 1214p, 1216p, 1221p], [1227p, 1229p, 1233p, 1243p, 1248p, 1257p, 1259p, 104p, 114p, 116p, 121p], [127p, 129p, 133p, 143p, 148p, 157p, 159p, 204p, 214p, 216p, 221p]]
   -  
     time_points: [Tuggeranong Bus Station (Platform 4), Isabella, Theodore, Calwell, Outtrim / Duggan, Tuggeranong Bus Station]
     long_name: To Tuggeranong Bus Station
@@ -1827,6 +1846,7 @@
     long_name: To Cohen Street Bus Station
     between_stops: 
       Westfield Bus Station-Cohen Street Bus Station: []
+      ADFA-War Memorial / Limestone Ave: [Wjzce4H, Wjzce7O, Wjzcend, Wjzd8br, Wjzd0CK, Wjz5VUU]
       Belconnen Community Bus Station-Westfield Bus Station: []
       Campbell Park Offices-ADFA: [Wjzce7O, Wjzce4H, Wjzcend]
       Fairbairn Park-Brindabella Business Park: [WjzcJ38, WjzcBHZ, WjzcJ0K, WjzcrEu, WjzcrrQ, WjzcrK3]
@@ -1846,6 +1866,13 @@
       City Bus Station (Platform 10)-Russell Offices: [Wjz5Nht, Wjz5MsD, Wjz5MsT, Wjz5MEL, Wjz4T-X, Wjz4_jm, Wjz4_wS, Wjz4-KO, Wjz4-Rc, Wjz4-WL, Wjz4-WZ]
     short_name: "704"
     stop_times: [[738a, 744a, 749a, 754a, 803a, 812a, 825a, 833a, 840a], [753a, 759a, 804a, 809a, 818a, 827a, 840a, 848a, 855a]]
+  -  
+    time_points: [Tuggeranong Bus Station (Platform 3), MacKillop College Isabella Campus, Theodore, Calwell, Erindale Centre, Woden Bus Station (Platform 9), City Bus Station]
+    long_name: To City Bus Station
+    between_stops: 
+      Woden Bus Station (Platform 9)-City Bus Station: [Wjz3m3b, Wjz3m3b, Wjz3eRR, Wjz3eZ4, Wjz4KNu, Wjz4KO9, Wjz5Nht]
+    short_name: 11 111
+    stop_times: [[621a, 627a, 641a, 651a, 657a, 713a, 729a], [641a, 647a, 701a, 711a, 717a, 733a, 751a], [701a, 707a, 721a, 731a, 737a, 754a, 812a], [721a, 727a, 742a, 752a, 758a, 815a, 833a], [741a, 748a, 803a, 813a, 819a, 836a, 857a], [801a, 808a, 823a, 833a, 839a, 856a, 914a], [821a, 828a, 843a, 853a, 859a, 914a, "-"], [841a, 848a, 903a, 913a, 919a, 933a, "-"], [921a, 927a, 940a, 949a, 955a, 1007a, "-"], [951a, 957a, 1010a, 1019a, 1025a, 1037a, "-"], [1021a, 1027a, 1040a, 1049a, 1055a, 1107a, "-"], [1051a, 1057a, 1110a, 1119a, 1125a, 1137a, "-"], [1121a, 1127a, 1140a, 1149a, 1155a, 1207p, "-"], [1151a, 1157a, 1210p, 1219p, 1225p, 1237p, "-"], [1221p, 1227p, 1240p, 1249p, 1255p, 107p, "-"], [1251p, 1257p, 110p, 119p, 125p, 137p, "-"], [121p, 127p, 140p, 149p, 155p, 207p, "-"], [151p, 157p, 210p, 219p, 225p, 237p, "-"], [221p, 227p, 240p, 249p, 255p, 307p, "-"], [251p, 257p, 310p, 319p, 325p, 339p, "-"], [323p, 330p, 345p, 355p, 401p, 421p, "-"], [340p, 347p, 402p, 412p, 418p, 433p, "-"], [400p, 407p, 422p, 432p, 438p, 453p, "-"], [418p, 425p, 440p, 450p, 456p, 511p, "-"], [441p, 448p, 503p, 513p, 519p, "-", "-"], [501p, 508p, 523p, 533p, 539p, "-", "-"], [521p, 528p, 543p, 553p, 559p, 614p, "-"], [541p, 548p, 603p, 613p, 619p, "-", "-"], [601p, 608p, 623p, 633p, 639p, "-", "-"], [625p, 632p, 645p, 654p, 700p, 712p, "-"], [725p, 731p, 744p, 753p, 759p, 811p, "-"], [825p, 831p, 844p, 853p, 859p, 911p, "-"], [925p, 931p, 944p, 953p, 959p, 1011p, "-"], [1025p, 1031p, 1044p, 1053p, 1059p, 1111p, "-"], [1125p, 1131p, 1144p, 1153p, 1159p, "-", "-"]]
   -  
     time_points: [Woden Bus Station (Platform 11), Erindale Centre, Proctor / Mead, Deamer / Clift Richardson, Bonython Primary School, Tuggeranong Bus Station]
     long_name: To Tuggeranong Bus Station
@@ -1864,28 +1891,35 @@
     short_name: "200"
     stop_times: [[658a, 706a, 713a, 717a, 725a, 732a, 734a, 741a, 748a], [713a, 721a, 728a, 732a, 740a, 747a, 749a, 756a, 804a], [728a, 736a, 743a, 747a, 755a, 802a, 804a, 811a, 821a], [743a, 751a, 758a, 803a, 812a, 818a, 820a, 827a, 837a], [758a, 806a, 814a, 820a, 829a, 835a, 837a, 844a, 854a], [813a, 821a, 829a, 835a, 844a, 850a, 852a, 859a, 906a], [828a, 836a, 844a, 850a, 859a, 906a, 908a, 915a, 922a], [843a, 851a, 859a, 903a, 911a, 918a, 920a, 927a, 934a], [858a, 906a, 913a, 917a, 925a, 932a, 934a, 941a, 948a], [913a, 921a, 928a, 932a, 940a, 947a, 949a, 956a, 1003a], [928a, 936a, 943a, 947a, 955a, 1002a, 1004a, 1011a, 1018a], [943a, 951a, 958a, 1002a, 1010a, 1017a, 1019a, 1026a, 1033a], [958a, 1006a, 1013a, 1017a, 1025a, 1032a, 1034a, 1041a, 1048a], [1013a, 1021a, 1028a, 1032a, 1040a, 1047a, 1049a, 1056a, 1103a], [1028a, 1036a, 1043a, 1047a, 1055a, 1102a, 1104a, 1111a, 1118a], [1043a, 1051a, 1058a, 1102a, 1110a, 1117a, 1119a, 1126a, 1133a], [1058a, 1106a, 1113a, 1117a, 1125a, 1132a, 1134a, 1141a, 1148a], [1113a, 1121a, 1128a, 1132a, 1140a, 1147a, 1149a, 1156a, 1203p], [1128a, 1136a, 1143a, 1147a, 1155a, 1202p, 1204p, 1211p, 1218p], [1143a, 1151a, 1158a, 1202p, 1210p, 1217p, 1219p, 1226p, 1233p], [1158a, 1206p, 1213p, 1217p, 1225p, 1232p, 1234p, 1241p, 1248p], [1213p, 1221p, 1228p, 1232p, 1240p, 1247p, 1249p, 1256p, 103p], [1228p, 1236p, 1243p, 1247p, 1255p, 102p, 104p, 111p, 118p], [1243p, 1251p, 1258p, 102p, 110p, 117p, 119p, 126p, 133p], [1258p, 106p, 113p, 117p, 125p, 132p, 134p, 141p, 148p], [113p, 121p, 128p, 132p, 140p, 147p, 149p, 156p, 203p], [128p, 136p, 143p, 147p, 155p, 202p, 204p, 211p, 218p], [143p, 151p, 158p, 202p, 210p, 217p, 219p, 226p, 233p], [158p, 206p, 213p, 217p, 225p, 232p, 234p, 241p, 248p], [213p, 221p, 228p, 232p, 240p, 247p, 249p, 256p, 303p], [228p, 236p, 243p, 247p, 255p, 302p, 304p, 311p, 318p], [243p, 251p, 258p, 302p, 310p, 317p, 319p, 326p, 333p], [258p, 306p, 313p, 317p, 325p, 332p, 334p, 341p, 348p], [313p, 321p, 328p, 332p, 340p, 347p, 349p, 356p, 404p], [328p, 336p, 343p, 347p, 355p, 401p, 404p, 411p, 421p], [343p, 351p, 358p, 403p, 415p, 420p, 423p, 430p, 440p], [358p, 408p, 416p, 422p, 434p, 439p, 442p, 449p, 459p], [413p, 423p, 431p, 437p, 449p, 454p, 457p, 504p, 514p], [428p, 438p, 446p, 452p, 504p, 509p, 512p, 519p, 529p], [443p, 453p, 501p, 507p, 519p, 524p, 527p, 534p, 544p], [458p, 508p, 516p, 522p, 534p, 539p, 542p, 549p, 559p], [513p, 523p, 531p, 537p, 549p, 554p, 557p, 604p, 611p], [528p, 538p, 546p, 552p, 603p, 610p, 612p, 619p, 626p], [543p, 553p, 601p, 605p, 613p, 620p, 622p, 629p, 636p], [558p, 606p, 613p, 617p, 625p, 632p, 634p, 641p, 648p], [613p, 621p, 628p, 632p, 640p, 647p, 649p, 656p, 703p], [628p, 636p, 643p, 647p, 655p, 701p, 703p, 709p, 716p], [643p, 651p, 658p, 702p, 710p, 714p, 716p, 722p, 729p]]
   -  
-    time_points: [City Bus Station (Platform 9), National Zoo and Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Bus Station]
-    long_name: To City Bus Station
-    between_stops: {}
-    
-    short_name: "981"
-    stop_times_sunday: [[1020a, 1034a, 1042a, 1048a, 1055a], [1150a, 1204p, 1212p, 1218p, 1225p], [120p, 134p, 142p, 148p, 155p], [250p, 304p, 312p, 318p, 325p], [420p, 434p, 442p, 448p, 455p]]
-  -  
-    time_points: [Tuggeranong Bus Station (Platform 7), Calwell, Chisholm, Erindale / Sternberg Cres, Woden Bus Station (Platform 10), Kings Ave / National Circuit, Russell Offices, City Bus Station (Platform 11), City West]
-    long_name: To City West
-    between_stops: 
-      Russell Offices-City Bus Station (Platform 11): [Wjz4-WZ, Wjz4-WL, Wjz4-Rc, Wjz4-KO, Wjz4_wS, Wjz4_jm, Wjz4T-X, Wjz5MEL, Wjz5MsT, Wjz5MsD, Wjz5Nht]
-      Kings Ave / National Circuit-Russell Offices: [Wjz4Quk, Wjz4RwH, Wjz4RFJ]
-      City Bus Station (Platform 11)-City West: []
-    short_name: 67 267
-    stop_times: [[603a, 615a, 627a, 635a, 644a, "-", "-", "-", "-"], [633a, 645a, 657a, 705a, 716a, "-", "-", "-", "-"], [702a, 715a, 726a, 735a, 750a, 804a, 808a, 818a, 821a], [718a, 730a, 745a, 755a, 809a, "-", "-", "-", "-"], [731a, 746a, 800a, 810a, 825a, 839a, 843a, 853a, 856a], [803a, 817a, 832a, 842a, 856a, "-", "-", "-", "-"], [833a, 847a, 902a, 912a, 926a, "-", "-", "-", "-"], [903a, 917a, 932a, 940a, 953a, "-", "-", "-", "-"], [1003a, 1016a, 1028a, 1036a, 1049a, "-", "-", "-", "-"], [1103a, 1116a, 1128a, 1136a, 1149a, "-", "-", "-", "-"], [1203p, 1216p, 1228p, 1236p, 1249p, "-", "-", "-", "-"], [103p, 116p, 128p, 136p, 149p, "-", "-", "-", "-"], [203p, 216p, 228p, 236p, 249p, "-", "-", "-", "-"], [303p, 317p, 332p, 342p, 356p, "-", "-", "-", "-"], [333p, 347p, 402p, 412p, 426p, "-", "-", "-", "-"], [403p, 417p, 432p, 442p, 456p, "-", "-", "-", "-"], [433p, 447p, 502p, 512p, 526p, "-", "-", "-", "-"], [503p, 517p, 532p, 542p, 556p, "-", "-", "-", "-"], [533p, 547p, 602p, 612p, 626p, "-", "-", "-", "-"], [603p, 617p, 632p, 640p, 653p, "-", "-", "-", "-"], [703p, 716p, 728p, 736p, 749p, "-", "-", "-", "-"], [803p, 816p, 828p, 836p, 849p, "-", "-", "-", "-"], [903p, 916p, 928p, 936p, 949p, "-", "-", "-", "-"], [1003p, 1016p, 1028p, 1036p, 1049p, "-", "-", "-", "-"], [1103p, 1116p, 1128p, 1136p, "-", "-", "-", "-", "-"]]
-  -  
-    time_points: [Woden Bus Station (Platform 16), Weston Primary, Holder, Duffy, Cooleman Court]
-    long_name: To Cooleman Court
-    between_stops: {}
-    
-    stop_times_saturday: [[857a, 907a, 909a, 911a, 919a], [957a, 1007a, 1009a, 1011a, 1019a], [1057a, 1107a, 1109a, 1111a, 1119a], [1157a, 1207p, 1209p, 1211p, 1219p], [1257p, 107p, 109p, 111p, 119p], [157p, 207p, 209p, 211p, 219p], [257p, 307p, 309p, 311p, 319p], [357p, 407p, 409p, 411p, 419p], [457p, 507p, 509p, 511p, 519p], [557p, 607p, 609p, 611p, 619p], [657p, 707p, 709p, 711p, 719p], [757p, 807p, 809p, 811p, 819p], [857p, 907p, 909p, 911p, 919p], [957p, 1007p, 1009p, 1011p, 1019p], [1057p, 1107p, 1109p, 1111p, 1119p]]
-    short_name: "925"
+    time_points: [City Bus Station (Platform 8), Macarthur / Northbourne Ave, Northbourne Avenue / Antill St, Flemington Rd / Sandford St, Hibberson / Kate Crace, Gungahlin Marketplace, Katherine Ave / Horse Park Drive, Paul Coe / Mirrabei Dr, Chuculba / William Slim Dr, Belconnen Community Bus Station, Westfield Bus Station, Cohen Street Bus Station]
+    long_name: To Cohen Street Bus Station
+    between_stops: 
+      Westfield Bus Station-Cohen Street Bus Station: []
+      Macarthur / Northbourne Ave-Northbourne Avenue / Antill St: [Wjz5RkN, Wjz5Rsi, Wjz5RvC, Wjz5Sqk, Wjz5SrO, Wjz5Sux, Wjz5SDc]
+      City Bus Station (Platform 8)-Macarthur / Northbourne Ave: [Wjz5O3Q, Wjz5Oci, Wjz5P8n, Wjz5P8K, Wjz5PdJ, Wjz5Pl0, Wjz5Qi2, Wjz5Qgn, Wjz5Qmu, Wjz5QmR]
+      Belconnen Community Bus Station-Westfield Bus Station: []
+      Chuculba / William Slim Dr-Belconnen Community Bus Station: [Wjz6mip, Wjz69vO, Wjz69uI, Wjz69ht, Wjz69gA]
+    short_name: "59"
+    stop_times: [["-", "-", "-", "-", 645a, 648a, 703a, 709a, 718a, 734a, 736a, 741a], ["-", "-", "-", "-", 710a, 713a, 728a, 734a, 743a, 800a, 802a, 807a], ["-", "-", "-", "-", 730a, 733a, 748a, 754a, 803a, 820a, 822a, 827a], ["-", "-", "-", "-", 755a, 758a, 813a, 819a, 828a, 845a, 847a, 852a], ["-", "-", "-", "-", 815a, 818a, 833a, 839a, 848a, 905a, 907a, 912a], ["-", "-", "-", "-", 907a, 910a, 925a, 931a, 940a, 956a, 958a, 1003a], ["-", "-", "-", "-", 1007a, 1010a, 1025a, 1031a, 1040a, 1056a, 1058a, 1103a], ["-", "-", "-", "-", 1107a, 1110a, 1125a, 1131a, 1140a, 1156a, 1158a, 1203p], ["-", "-", "-", "-", 1207p, 1210p, 1225p, 1231p, 1240p, 1256p, 1258p, 103p], ["-", "-", "-", "-", 107p, 110p, 125p, 131p, 140p, 156p, 158p, 203p], ["-", "-", "-", "-", 207p, 210p, 225p, 231p, 240p, 256p, 258p, 303p], ["-", "-", "-", "-", 307p, 310p, 325p, 331p, 340p, 356p, 358p, 403p], [328p, 334p, 336p, 344p, 347p, 350p, 405p, 411p, 421p, 438p, 440p, 445p], [337p, 343p, 345p, 353p, 356p, 359p, 414p, 420p, 430p, 447p, 449p, 454p], [351p, 357p, 359p, 408p, 413p, 416p, 431p, 437p, 447p, 504p, 506p, 511p], [409p, 416p, 418p, 427p, 432p, 435p, 450p, 456p, 506p, 523p, 525p, 530p], [423p, 430p, 432p, 441p, 446p, 449p, 504p, 510p, 520p, 537p, 539p, 544p], [437p, 444p, 446p, 455p, 500p, 503p, 518p, 524p, 534p, 551p, 553p, 558p], [453p, 500p, 502p, 511p, 516p, 519p, 534p, 540p, 550p, 607p, 609p, 614p], [507p, 514p, 516p, 525p, 530p, 533p, 548p, 554p, 604p, 620p, 622p, 627p], [524p, 531p, 533p, 542p, 547p, 550p, 605p, 611p, 620p, 636p, 638p, 643p], [544p, 551p, 553p, 602p, 605p, 608p, 623p, 629p, 638p, 654p, 656p, 701p], [557p, 603p, 605p, 612p, 615p, 618p, 633p, 639p, 648p, 704p, 706p, 711p], ["-", "-", "-", "-", 707p, 710p, 725p, 731p, 740p, 756p, 758p, 803p], ["-", "-", "-", "-", 807p, 810p, 825p, 831p, 840p, 856p, 858p, 903p], ["-", "-", "-", "-", 907p, 910p, 925p, 931p, 940p, 956p, 958p, 1003p], ["-", "-", "-", "-", 1007p, 1010p, 1025p, 1031p, 1040p, 1056p, 1058p, 1103p], ["-", "-", "-", "-", 1107p, 1110p, 1125p, 1131p, 1140p, 1156p, 1158p, 1203a]]
+  -  
+    time_points: [Tuggeranong Bus Station (Platform 8), Woden Bus Station (Platform 9), City Bus Station (Platform 3), Belconnen Community Bus Station (Platform 4), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 6), McKellar, Copland College, Evatt, Spence Terminus]
+    long_name: To Spence Terminus
+    between_stops: 
+      Belconnen Community Bus Station (Platform 4)-Westfield Bus Station (Platform 2): []
+      Tuggeranong Bus Station (Platform 8)-Woden Bus Station (Platform 9): [Wjz213q, Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz2nLE, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
+      Westfield Bus Station (Platform 2)-Cohen Street Bus Station (Platform 6): []
+      City Bus Station (Platform 3)-Belconnen Community Bus Station (Platform 4): [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W3, Wjz68W5, Wjz689c, Wjz681S]
+      Woden Bus Station (Platform 9)-City Bus Station (Platform 3): [Wjz3m3b, Wjz3m3b, Wjz3eRR, Wjz3eZ4, Wjz4KNu, Wjz4KO9, Wjz5Nht]
+    short_name: 12 312
+    stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 746a, 753a], ["-", "-", "-", 805a, 807a, 811a, 819a, 823a, 828a, 835a], [726a, 745a, 803a, 824a, 826a, 830a, 838a, 842a, 847a, 854a], [826a, 845a, 903a, 924a, 926a, 930a, 937a, 941a, 945a, 952a], [901a, 920a, 937a, 957a, 959a, 1003a, 1010a, 1014a, 1018a, 1025a], [931a, 949a, 1005a, 1025a, 1027a, 1031a, 1038a, 1042a, 1046a, 1053a], [1001a, 1019a, 1035a, 1055a, 1057a, 1101a, 1108a, 1112a, 1116a, 1123a], [1031a, 1049a, 1105a, 1125a, 1127a, 1131a, 1138a, 1142a, 1146a, 1153a], [1101a, 1119a, 1135a, 1155a, 1157a, 1201p, 1208p, 1212p, 1216p, 1223p], [1131a, 1149a, 1205p, 1225p, 1227p, 1231p, 1238p, 1242p, 1246p, 1253p], [1201p, 1219p, 1235p, 1255p, 1257p, 101p, 108p, 112p, 116p, 123p], [1231p, 1249p, 105p, 125p, 127p, 131p, 138p, 142p, 146p, 153p], [101p, 119p, 135p, 155p, 157p, 201p, 208p, 212p, 216p, 223p], [131p, 149p, 205p, 225p, 227p, 231p, 238p, 242p, 246p, 253p], [201p, 219p, 235p, 255p, 257p, 301p, 309p, 313p, 318p, 325p], [231p, 249p, 305p, 326p, 328p, 332p, 340p, 344p, 349p, 356p], [259p, 318p, 336p, 357p, 359p, 403p, 411p, 415p, 420p, 427p], [331p, 350p, 408p, 429p, 431p, 435p, 443p, 447p, 452p, 459p], [356p, 415p, 433p, 454p, 456p, 500p, 508p, 512p, 517p, 524p], [416p, 435p, 453p, 514p, 516p, 520p, 528p, 532p, 537p, 544p], [436p, 455p, 513p, 534p, 536p, 540p, 548p, 552p, 557p, 604p], [456p, 515p, 533p, 554p, 556p, 600p, 608p, 612p, 617p, 624p], [516p, 535p, 553p, 614p, 616p, 620p, 628p, 632p, 636p, 643p], [536p, 555p, 613p, 634p, 636p, 640p, 647p, 651p, 655p, 702p], [636p, 653p, 708p, 728p, 730p, 734p, 741p, 745p, 749p, 756p], ["-", "-", "-", 834p, 836p, 840p, 847p, 851p, 855p, 902p], ["-", "-", "-", 934p, 936p, 940p, 947p, 951p, 955p, 1002p], ["-", "-", "-", 1034p, 1036p, 1040p, 1047p, 1051p, 1055p, 1102p], ["-", "-", "-", 1134p, 1136p, 1140p, 1147p, 1151p, 1155p, 1202a]]
+  -  
+    time_points: [City Bus Station (Platform 7), Kings Ave / National Circuit, Manuka, Red Hill, Narrabundah Terminus, Red Hill, Manuka, Kings Ave / National Circuit, City Bus Station]
+    long_name: To City Bus Station
+    between_stops: 
+      City Bus Station (Platform 7)-Kings Ave / National Circuit: [Wjz5FOn, Wjz4S1U, Wjz4Rs-, Wjz4RFJ, Wjz4RwH, Wjz4Quk]
+      Kings Ave / National Circuit-City Bus Station: [Wjz4Quk, Wjz4RwH, Wjz4RFJ, Wjz4Rs-, Wjz4S1U, Wjz5FOn]
+    short_name: "935"
+    stop_times_sunday: [["-", "-", "-", "-", 824a, 833a, 839a, 843a, 852a], [856a, 903a, 907a, 914a, 924a, 933a, 939a, 943a, 952a], [956a, 1003a, 1007a, 1014a, 1024a, 1033a, 1039a, 1043a, 1052a], [1056a, 1103a, 1107a, 1114a, 1124a, 1133a, 1139a, 1143a, 1152a], [1156a, 1203p, 1207p, 1214p, 1224p, 1233p, 1239p, 1243p, 1252p], [1256p, 103p, 107p, 114p, 124p, 133p, 139p, 143p, 152p], [156p, 203p, 207p, 214p, 224p, 233p, 239p, 243p, 252p], [256p, 303p, 307p, 314p, 324p, 333p, 339p, 343p, 352p], [356p, 403p, 407p, 414p, 424p, 433p, 439p, 443p, 452p], [456p, 503p, 507p, 514p, 524p, 533p, 539p, 543p, 552p], [556p, 603p, 607p, 614p, 624p, 633p, 639p, 643p, 652p], [656p, 703p, 707p, 714p, 724p, 733p, 739p, 743p, 752p]]
   -  
     time_points: [Gungahlin Marketplace, Nicholls Primary, Federation Square, Chuculba / William Slim Dr, Belconnen Community Bus Station, Westfield Bus Station, Cohen Street Bus Station]
     long_name: To Cohen Street Bus Station
@@ -1895,13 +1929,6 @@
       Chuculba / William Slim Dr-Belconnen Community Bus Station: [Wjz6mip, Wjz69vO, Wjz69uI, Wjz69ht, Wjz69gA]
     stop_times_saturday: [[0839a, 0847a, 0900a, 0905a, 0918a, 0920a, 0925a], [0939a, 0947a, 1000a, 1005a, 1018a, 1020a, 1025a], [1039a, 1047a, 1100a, 1105a, 1118a, 1120a, 1125a], [1139a, 1147a, 1200p, 1205p, 1218p, 1220p, 1225p], [1239p, 1247p, 0100p, 0105p, 0118p, 0120p, 0125p], [0139p, 0147p, 0200p, 0205p, 0218p, 0220p, 0225p], [0239p, 0247p, 0300p, 0305p, 0318p, 0320p, 0325p], [0339p, 0347p, 0400p, 0405p, 0418p, 0420p, 0425p], [0439p, 0447p, 0500p, 0505p, 0518p, 0520p, 0525p], [0539p, 0547p, 0600p, 0605p, 0618p, 0620p, 0625p], [0639p, 0647p, 0700p, 0705p, 0718p, 0720p, 0725p]]
     short_name: "952"
-  -  
-    time_points: [Tuggeranong Bus Station (Platform 4), Isabella, Calwell, Theodore, Outtrim / Duggan, Tuggeranong Bus Station]
-    long_name: To Tuggeranong Bus Station
-    between_stops: {}
-    
-    stop_times_saturday: [[815a, 825a, 830a, 839a, 846a, 855a], [1015a, 1025a, 1030a, 1039a, 1046a, 1055a], [1215p, 1225p, 1230p, 1239p, 1246p, 1255p], [215p, 225p, 230p, 239p, 246p, 255p], [415p, 425p, 430p, 439p, 446p, 455p], [615p, 625p, 630p, 639p, 646p, 655p], [818p, 828p, 833p, 842p, 849p, 858p], [1018p, 1028p, 1033p, 1042p, 1049p, 1058p]]
-    short_name: "912"
   -  
     time_points: [Cohen Street Bus Station (Platform 1), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 3), Calvary Hospital, Jamison Centre, Cook, Hawker, Page, Florey, Cohen Street Bus Station, Westfield Bus Station, Belconnen Community Bus Station]
     long_name: To Belconnen Community Bus Station
@@ -1913,12 +1940,14 @@
     short_name: "74"
     stop_times: [[950a, 952a, 956a, 1005a, 1012a, 1015a, 1023a, 1027a, 1033a, 1039a, 1041a, 1045a], [1120a, 1122a, 1126a, 1135a, 1142a, 1145a, 1153a, 1157a, 1203p, 1209p, 1211p, 1215p], [1250p, 1252p, 1256p, 105p, 112p, 115p, 123p, 127p, 133p, 139p, 141p, 145p], [220p, 222p, 226p, 235p, 242p, 245p, 253p, 257p, 303p, 309p, 311p, 315p]]
   -  
-    time_points: [Alexander Maconochie Centre, Woden Bus Station]
-    long_name: To Woden Bus Station
-    between_stops: 
-      Alexander Maconochie Centre-Woden Bus Station: [Wjz3kAx, Wjz3dXS]
-    stop_times_saturday: [[1130a, 1150a], [320p, 340p], [730p, 750p]]
-    short_name: "988"
+    time_points: [City West, City Bus Station (Platform 1), Woden Bus Station (Platform 11), Athllon / Sulwood Kambah, Kambah / Livingston St, Taverner St / Erindale Dr, Tuggeranong Bus Station]
+    long_name: To Tuggeranong Bus Station
+    between_stops: 
+      Woden Bus Station (Platform 11)-Athllon / Sulwood Kambah: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK]
+      City Bus Station (Platform 1)-Woden Bus Station (Platform 11): [Wjz5Nht, Wjz4KO9, Wjz4KNu, Wjz3eZ4, Wjz3eRR, Wjz3m3b, Wjz3m3b]
+      City West-City Bus Station (Platform 1): []
+    short_name: 61 161
+    stop_times: [["-", "-", 642a, 649a, 654a, 659a, 710a], ["-", "-", 712a, 719a, 724a, 729a, 743a], ["-", "-", 742a, 751a, 756a, 801a, 815a], ["-", "-", 812a, 821a, 826a, 831a, 845a], ["-", "-", 842a, 859a, 905a, 909a, 920a], ["-", "-", 912a, 921a, 926a, 931a, 944a], ["-", "-", 1012a, 1020a, 1025a, 1030a, 1043a], ["-", "-", 1112a, 1120a, 1125a, 1130a, 1143a], ["-", "-", 1212p, 1220p, 1225p, 1230p, 1243p], ["-", "-", 112p, 120p, 125p, 130p, 143p], ["-", "-", 212p, 220p, 225p, 230p, 243p], ["-", "-", 320p, 329p, 334p, 339p, 353p], ["-", "-", 342p, 351p, 356p, 401p, 415p], ["-", "-", 412p, 421p, 426p, 431p, 445p], ["-", "-", 442p, 451p, 456p, 501p, 515p], ["-", "-", 512p, 521p, 526p, 531p, 545p], [520p, 526p, 542p, 551p, 556p, 601p, 615p], ["-", "-", 612p, 621p, 626p, 631p, 644p], ["-", "-", 712p, 720p, 725p, 730p, 743p], ["-", "-", 810p, 818p, 823p, 828p, 841p], ["-", "-", 910p, 918p, 923p, 928p, 941p], ["-", "-", 1010p, 1018p, 1023p, 1028p, 1041p], ["-"