Added service periods to route names
[bus.git] / maxious-canberra-transit-feed / cbrtable.yml
blob:a/maxious-canberra-transit-feed/cbrtable.yml -> blob:b/maxious-canberra-transit-feed/cbrtable.yml
--- a/maxious-canberra-transit-feed/cbrtable.yml
+++ b/maxious-canberra-transit-feed/cbrtable.yml
@@ -11,12 +11,10 @@
   - { name: ACTEW AGL House,stop_code: ACTEW AGL House, lat: -35.282374, lng: 149.132047}
   - { name: ADFA,stop_code: ADFA, lat: -35.2937972, lng: 149.1643403}
   - { name: Ainslie,stop_code: Ainslie, lat: -35.2620105, lng: 149.1443302}
-  - { name: Ainslie Shops,stop_code: Ainslie Shops, lat: -35.26198, lng: 149.14535}
   - { name: Alexander Maconochie Centre,stop_code: Alexander Maconochie Centre, lat: -35.3720651, lng: 149.1696618}
   - { name: Alpen & Clifford St,stop_code: Alpen & Clifford St, lat: -35.20562, lng: 149.06259}
   - { name: Anthony Rolfe Av / Moonlight Av,stop_code: Anthony Rolfe Av / Moonlight Av, lat: -35.1856021, lng: 149.1543639}
   - { name: Aranda,stop_code: Aranda, lat: -35.257534, lng: 149.0762963}
-  - { name: Aranda Shops,stop_code: Aranda Shops, lat: -35.25753, lng: 149.0763}
   - { name: Athllon / Sulwood Kambah,stop_code: Athllon / Sulwood Kambah, lat: -35.38442, lng: 149.09328}
   - { name: Australian Institute of Sport,stop_code: Australian Institute of Sport, lat: -35.246351, lng: 149.101478}
   - { name: Belconnen Community Bus Station,stop_code: Belconnen Community Bus Station, lat: -35.23987, lng: 149.0619}
@@ -37,7 +35,7 @@
   - { name: Bugden Sternberg,stop_code: Bugden Sternberg, lat: -35.4017223, lng: 149.0992172}
   - { name: Burton and Garran Hall Daley Road,stop_code: Burton and Garran Hall Daley Road, lat: -35.2753671, lng: 149.1172822}
   - { name: Calvary Hospital,stop_code: Calvary Hospital, lat: -35.25212, lng: 149.09088}
-  - { name: Calwell Shops,stop_code: Calwell Shops, lat: -35.43524, lng: 149.113942}
+  - { name: Calwell,stop_code: Calwell, lat: -35.43524, lng: 149.113942}
   - { name: Cameron Ave Bus Station,stop_code: Cameron Ave Bus Station, lat: -35.2410195, lng: 149.0722506}
   - { name: Cameron Ave Bus Station (Platform 1),stop_code: Cameron Ave Bus Station (Platform 1), lat: -35.2410195, lng: 149.0722506}
   - { name: Cameron Ave Bus Station (Platform 2),stop_code: Cameron Ave Bus Station (Platform 2), lat: -35.2410108, lng: 149.0717142}
@@ -52,13 +50,10 @@
   - { name: Causeway,stop_code: Causeway, lat: -35.31615, lng: 149.15058}
   - { name: Centrelink Tuggeranong,stop_code: Centrelink Tuggeranong, lat: -35.4207496, lng: 149.0700973}
   - { name: Chapman,stop_code: Chapman, lat: -35.3557877, lng: 149.0408111}
-  - { name: Chapman Shops,stop_code: Chapman Shops, lat: -35.35579, lng: 149.04082}
   - { name: Charnwood,stop_code: Charnwood, lat: -35.2052138, lng: 149.0337266}
-  - { name: Charnwood Shops,stop_code: Charnwood Shops, lat: -35.20472, lng: 149.03336}
   - { name: Charnwood Tillyard Dr,stop_code: Charnwood Tillyard Dr, lat: -35.20295, lng: 149.04027}
   - { name: Chifley,stop_code: Chifley, lat: -35.350985, lng: 149.077319}
-  - { name: Chifley Shops,stop_code: Chifley Shops, lat: -35.35099, lng: 149.07732}
-  - { name: Chisholm Shops,stop_code: Chisholm Shops, lat: -35.41341, lng: 149.12833}
+  - { name: Chisholm,stop_code: Chisholm, lat: -35.41341, lng: 149.12833}
   - { name: Chuculba / William Slim Dr,stop_code: Chuculba / William Slim Dr, lat: -35.208931, lng: 149.088499}
   - { name: CIT Weston,stop_code: CIT Weston, lat: -35.330234, lng: 149.058632}
   - { name: City Bus Station,stop_code: City Bus Station, lat: -35.2794346, lng: 149.1305879}
@@ -84,19 +79,14 @@
   - { name: Cohen Street Bus Station (Platform 6),stop_code: Cohen Street Bus Station (Platform 6), lat: -35.2400028, lng: 149.060315}
   - { name: Conder Primary,stop_code: Conder Primary, lat: -35.4643475, lng: 149.0986908}
   - { name: Cook,stop_code: Cook, lat: -35.2596, lng: 149.0638}
-  - { name: Cook Shops,stop_code: Cook Shops, lat: -35.25898, lng: 149.06343}
   - { name: Cooleman Court,stop_code: Cooleman Court, lat: -35.34147, lng: 149.05338}
   - { name: Copland College,stop_code: Copland College, lat: -35.2127018, lng: 149.0596387}
   - { name: Curtin,stop_code: Curtin, lat: -35.3248779, lng: 149.081441}
-  - { name: Curtin Shops,stop_code: Curtin Shops, lat: -35.32515, lng: 149.08224}
   - { name: Deakin,stop_code: Deakin, lat: -35.3158608, lng: 149.1084563}
-  - { name: Deakin Shops,stop_code: Deakin Shops, lat: -35.31473, lng: 149.10771}
   - { name: Deamer / Clift Richardson,stop_code: Deamer / Clift Richardson, lat: -35.4319597, lng: 149.1187876}
-  - { name: Dickson,stop_code: Dickson, lat: -35.2498434, lng: 149.1391218}
+  - { name: Dickson / Antill St,stop_code: Dickson / Antill St, lat: -35.2489, lng: 149.14012}
   - { name: Dickson College,stop_code: Dickson College, lat: -35.24923, lng: 149.15315}
-  - { name: Dickson Cowper St,stop_code: Dickson Cowper St, lat: -35.250297, lng: 149.141336}
-  - { name: Dickson Shops,stop_code: Dickson Shops, lat: -35.25045, lng: 149.14044}
-  - { name: Dickson Shops/Antill St,stop_code: Dickson Shops/Antill St, lat: -35.2251335, lng: 149.1658895}
+  - { name: Dickson / Cowper St,stop_code: Dickson / Cowper St, lat: -35.250297, lng: 149.141336}
   - { name: Duffy,stop_code: Duffy, lat: -35.3366908, lng: 149.0324311}
   - { name: Duffy Primary,stop_code: Duffy Primary, lat: -35.334219, lng: 149.033656}
   - { name: Dunlop,stop_code: Dunlop, lat: -35.1942693, lng: 149.0206702}
@@ -104,59 +94,47 @@
   - { name: Erindale Dr / Charleston St Monash,stop_code: Erindale Dr / Charleston St Monash, lat: -35.414616, lng: 149.07888}
   - { name: Erindale / Sternberg Cres,stop_code: Erindale / Sternberg Cres, lat: -35.4014472, lng: 149.0956545}
   - { name: Evatt,stop_code: Evatt, lat: -35.2091093, lng: 149.0735343}
-  - { name: Evatt Shops,stop_code: Evatt Shops, lat: -35.21203, lng: 149.06505}
   - { name: Eye Hospital,stop_code: Eye Hospital, lat: -35.3341884, lng: 149.1656213}
   - { name: Fairbairn Park,stop_code: Fairbairn Park, lat: -35.3001773, lng: 149.2041185}
   - { name: Farrer Primary School,stop_code: Farrer Primary School, lat: -35.37887, lng: 149.10641}
   - { name: Farrer Terminus,stop_code: Farrer Terminus, lat: -35.3771794, lng: 149.1046948}
   - { name: Federation Square,stop_code: Federation Square, lat: -35.1908726, lng: 149.0848153}
   - { name: Fisher,stop_code: Fisher, lat: -35.3605627, lng: 149.0576481}
-  - { name: Fisher Shops,stop_code: Fisher Shops, lat: -35.36056, lng: 149.05765}
   - { name: Flemington Rd,stop_code: Flemington Rd, lat: -35.20756, lng: 149.14778}
   - { name: Flemington Rd / Nullabor Ave,stop_code: Flemington Rd / Nullabor Ave, lat: -35.2008585, lng: 149.1493407}
   - { name: Flemington Rd / Sandford St,stop_code: Flemington Rd / Sandford St, lat: -35.221231, lng: 149.144645}
-  - { name: Florey Shops,stop_code: Florey Shops, lat: -35.2258544, lng: 149.0546214}
+  - { name: Florey,stop_code: Florey, lat: -35.2258544, lng: 149.0546214}
   - { name: Flynn,stop_code: Flynn, lat: -35.2019283, lng: 149.0478356}
   - { name: Fraser,stop_code: Fraser, lat: -35.1896539, lng: 149.0435012}
   - { name: Fraser East Terminus,stop_code: Fraser East Terminus, lat: -35.1896539, lng: 149.0435012}
-  - { name: Fraser Shops,stop_code: Fraser Shops, lat: -35.18966, lng: 149.0435}
   - { name: Fraser West Terminus,stop_code: Fraser West Terminus, lat: -35.191513, lng: 149.038006}
   - { name: Fyshwick Direct Factory Outlet,stop_code: Fyshwick Direct Factory Outlet, lat: -35.3359862, lng: 149.1796322}
   - { name: Fyshwick Terminus,stop_code: Fyshwick Terminus, lat: -35.3285202, lng: 149.1785592}
   - { name: Garran,stop_code: Garran, lat: -35.3423286, lng: 149.10811}
-  - { name: Garran Shops,stop_code: Garran Shops, lat: -35.34236, lng: 149.1082}
   - { name: Geoscience Australia,stop_code: Geoscience Australia, lat: -35.3429702, lng: 149.1583893}
   - { name: Giralang,stop_code: Giralang, lat: -35.2115608, lng: 149.0960692}
-  - { name: Giralang Shops,stop_code: Giralang Shops, lat: -35.2115608, lng: 149.0960692}
   - { name: Gordon Primary,stop_code: Gordon Primary, lat: -35.455517, lng: 149.086978}
   - { name: Gowrie,stop_code: Gowrie, lat: -35.4120264, lng: 149.1110804}
-  - { name: Gowrie Shops,stop_code: Gowrie Shops, lat: -35.4120264, lng: 149.1110804}
   - { name: Gungahlin Marketplace,stop_code: Gungahlin Marketplace, lat: -35.1769532, lng: 149.1319017}
   - { name: Gwydir Square Kaleen,stop_code: Gwydir Square Kaleen, lat: -35.2338677, lng: 149.1031998}
   - { name: Hackett,stop_code: Hackett, lat: -35.2481617, lng: 149.1626094}
-  - { name: Hackett Shops,stop_code: Hackett Shops, lat: -35.24825, lng: 149.16271}
   - { name: Hawker,stop_code: Hawker, lat: -35.2437386, lng: 149.0432804}
   - { name: Hawker College,stop_code: Hawker College, lat: -35.2454598, lng: 149.0324251}
-  - { name: Hawker Shops,stop_code: Hawker Shops, lat: -35.24398, lng: 149.04361}
   - { name: Heagney / Clift Richardson,stop_code: Heagney / Clift Richardson, lat: -35.4251299, lng: 149.11375}
   - { name: Hibberson / Kate Crace,stop_code: Hibberson / Kate Crace, lat: -35.1861642, lng: 149.1391756}
   - { name: Higgins,stop_code: Higgins, lat: -35.2313901, lng: 149.0271811}
-  - { name: Higgins Shops,stop_code: Higgins Shops, lat: -35.23136, lng: 149.02611}
   - { name: Holder,stop_code: Holder, lat: -35.3378123, lng: 149.0449433}
-  - { name: Holder Shops,stop_code: Holder Shops, lat: -35.33781, lng: 149.04494}
   - { name: Holt,stop_code: Holt, lat: -35.223099, lng: 149.0126269}
-  - { name: Holt Shops,stop_code: Holt Shops, lat: -35.2231, lng: 149.01263}
   - { name: Hoskins Street / Oodgeroo Ave,stop_code: Hoskins Street / Oodgeroo Ave, lat: -35.201095, lng: 149.139941}
   - { name: Hospice / Menindee Dr,stop_code: Hospice / Menindee Dr, lat: -35.303557, lng: 149.151627}
   - { name: Hughes,stop_code: Hughes, lat: -35.3339223, lng: 149.093854}
-  - { name: Hughes Shops,stop_code: Hughes Shops, lat: -35.3335, lng: 149.09392}
   - { name: Isaacs,stop_code: Isaacs, lat: -35.3669823, lng: 149.1119217}
-  - { name: Isaacs Shops,stop_code: Isaacs Shops, lat: -35.36698, lng: 149.11192}
-  - { name: Isabella Shops,stop_code: Isabella Shops, lat: -35.4285703, lng: 149.0916837}
+  - { name: Isabella,stop_code: Isabella, lat: -35.4285703, lng: 149.0916837}
   - { name: Jamison Centre,stop_code: Jamison Centre, lat: -35.2527268, lng: 149.0713712}
   - { name: John James Hospital,stop_code: John James Hospital, lat: -35.3200295, lng: 149.0955996}
   - { name: Kaleen Village / Marybrynong,stop_code: Kaleen Village / Marybrynong, lat: -35.2274031, lng: 149.1075421}
   - { name: Kambah High,stop_code: Kambah High, lat: -35.3847749, lng: 149.0720245}
+  - { name: Kambah / Livingston St,stop_code: Kambah / Livingston St, lat: -35.3883359, lng: 149.0811471}
   - { name: Kambah Village,stop_code: Kambah Village, lat: -35.3800314, lng: 149.0576581}
   - { name: Katherine Ave / Horse Park Drive,stop_code: Katherine Ave / Horse Park Drive, lat: -35.1680901, lng: 149.1321801}
   - { name: Kerrigan / Lhotsky,stop_code: Kerrigan / Lhotsky, lat: -35.193801, lng: 149.035689}
@@ -166,8 +144,8 @@
   - { name: Kippax Centre,stop_code: Kippax Centre, lat: -35.22172, lng: 149.01995}
   - { name: Kosciuszko / Everard,stop_code: Kosciuszko / Everard, lat: -35.188901, lng: 149.1216937}
   - { name: Lanyon Market Place,stop_code: Lanyon Market Place, lat: -35.4573, lng: 149.09199}
+  - { name: Latham,stop_code: Latham, lat: -35.21848, lng: 149.03214}
   - { name: Latham Post Office,stop_code: Latham Post Office, lat: -35.21906, lng: 149.03223}
-  - { name: Latham Shops,stop_code: Latham Shops, lat: -35.21848, lng: 149.03214}
   - { name: Lathlain St Bus Station,stop_code: Lathlain St Bus Station, lat: -35.2396657, lng: 149.0633993}
   - { name: Lathlain St Bus Station (Platform 1),stop_code: Lathlain St Bus Station (Platform 1), lat: -35.2408973, lng: 149.0639887}
   - { name: Lathlain St Bus Station (Platform 2),stop_code: Lathlain St Bus Station (Platform 2), lat: -35.2406038, lng: 149.0638922}
@@ -177,17 +155,13 @@
   - { name: Lathlain St Bus Station (Platform 6),stop_code: Lathlain St Bus Station (Platform 6), lat: -35.2410486, lng: 149.0638326}
   - { name: Lewis Luxton/Woodcock Dr,stop_code: Lewis Luxton/Woodcock Dr, lat: -35.4422566, lng: 149.0854375}
   - { name: Lithgow St Terminus Fyshwick,stop_code: Lithgow St Terminus Fyshwick, lat: -35.3296912, lng: 149.1668153}
-  - { name: Livingston Shops Kambah,stop_code: Livingston Shops Kambah, lat: -35.3883359, lng: 149.0811471}
-  - { name: Livingston Shops / Kambah,stop_code: Livingston Shops / Kambah, lat: -35.390246, lng: 149.07822}
   - { name: Lyneham,stop_code: Lyneham, lat: -35.2523304, lng: 149.1246184}
   - { name: Lyneham High,stop_code: Lyneham High, lat: -35.2524016, lng: 149.130254}
-  - { name: Lyneham Shops Wattle Street,stop_code: Lyneham Shops Wattle Street, lat: -35.25205, lng: 149.12524}
+  - { name: Lyneham / Wattle St,stop_code: Lyneham / Wattle St, lat: -35.25205, lng: 149.12524}
   - { name: Lyons,stop_code: Lyons, lat: -35.3415779, lng: 149.0765703}
-  - { name: Lyons Shops,stop_code: Lyons Shops, lat: -35.34019, lng: 149.0771}
   - { name: Macarthur / Miller O'Connor,stop_code: Macarthur / Miller O'Connor, lat: -35.2587584, lng: 149.1153561}
   - { name: Macarthur / Northbourne Ave,stop_code: Macarthur / Northbourne Ave, lat: -35.26051, lng: 149.13224}
   - { name: Macgregor,stop_code: Macgregor, lat: -35.2100645, lng: 149.0122952}
-  - { name: Macgregor Shops,stop_code: Macgregor Shops, lat: -35.2100645, lng: 149.0122952}
   - { name: MacKillop College Isabella Campus,stop_code: MacKillop College Isabella Campus, lat: -35.42597, lng: 149.09172}
   - { name: MacKillop College Wanniassa Campus,stop_code: MacKillop College Wanniassa Campus, lat: -35.4056, lng: 149.089774}
   - { name: Macquarie,stop_code: Macquarie, lat: -35.2483414, lng: 149.0600666}
@@ -196,9 +170,7 @@
   - { name: Manuka,stop_code: Manuka, lat: -35.3200096, lng: 149.1341344}
   - { name: Manuka / Captain Cook Cres,stop_code: Manuka / Captain Cook Cres, lat: -35.3217, lng: 149.13445}
   - { name: McKellar,stop_code: McKellar, lat: -35.2174267, lng: 149.0742108}
-  - { name: McKellar Shops,stop_code: McKellar Shops, lat: -35.2182, lng: 149.07555}
   - { name: Melba,stop_code: Melba, lat: -35.2083104, lng: 149.0485366}
-  - { name: Melba Shops,stop_code: Melba Shops, lat: -35.21004, lng: 149.05302}
   - { name: Mentone View / Tharwa Drive,stop_code: Mentone View / Tharwa Drive, lat: -35.45144, lng: 149.0919}
   - { name: Merici College,stop_code: Merici College, lat: -35.266525, lng: 149.137037}
   - { name: Mirrabei Drive / Dam Wall,stop_code: Mirrabei Drive / Dam Wall, lat: -35.177453, lng: 149.124291}
@@ -219,32 +191,26 @@
   - { name: Northbourne Avenue / Antill St,stop_code: Northbourne Avenue / Antill St, lat: -35.248287, lng: 149.134241}
   - { name: North Lyneham,stop_code: North Lyneham, lat: -35.2385618, lng: 149.1221188}
   - { name: O'Connor,stop_code: O'Connor, lat: -35.2640376, lng: 149.1226107}
-  - { name: O'Connor Shops,stop_code: O'Connor Shops, lat: -35.2640376, lng: 149.1226107}
   - { name: Olims Hotel,stop_code: Olims Hotel, lat: -35.27597, lng: 149.1428}
   - { name: Outtrim / Duggan,stop_code: Outtrim / Duggan, lat: -35.435871, lng: 149.097692}
-  - { name: Page Shops,stop_code: Page Shops, lat: -35.2360695, lng: 149.0536554}
+  - { name: Page,stop_code: Page, lat: -35.2360695, lng: 149.0536554}
   - { name: Parliament House,stop_code: Parliament House, lat: -35.3081571, lng: 149.1244592}
   - { name: Paul Coe / Mirrabei Dr,stop_code: Paul Coe / Mirrabei Dr, lat: -35.17467, lng: 149.12005}
   - { name: Pearce,stop_code: Pearce, lat: -35.3625413, lng: 149.0815935}
-  - { name: Pearce Shops,stop_code: Pearce Shops, lat: -35.3625413, lng: 149.0815935}
   - { name: Police College Weston,stop_code: Police College Weston, lat: -35.33018, lng: 149.05458}
   - { name: Proctor / Mead,stop_code: Proctor / Mead, lat: -35.415305, lng: 149.127204}
   - { name: Railway Station Kingston,stop_code: Railway Station Kingston, lat: -35.319602, lng: 149.149083}
   - { name: Red Hill,stop_code: Red Hill, lat: -35.336505, lng: 149.131645}
-  - { name: Red Hill Shops,stop_code: Red Hill Shops, lat: -35.336505, lng: 149.131645}
   - { name: Rivett,stop_code: Rivett, lat: -35.3473758, lng: 149.0365438}
-  - { name: Rivett Shops,stop_code: Rivett Shops, lat: -35.34737, lng: 149.03654}
   - { name: Russell Offices,stop_code: Russell Offices, lat: -35.2973294, lng: 149.1508803}
   - { name: Sainsbury Street,stop_code: Sainsbury Street, lat: -35.3885, lng: 149.09643}
   - { name: Saint Andrews Village Hughes,stop_code: Saint Andrews Village Hughes, lat: -35.328097, lng: 149.088685}
-  - { name: Scullin Shops,stop_code: Scullin Shops, lat: -35.23356, lng: 149.04056}
+  - { name: Scullin,stop_code: Scullin, lat: -35.23356, lng: 149.04056}
   - { name: Shoalhaven / Katherine Ave,stop_code: Shoalhaven / Katherine Ave, lat: -35.16823, lng: 149.12791}
   - { name: Southlands Mawson,stop_code: Southlands Mawson, lat: -35.3650685, lng: 149.0945962}
   - { name: Southwell Park,stop_code: Southwell Park, lat: -35.24573, lng: 149.1321}
   - { name: Spence,stop_code: Spence, lat: -35.194735, lng: 149.062352}
-  - { name: Spence Shops,stop_code: Spence Shops, lat: -35.19968, lng: 149.06763}
   - { name: Spence Terminus,stop_code: Spence Terminus, lat: -35.199684, lng: 149.0676196}
-  - { name: St Clare of Assisi,stop_code: St Clare of Assisi, lat: -35.46063, lng: 149.09627}
   - { name: St Clare of Assisi Primary,stop_code: St Clare of Assisi Primary, lat: -35.4606284, lng: 149.0962704}
   - { name: St Francis Xavier Florey,stop_code: St Francis Xavier Florey, lat: -35.223951, lng: 149.0406888}
   - { name: Stromlo High Waramanga,stop_code: Stromlo High Waramanga, lat: -35.3551186, lng: 149.0547624}
@@ -253,10 +219,10 @@
   - { name: Taverner St / Erindale Dr,stop_code: Taverner St / Erindale Dr, lat: -35.4059104, lng: 149.0809317}
   - { name: Tharwa Drive,stop_code: Tharwa Drive, lat: -35.458251, lng: 149.091652}
   - { name: Tharwa Drive / Knoke Ave,stop_code: Tharwa Drive / Knoke Ave, lat: -35.47281, lng: 149.08926}
-  - { name: Tharwa Dr / Pockett Ave,stop_code: Tharwa Dr / Pockett Ave, lat: -35.47348, lng: 149.09178}
+  - { name: Tharwa Drive / Pockett Ave,stop_code: Tharwa Drive / Pockett Ave, lat: -35.47348, lng: 149.09178}
   - { name: Theodore,stop_code: Theodore, lat: -35.4464808, lng: 149.1234651}
   - { name: Tillyard / Spalding,stop_code: Tillyard / Spalding, lat: -35.199204, lng: 149.044556}
-  - { name: Torrens Shops,stop_code: Torrens Shops, lat: -35.3730889, lng: 149.087327}
+  - { name: Torrens,stop_code: Torrens, lat: -35.3730889, lng: 149.087327}
   - { name: Tuggeranong Bus Station,stop_code: Tuggeranong Bus Station, lat: -35.41465, lng: 149.06537}
   - { name: Tuggeranong Bus Station (Platform 3),stop_code: Tuggeranong Bus Station (Platform 3), lat: -35.4147569, lng: 149.0657435}
   - { name: Tuggeranong Bus Station (Platform 4),stop_code: Tuggeranong Bus Station (Platform 4), lat: -35.4144924, lng: 149.0655423}
@@ -266,12 +232,10 @@
   - { name: University of Canberra,stop_code: University of Canberra, lat: -35.2423222, lng: 149.0831522}
   - { name: Wanniassa High,stop_code: Wanniassa High, lat: -35.3952462, lng: 149.0852655}
   - { name: Waramanga,stop_code: Waramanga, lat: -35.3526825, lng: 149.0594712}
-  - { name: Waramanga Shops,stop_code: Waramanga Shops, lat: -35.35268, lng: 149.05948}
-  - { name: War Memorial Limestone Ave,stop_code: War Memorial Limestone Ave, lat: -35.280477, lng: 149.149085}
+  - { name: War Memorial / Limestone Ave,stop_code: War Memorial / Limestone Ave, lat: -35.280477, lng: 149.149085}
   - { name: Watson,stop_code: Watson, lat: -35.2389399, lng: 149.1535345}
-  - { name: Watson Shops,stop_code: Watson Shops, lat: -35.2389399, lng: 149.1535345}
   - { name: Watson Terminus,stop_code: Watson Terminus, lat: -35.2374698, lng: 149.1534553}
-  - { name: Weetangera Shops,stop_code: Weetangera Shops, lat: -35.248393, lng: 149.0506342}
+  - { name: Weetangera,stop_code: Weetangera, lat: -35.248393, lng: 149.0506342}
   - { name: Westfield Bus Station,stop_code: Westfield Bus Station, lat: -35.23875, lng: 149.0638}
   - { name: Westfield Bus Station (Platform 1),stop_code: Westfield Bus Station (Platform 1), lat: -35.23872, lng: 149.06387}
   - { name: Westfield Bus Station (Platform 2),stop_code: Westfield Bus Station (Platform 2), lat: -35.23882, lng: 149.0637}
@@ -293,7 +257,7 @@
   - { name: Woden Bus Station (Platform 6),stop_code: Woden Bus Station (Platform 6), lat: -35.34445, lng: 149.0875371}
   - { name: Woden Bus Station (Platform 9),stop_code: Woden Bus Station (Platform 9), lat: -35.3442083, lng: 149.0877771}
   - { name: Woodcock / Clare Dennis,stop_code: Woodcock / Clare Dennis, lat: -35.4422566, lng: 149.0854375}
-  - { name: Yarralumla Shops,stop_code: Yarralumla Shops, lat: -35.30725, lng: 149.0972}
+  - { name: Yarralumla,stop_code: Yarralumla, lat: -35.30725, lng: 149.0972}
   - { name: Andrea Place,stop_code: Wjz1ceG, lat: -35.4375289, lng: 149.0757996}
   - { name: Tarlton Place,stop_code: Wjz1kvl, lat: -35.4366017, lng: 149.0890756}
   - { name: Don Dunstan Drive,stop_code: Wjz16U7, lat: -35.4302659, lng: 149.0722593}
@@ -1720,6 +1684,13 @@
   - { name: Gilmore Crescent,stop_code: Wjz3BfO, lat: -35.3434784, lng: 149.1088951}
 routes:
   -  
+    time_points: [Tuggeranong Bus Station (Platform 7), Chisholm, Brindabella Business Park, Fairbairn Park]
+    long_name: To Fairbairn Park
+    between_stops: 
+      Brindabella Business Park-Fairbairn Park: [WjzcrK3, WjzcrrQ, WjzcrEu, WjzcJ0K, WjzcBHZ, WjzcJ38]
+    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: 
@@ -1728,7 +1699,7 @@
     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: [Belconnen Community Bus Station (Platform 6), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 5), Charnwood Shops, Fraser East Terminus, Charnwood Shops, Cohen Street Bus Station, Westfield Bus Station, Belconnen Community Bus Station]
+    time_points: [Belconnen Community Bus Station (Platform 6), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 5), Charnwood, Fraser East Terminus, Charnwood, Cohen Street Bus Station, Westfield Bus Station, Belconnen Community Bus Station]
     long_name: To Belconnen Community Bus Station
     between_stops: 
       Belconnen Community Bus Station (Platform 6)-Westfield Bus Station (Platform 2): []
@@ -1745,21 +1716,24 @@
     stop_times_saturday: [[824a, 831a, 834a, 837a, 846a], [924a, 931a, 934a, 937a, 946a], [1024a, 1031a, 1034a, 1037a, 1046a], [1124a, 1131a, 1134a, 1137a, 1146a], [1224p, 1231p, 1234p, 1237p, 1246p], [124p, 131p, 134p, 137p, 146p], [224p, 231p, 234p, 237p, 246p], [324p, 331p, 334p, 337p, 346p], [424p, 431p, 434p, 437p, 446p], [524p, 531p, 534p, 537p, 546p], [624p, 631p, 634p, 637p, 646p], [724p, 731p, 734p, 737p, 746p], [824p, 831p, 834p, 837p, 846p], [924p, 931p, 934p, 937p, 946p], [1024p, 1031p, 1034p, 1037p, 1046p]]
     short_name: "925"
   -  
-    time_points: [Woden Bus Station (Platform 15), Lyons Shops, Chifley Shops, Torrens Shops, Southlands Mawson, Pearce Shops, Woden Bus Station]
+    time_points: [Woden Bus Station (Platform 15), Lyons, Chifley, Torrens, Southlands Mawson, Pearce, Woden Bus Station]
     long_name: To Woden Bus Station
     between_stops: {}
     
     short_name: "921"
     stop_times_sunday: [[933a, 936a, 940a, 945a, 951a, 955a, 1001a], [1133a, 1136a, 1140a, 1145a, 1151a, 1155a, 1201p], [133p, 136p, 140p, 145p, 151p, 155p, 201p], [333p, 336p, 340p, 345p, 351p, 355p, 401p], [533p, 536p, 540p, 545p, 551p, 555p, 601p]]
   -  
-    time_points: [Alexander Maconochie Centre, Woden Bus Station]
-    long_name: To Woden Bus Station
-    between_stops: {}
-    
-    short_name: "988"
-    stop_times_sunday: [[1130a, 1150a], [320p, 340p], [730p, 750p]]
-  -  
-    time_points: [Tuggeranong Bus Station (Platform 4), Isabella Shops, Theodore, Calwell Shops, Outtrim / Duggan, Tuggeranong Bus Station]
+    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]
+    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, "-", "-", "-", "-", "-"], []]
+  -  
+    time_points: [Tuggeranong Bus Station (Platform 4), Isabella, Theodore, Calwell, Outtrim / Duggan, Tuggeranong Bus Station]
     long_name: To Tuggeranong Bus Station
     between_stops: {}
     
@@ -1793,7 +1767,7 @@
     short_name: "705"
     stop_times: [["-", 723a, 752a, 754a, 759a], ["-", 749a, 818a, 820a, 825a], ["-", 814a, 848a, 850a, 855a], [442p, 447p, 516p, 518p, 523p], [507p, 512p, 541p, 543p, 548p], [535p, 540p, 609p, 611p, 616p]]
   -  
-    time_points: [Farrer Terminus, Southlands Mawson, Garran Shops, Hughes Shops, City West, City Bus Station, ACTEW AGL House]
+    time_points: [Farrer Terminus, Southlands Mawson, Garran, Hughes, City West, City Bus Station, ACTEW AGL House]
     long_name: To ACTEW AGL House
     between_stops: 
       City Bus Station-ACTEW AGL House: [Wjz5Nht]
@@ -1819,14 +1793,12 @@
     stop_times_saturday: [[824a, 831a, 839a, 852a], [924a, 931a, 939a, 952a], [1024a, 1031a, 1039a, 1052a], [1124a, 1131a, 1139a, 1152a], [1224p, 1231p, 1239p, 1252p], [124p, 131p, 139p, 152p], [224p, 231p, 239p, 252p], [324p, 331p, 339p, 352p], [424p, 431p, 439p, 452p], [524p, 531p, 539p, 552p], [624p, 631p, 638p, 649p], [724p, 730p, 737p, 748p], [824p, 830p, 837p, 848p], [924p, 930p, 937p, 948p], [1024p, 1030p, 1037p, 1048p], [1124p, 1130p, 1137p, 1148p]]
     short_name: "962"
   -  
-    time_points: [Fairbairn Park, Brindabella Business Park, Majura Business Park, Campbell Park Offices, ADFA, War Memorial Limestone Ave, City Bus Station (Platform 4), Caswell Drive, Aranda Shops, Cook Shops, Jamison Centre, Belconnen Community Bus Station, Westfield Bus Station, Cohen Street Bus Station]
+    time_points: [Fairbairn Park, Brindabella Business Park, Majura Business Park, Campbell Park Offices, ADFA, War Memorial / Limestone Ave, City Bus Station (Platform 4), Caswell Drive, Aranda, Cook, Jamison Centre, 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: []
-      ADFA-War Memorial Limestone Ave: [Wjzcend, Wjzce4H, Wjzce7O, Wjzd8br, Wjzd0CK, Wjz5VUU]
       Campbell Park Offices-ADFA: [Wjzce7O, Wjzce4H, Wjzcend]
-      War Memorial Limestone Ave-City Bus Station (Platform 4): [Wjz5VFA, Wjz5VAq, Wjz5W8l, Wjz5V64, Wjz5NRJ, Wjz5NHD, Wjz5NAQ]
       Fairbairn Park-Brindabella Business Park: [WjzcJ38, WjzcBHZ, WjzcJ0K, WjzcrEu, WjzcrrQ, WjzcrK3]
     short_name: "10"
     stop_times: [["-", "-", "-", "-", "-", "-", 632a, 642a, 644a, 649a, 659a, 709a, 711a, 716a], ["-", "-", "-", "-", "-", "-", 702a, 712a, 714a, 719a, 729a, 739a, 741a, 746a], ["-", "-", "-", "-", "-", "-", 732a, 742a, 744a, 749a, 759a, 809a, 811a, 816a], ["-", "-", "-", "-", "-", "-", 802a, 812a, 814a, 819a, 829a, 839a, 841a, 846a], ["-", "-", "-", 800a, 803a, 808a, 820a, 830a, 832a, 837a, 847a, 857a, 859a, 904a], ["-", "-", "-", 830a, 833a, 838a, 850a, 900a, 902a, 907a, 917a, 927a, 929a, 934a], ["-", "-", "-", 900a, 903a, 908a, 920a, 930a, 932a, 937a, 947a, 957a, 959a, 1004a], [918a, 928a, 933a, 940a, 943a, 948a, 1000a, 1010a, 1012a, 1017a, 1027a, 1037a, 1039a, 1044a], [948a, 958a, 1003a, 1010a, 1013a, 1018a, 1030a, 1040a, 1042a, 1047a, 1057a, 1107a, 1109a, 1114a], [1018a, 1028a, 1033a, 1040a, 1043a, 1048a, 1100a, 1110a, 1112a, 1117a, 1127a, 1137a, 1139a, 1144a], [1048a, 1058a, 1103a, 1110a, 1113a, 1118a, 1130a, 1140a, 1142a, 1147a, 1157a, 1207p, 1209p, 1214p], [1118a, 1128a, 1133a, 1140a, 1143a, 1148a, 1200p, 1210p, 1212p, 1217p, 1227p, 1237p, 1239p, 1244p], [1148a, 1158a, 1203p, 1210p, 1213p, 1218p, 1230p, 1240p, 1242p, 1247p, 1257p, 107p, 109p, 114p], [1218p, 1228p, 1233p, 1240p, 1243p, 1248p, 100p, 110p, 112p, 117p, 127p, 137p, 139p, 144p], [1248p, 1258p, 103p, 110p, 113p, 118p, 130p, 140p, 142p, 147p, 157p, 207p, 209p, 214p], [118p, 128p, 133p, 140p, 143p, 148p, 200p, 210p, 212p, 217p, 227p, 237p, 239p, 244p], [148p, 158p, 203p, 210p, 213p, 218p, 230p, 240p, 242p, 247p, 257p, 307p, 309p, 314p], [218p, 228p, 233p, 240p, 243p, 248p, 300p, 310p, 313p, 318p, 328p, 338p, 340p, 345p], [248p, 258p, 303p, 310p, 314p, 319p, 331p, 341p, 344p, 349p, 359p, 409p, 411p, 416p], [318p, 328p, 333p, 340p, 344p, 349p, 401p, 411p, 414p, 419p, 429p, 439p, 441p, 446p], ["-", "-", "-", "-", "-", "-", 416p, 426p, 429p, 434p, 444p, 454p, 456p, 501p], [348p, 358p, 403p, 410p, 414p, 419p, 431p, 441p, 444p, 449p, 459p, 509p, 511p, 516p], ["-", "-", "-", "-", "-", "-", 446p, 456p, 459p, 504p, 514p, 524p, 526p, 531p], ["-", "-", 431p, 441p, 445p, 450p, 502p, 512p, 515p, 520p, 530p, 537p, 539p, 544p], ["-", "-", "-", "-", "-", "-", 516p, 526p, 529p, 534p, 544p, 554p, 556p, 601p], ["-", "-", 458p, 511p, 515p, 520p, 532p, 542p, 545p, 550p, 600p, 610p, 612p, 617p], ["-", "-", "-", "-", "-", "-", 546p, 556p, 559p, 604p, 614p, 624p, 626p, 631p], ["-", "-", "-", 540p, 544p, 549p, 601p, 611p, 614p, 619p, 629p, 639p, 641p, 646p], ["-", "-", "-", "-", "-", "-", 616p, 626p, 629p, 634p, 644p, 654p, 656p, 701p], ["-", "-", "-", 611p, 615p, 620p, 632p, 642p, 644p, 649p, 659p, 709p, 711p, 716p], ["-", "-", "-", "-", "-", "-", 736p, 746p, 748p, 753p, 803p, 813p, 815p, 820p], ["-", "-", "-", "-", "-", "-", 836p, 846p, 848p, 853p, 903p, 913p, 915p, 920p], ["-", "-", "-", "-", "-", "-", 936p, 946p, 948p, 953p, 1003p, 1013p, 1015p, 1020p], ["-", "-", "-", "-", "-", "-", 1036p, 1046p, 1048p, 1053p, 1103p, 1113p, 1115p, 1120p], ["-", "-", "-", "-", "-", "-", 1136p, 1146p, 1148p, 1153p, 1203a, 1213a, 1215a, 1220a]]
@@ -1838,21 +1810,13 @@
     short_name: "780"
     stop_times: [[405p, 421p, 440p], [435p, 451p, 510p]]
   -  
-    time_points: [Kippax, Higgins, Hawker College, Hawker Shops, Macquarie, Aranda Shops, City Bus Station (Platform 10), Russell Offices, National Circ / Canberra Ave]
+    time_points: [Kippax, Higgins, Hawker College, Hawker, Macquarie, Aranda, City Bus Station (Platform 10), Russell Offices, National Circ / Canberra Ave]
     long_name: To National Circ / Canberra Ave
     between_stops: 
       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: [Woden Bus Station (Platform 4), 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: []
-    short_name: "749"
-    stop_times: [[753a, 820a, 822a, 827a], [436p, 505p, 507p, 512p], [510p, 539p, 541p, 546p], [540p, 609p, 611p, 616p]]
-  -  
     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
     between_stops: {}
@@ -1860,7 +1824,7 @@
     short_name: "66"
     stop_times: [["-", 602a, 610a, 617a, 622a, 631a], [622a, 632a, 640a, 647a, 652a, 701a], [652a, 702a, 710a, 717a, 722a, 731a], [722a, 734a, 744a, 751a, 758a, 808a], [752a, 810a, 820a, 827a, 834a, 844a], [822a, 840a, 850a, 857a, 904a, 914a], [916a, 933a, 941a, 948a, 954a, 1003a], [1022a, 1036a, 1044a, 1051a, 1057a, 1106a], [1122a, 1136a, 1144a, 1151a, 1157a, 1206p], [1222p, 1236p, 1244p, 1251p, 1257p, 106p], [122p, 136p, 144p, 151p, 157p, 206p], [222p, 236p, 244p, 251p, 257p, 307p], [252p, 308p, 319p, 326p, 333p, 343p], [322p, 340p, 351p, 358p, 405p, 415p], [352p, 410p, 421p, 428p, 435p, 445p], [422p, 440p, 451p, 458p, 505p, 515p], [452p, 510p, 521p, 528p, 535p, 545p], [522p, 540p, 551p, 558p, 605p, 615p], [552p, 610p, 621p, 628p, 634p, 643p], [622p, 638p, 646p, 653p, 658p, 707p], [722p, 736p, 744p, 751p, 756p, 805p], [822p, 836p, 844p, 851p, 856p, 905p], [922p, 936p, 944p, 951p, 956p, 1005p], [1022p, 1036p, 1044p, 1051p, 1056p, 1105p], [1122p, 1136p, 1144p, 1151p, 1156p, "-"]]
   -  
-    time_points: [City West, City Bus Station (Platform 10), ACTEW AGL House, Mentone View / Tharwa Drive, Tharwa Dr / Pockett Ave, Lanyon Market Place]
+    time_points: [City West, City Bus Station (Platform 10), ACTEW AGL House, Mentone View / Tharwa Drive, Tharwa Drive / Pockett Ave, Lanyon Market Place]
     long_name: To Lanyon Market Place
     between_stops: 
       ACTEW AGL House-Mentone View / Tharwa Drive: [Wjz33LB, Wjz34Gq, WjrXUAm, WjrXUsW, WjrXUoV, WjrW_uo, Wjz2a26, Wjz1kvl]
@@ -1879,7 +1843,7 @@
     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: [Tuggeranong Bus Station (Platform 7), Calwell Shops, Chisholm Shops, Erindale / Sternberg Cres, Woden Bus Station (Platform 10), Kings Ave / National Circuit, Russell Offices, City Bus Station (Platform 11), City West]
+    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]
@@ -1904,14 +1868,14 @@
     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 Shops, Calwell Shops, Theodore, Outtrim / Duggan, Tuggeranong Bus Station]
+    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 Shops, Hawker Shops, Page Shops, Florey Shops, Cohen Street Bus Station, Westfield Bus Station, Belconnen Community Bus Station]
+    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
     between_stops: 
       Westfield Bus Station (Platform 1)-Belconnen Community Bus Station (Platform 3): []
@@ -1923,8 +1887,8 @@
   -  
     time_points: [Alexander Maconochie Centre, Woden Bus Station]
     long_name: To Woden Bus Station
-    between_stops: {}
-    
+    between_stops: 
+      Alexander Maconochie Centre-Woden Bus Station: [Wjz3kAx, Wjz3dXS]
     stop_times_saturday: [[1130a, 1150a], [320p, 340p], [730p, 750p]]
     short_name: "988"
   -  
@@ -1938,7 +1902,7 @@
     short_name: "958"
     stop_times_sunday: [[852a, 854a, 858a, 908a, 919a, 927a, 935a, 944a, 951a, 958a, 1006a, 1013a], [952a, 954a, 958a, 1008a, 1019a, 1027a, 1035a, 1044a, 1051a, 1058a, 1106a, 1113a], [1052a, 1054a, 1058a, 1108a, 1119a, 1127a, 1135a, 1144a, 1151a, 1158a, 1206p, 1213p], [1152a, 1154a, 1158a, 1208p, 1219p, 1227p, 1235p, 1244p, 1251p, 1258p, 106p, 113p], [1252p, 1254p, 1258p, 108p, 119p, 127p, 135p, 144p, 151p, 158p, 206p, 213p], [152p, 154p, 158p, 208p, 219p, 227p, 235p, 244p, 251p, 258p, 306p, 313p], [252p, 254p, 258p, 308p, 319p, 327p, 335p, 344p, 351p, 358p, 406p, 413p], [352p, 354p, 358p, 408p, 419p, 427p, 435p, 444p, 451p, 458p, 506p, 513p], [452p, 454p, 458p, 508p, 519p, 527p, 535p, 544p, 551p, 558p, 606p, 613p], [552p, 554p, 558p, 608p, 619p, 627p, 635p, 644p, 651p, 658p, 706p, 713p], [652p, 654p, 658p, 708p, 719p, 727p, 735p, 744p, 751p, 758p, 806p, 813p]]
   -  
-    time_points: [Lanyon Market Place, Conder Primary, St Clare of Assisi, Bonython Primary School, Tuggeranong Bus Station (Platform 8), Woden Bus Station (Platform 9), City Bus Station (Platform 3), Belconnen Community Bus Station, Westfield Bus Station, Cohen Street Bus Station]
+    time_points: [Lanyon Market Place, Conder Primary, St Clare of Assisi Primary, Bonython Primary School, Tuggeranong Bus Station (Platform 8), Woden Bus Station (Platform 9), City Bus Station (Platform 3), 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: []
@@ -1949,7 +1913,7 @@
     short_name: 19 319
     stop_times: [[556a, 602a, 608a, 614a, 625a, 643a, 659a, 719a, 721a, 726a], [622a, 628a, 634a, 640a, 651a, 709a, 725a, 746a, 748a, 753a], [646a, 652a, 658a, 704a, 715a, 733a, 751a, 812a, 814a, 819a], [706a, 712a, 718a, 724a, 735a, 754a, 812a, 833a, 835a, 840a], [723a, 729a, 735a, 743a, 755a, 814a, 832a, 853a, 855a, 900a], [735a, 742a, 752a, 800a, 810a, "-", "-", "-", "-", "-"], [742a, 749a, 755a, 803a, 815a, 834a, 852a, 913a, 915a, 920a], [802a, 809a, 815a, 823a, 835a, 854a, 912a, 933a, 935a, 940a], [822a, 829a, 835a, 843a, 855a, 914a, 932a, 952a, 954a, 959a], [853a, 900a, 906a, 914a, 926a, 944a, 1000a, 1020a, 1022a, 1027a], [926a, 933a, 939a, 945a, 956a, 1014a, 1030a, 1050a, 1052a, 1057a], [957a, 1003a, 1009a, 1015a, 1026a, 1044a, 1100a, 1120a, 1122a, 1127a], [1027a, 1033a, 1039a, 1045a, 1056a, 1114a, 1130a, 1150a, 1152a, 1157a], [1057a, 1103a, 1109a, 1115a, 1126a, 1144a, 1200p, 1220p, 1222p, 1227p], [1127a, 1133a, 1139a, 1145a, 1156a, 1214p, 1230p, 1250p, 1252p, 1257p], [1157a, 1203p, 1209p, 1215p, 1226p, 1244p, 100p, 120p, 122p, 127p], [1227p, 1233p, 1239p, 1245p, 1256p, 114p, 130p, 150p, 152p, 157p], [1257p, 103p, 109p, 115p, 126p, 144p, 200p, 220p, 222p, 227p], [127p, 133p, 139p, 145p, 156p, 214p, 230p, 250p, 252p, 257p], [157p, 203p, 209p, 215p, 226p, 244p, 300p, 321p, 323p, 328p], [226p, 232p, 238p, 244p, 255p, 314p, 332p, 353p, 355p, 400p], [253p, 259p, 305p, 313p, 325p, 344p, 402p, 423p, 425p, 430p], [320p, 327p, 337p, 345p, 355p, "-", "-", "-", "-", "-"], [352p, 359p, 409p, 417p, 427p, "-", "-", "-", "-", "-"], [424p, 431p, 441p, 449p, 459p, "-", "-", "-", "-", "-"], [454p, 501p, 511p, 519p, 529p, "-", "-", "-", "-", "-"], [524p, 531p, 541p, 549p, 559p, "-", "-", "-", "-", "-"], [556p, 603p, 613p, 621p, 631p, "-", "-", "-", "-", "-"], [654p, 700p, 710p, 716p, 725p, "-", "-", "-", "-", "-"], [754p, 800p, 810p, 816p, 825p, "-", "-", "-", "-", "-"], [849p, 855p, 905p, 911p, 920p, "-", "-", "-", "-", "-"], [949p, 955p, 1005p, 1011p, 1020p, "-", "-", "-", "-", "-"], [1049p, 1055p, 1105p, 1111p, 1120p, "-", "-", "-", "-", "-"], []]
   -  
-    time_points: [Cohen Street Bus Station (Platform 2), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 3), Calvary Hospital, O'Connor Shops, Burton and Garran Hall Daley Road, National Museum of Australia, City Bus Station (Platform 2), Kings Ave / National Circuit, Deakin Shops, Hughes Shops, Garran Shops, Canberra Hospital, Woden Bus Station]
+    time_points: [Cohen Street Bus Station (Platform 2), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 3), Calvary Hospital, O'Connor, Burton and Garran Hall Daley Road, National Museum of Australia, City Bus Station (Platform 2), Kings Ave / National Circuit, Deakin, Hughes, Garran, Canberra Hospital, Woden Bus Station]
     long_name: To Woden Bus Station
     between_stops: 
       Westfield Bus Station (Platform 1)-Belconnen Community Bus Station (Platform 3): []
@@ -1970,11 +1934,12 @@
     time_points: [City Bus Station (Platform 7), St Thomas More's Campbell, Russell Offices, Hospice / Menindee Dr, ADFA, Campbell Park Offices]
     long_name: To Campbell Park Offices
     between_stops: 
+      Hospice / Menindee Dr-ADFA: [Wjzcd8D, Wjzcd2U, Wjzcdi7, Wjzcdsn, WjzcdDs, WjzceFT, WjzceHt]
       ADFA-Campbell Park Offices: [Wjzcend, Wjzce4H, Wjzce7O]
     short_name: "9"
     stop_times: [[714a, 726a, 731a, 733a, 741a, 745a], [814a, 829a, 834a, 836a, 844a, 848a], [857a, 911a, 916a, 918a, 926a, 931a], [957a, 1011a, 1016a, 1018a, 1026a, 1029a], [1057a, 1111a, 1116a, 1118a, 1126a, 1129a], [1157a, 1211p, 1216p, 1218p, 1226p, 1229p], [1257p, 111p, 116p, 118p, 126p, 129p], [157p, 211p, 216p, 218p, 226p, 229p], [257p, 312p, 317p, 319p, 327p, 331p], [344p, 359p, 404p, 406p, 414p, 418p], [414p, 429p, 434p, 436p, 444p, 448p], [444p, 459p, 504p, 506p, 514p, 518p], [514p, 529p, 534p, 536p, 544p, 548p], [557p, 612p, 617p, 619p, 627p, 631p], [657p, 708p, 712p, 714p, 720p, 723p], [757p, 808p, 812p, 814p, 820p, 823p], [857p, 908p, 912p, 914p, 920p, 923p], [957p, 1008p, 1012p, 1