diff --git a/datasets/stops.csv b/datasets/stops.csv
index 313f63117..dfc93a062 100644
--- a/datasets/stops.csv
+++ b/datasets/stops.csv
@@ -386,7 +386,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 643,50637,Eastbound Davie St @ Bute St,,49.28144,-123.132973,BUS ZN,,0,,,
 644,50638,Eastbound Davie St @ Thurlow St,,49.280147,-123.13096,BUS ZN,,0,,,
 645,50639,Southbound Richards St @ W Cordova St,,49.2844,-123.111471,BUS ZN,,0,,,
-646,50640,Dunbar Loop @ Bay 2,,49.234593,-123.18575,BUS ZN,,0,,,
+646,50640,Dunbar Loop @ Bay 2,,49.234625,-123.185758,BUS ZN,,0,,,
 648,50642,Eastbound E 41 Ave @ Sophia St,,49.232934,-123.098854,BUS ZN,,0,,,
 649,50643,Eastbound E 41 Ave @ St. George St,,49.23287,-123.094138,BUS ZN,,0,,,
 650,50644,Eastbound E 41 Ave @ Fraser St,,49.232769,-123.090022,BUS ZN,,0,,,
@@ -434,7 +434,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 705,50698,Southbound Victoria Dr @ E 31 Ave,,49.24251,-123.065373,BUS ZN,,0,,,
 706,50699,Southbound Victoria Dr @ E 33 Ave,,49.239661,-123.065469,BUS ZN,,0,,,
 707,50700,Southbound Victoria Dr @ E 36 Ave,,49.237254,-123.065531,BUS ZN,,0,,,
-709,50702,Westbound E 41 Ave @ Victoria Dr,,49.232771,-123.06615,BUS ZN,,0,,,
+709,50702,Westbound E 41 Ave @ Victoria Dr,,49.232792,-123.066082,BUS ZN,,0,,,
 710,50703,Westbound E 41 Ave @ Commercial St,,49.232719,-123.069244,BUS ZN,,0,,,
 711,59094,Westbound E 41 Ave @ Fleming St,,49.232762,-123.07324,BUS ZN,,0,,,
 713,50706,Westbound E 41 Ave @ Knight St,,49.232845,-123.077938,BUS ZN,,0,,,
@@ -633,7 +633,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 967,50958,Westbound E Hastings St @ Windermere St,,49.281219,-123.036936,BUS ZN,,0,,,
 968,50959,Westbound E Hastings St @ Renfrew St,,49.281229,-123.044631,BUS ZN,,0,,,
 969,50960,Westbound E Hastings St @ Kaslo St,,49.281226,-123.047423,BUS ZN,,0,,,
-970,50961,Westbound E Hastings St @ Penticton St,,49.281228,-123.052402,BUS ZN,,0,,,
+970,50961,Westbound E Hastings St @ Penticton St,,49.281243,-123.053371,BUS ZN,,0,,,
 972,50963,Commercial-Broadway Station @ Bay 2,,49.261929,-123.069913,BUS ZN,,0,,,
 973,58092,Southbound Commercial Dr @ E 12 Ave,,49.258848,-123.069971,BUS ZN,,0,,,
 974,58093,Southbound Commercial Dr @ E 14 Ave,,49.257485,-123.069954,BUS ZN,,0,,,
@@ -1137,8 +1137,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 1597,51585,Westbound W King Edward Ave @ Yew St,,49.251149,-123.156163,BUS ZN,,0,,,
 1598,51586,Westbound W King Edward Ave @ Valley Dr,,49.249723,-123.159848,BUS ZN,,0,,,
 1600,51588,Westbound W King Edward Ave @ Trafalgar St,,49.248213,-123.165826,BUS ZN,,0,,,
-1601,51589,Westbound W King Edward Ave @ Balaclava St,,49.250163,-123.176132,BUS ZN,,0,,,
-1602,51590,Westbound W King Edward Ave @ Blenheim St,,49.250186,-123.179095,BUS ZN,,0,,,
+1602,51590,Westbound W King Edward Ave @ Blenheim St,,49.249979,-123.178887,BUS ZN,,0,,,
 1604,51592,Westbound W 16 Ave @ Alma St,,49.258091,-123.18653,BUS ZN,,0,,,
 1605,51593,Westbound W 16 Ave @ Wallace St,,49.258162,-123.191535,BUS ZN,,0,,,
 1606,51594,Westbound W 16 Ave @ Camosun St,,49.258254,-123.197604,BUS ZN,,0,,,
@@ -5206,7 +5205,6 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 6870,56805,Northbound 4th Ave @ Pleasant St,,49.131313,-123.1871,BUS ZN,,0,,,
 6871,56806,Northbound Gilbert Rd @ Kimberley Dr,,49.134245,-123.147695,BUS ZN,,0,,,
 6872,56807,Northbound Gilbert Rd @ 10500 Block,,49.136657,-123.14771,BUS ZN,,0,,,
-6873,56808,Northbound Gilbert Rd @ Bamberton Dr,,49.139133,-123.147742,BUS ZN,,0,,,
 6874,56809,Northbound Gilbert Rd @ Williams Rd,,49.141262,-123.147761,BUS ZN,,0,,,
 6875,56810,Northbound Gilbert Rd @ Gilhurst Gate,,49.144183,-123.147745,BUS ZN,,0,,,
 6876,56811,Northbound Gilbert Rd @ Broadmoor Blvd,,49.146292,-123.147743,BUS ZN,,0,,,
@@ -5234,8 +5232,6 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 6899,56834,Southbound Gilbert Rd @ Francis Rd,,49.148009,-123.147947,BUS ZN,,0,,,
 6900,56835,Southbound Gilbert Rd @ Broadmoor Blvd,,49.145755,-123.147961,BUS ZN,,0,,,
 6901,56836,Southbound Gilbert Rd @ Woodwards Rd,,49.143488,-123.147971,BUS ZN,,0,,,
-6902,56837,Southbound Gilbert Rd @ Williams Rd,,49.140645,-123.147996,BUS ZN,,0,,,
-6903,56838,Southbound Gilbert Rd @ Bamberton Dr,,49.138498,-123.147951,BUS ZN,,0,,,
 6904,56839,Southbound Gilbert Rd @ Kimberley Dr,,49.13515,-123.147912,BUS ZN,,0,,,
 6905,56840,Westbound Steveston Hwy @ Gilbert Rd,,49.133572,-123.148504,BUS ZN,,0,,,
 6906,56841,Westbound Steveston Hwy @ Constable Gate,,49.133577,-123.1522,BUS ZN,,0,,,
@@ -5811,7 +5807,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 7635,57562,Ladner Exchange @ Bay 3,,49.087654,-123.061833,BUS ZN,,0,,,
 7636,57563,Eastbound River Rd @ 72 St,,49.137172,-123.024713,BUS ZN,,0,,,
 7637,57564,Eastbound River Rd @ Berg Rd,,49.140651,-123.011886,BUS ZN,,0,,,
-7638,57565,Eastbound River Rd @ East Mill Access Rd,,49.155649,-122.942699,BUS ZN,,0,,,
+7638,57565,Eastbound River Rd @ East Mill Access Rd,,49.155491,-122.942489,BUS ZN,,0,,,
 7639,57566,Scott Road Station @ Bay 8,,49.204154,-122.875283,BUS ZN,,0,,,
 7641,57568,Westbound River Rd @ Huston Rd,,49.145481,-123.003294,BUS ZN,,0,,,
 7642,57569,Westbound River Rd @ Ross Rd,,49.140399,-123.01324,BUS ZN,,0,,,
@@ -7219,7 +7215,6 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 10554,59983,Westbound Fraser Hwy @ 222 St,,49.091951,-122.608976,BUS ZN,,0,,,
 10557,59708,Eastbound Brown Ave @ 224 St,,49.221507,-122.600945,BUS ZN,,0,,,
 10558,52226,Westbound Miller Rd @ Templeton St,,49.192217,-123.149384,BUS ZN,,0,,,
-10559,59489,Eastbound SW Marine Dr @ Wesbrook Mall,,49.244611,-123.233387,BUS ZN,,0,,,
 10564,58084,Braid Station @ Bay 4,,49.233381,-122.882642,BUS ZN,,0,,,
 10565,53663,Westbound United Blvd @ Schooner St,,49.228187,-122.840174,BUS ZN,,0,,,
 10567,59911,Eastbound Mary Hill Bypass @ Broadway St,,49.241462,-122.76024,BUS ZN,,0,,,
@@ -8756,7 +8751,6 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 12906,60260,Phibbs Exchange @ Bay 11,,49.305348,-123.029938,BUS ZN,,0,,,
 12907,60264,Phibbs Exchange @ Bay 12,,49.305003,-123.030202,BUS ZN,,0,,,
 12908,60647,Northbound Lonsdale Ave @ E 17 St,,49.323923,-123.072194,BUS ZN,,0,,,
-12910,60648,Southbound Dunbar St @ W 24 Ave,,49.25086,-123.185314,BUS ZN,,0,,,
 12911,60268,Northbound Oak St @ W 67th Ave,,49.210429,-123.130057,BUS ZN,,0,,,
 12914,60650,Northbound Mountain Hwy @ St Stephens Place,,49.331851,-123.037874,BUS ZN,,0,,,
 12915,60653,Eastbound Sawmill Cres @ River District Crossing,,49.205918,-123.031907,BUS ZN,,0,,,
diff --git a/datasets/stops.geojson b/datasets/stops.geojson
index 773049fc0..f8ec6d586 100644
--- a/datasets/stops.geojson
+++ b/datasets/stops.geojson
@@ -7356,8 +7356,8 @@
   {
    "geometry": {
     "coordinates": [
-     -123.18575,
-     49.234593
+     -123.185758,
+     49.234625
     ],
     "type": "Point"
    },
@@ -8268,8 +8268,8 @@
   {
    "geometry": {
     "coordinates": [
-     -123.06615,
-     49.232771
+     -123.066082,
+     49.232792
     ],
     "type": "Point"
    },
@@ -12049,8 +12049,8 @@
   {
    "geometry": {
     "coordinates": [
-     -123.052402,
-     49.281228
+     -123.053371,
+     49.281243
     ],
     "type": "Point"
    },
@@ -21625,27 +21625,8 @@
   {
    "geometry": {
     "coordinates": [
-     -123.176132,
-     49.250163
-    ],
-    "type": "Point"
-   },
-   "id": "1601",
-   "properties": {
-    "code": "51589",
-    "desc": "",
-    "id": "1601",
-    "name": "Westbound W King Edward Ave @ Balaclava St",
-    "wheelchair_boarding": null,
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
-  {
-   "geometry": {
-    "coordinates": [
-     -123.179095,
-     49.250186
+     -123.178887,
+     49.249979
     ],
     "type": "Point"
    },
@@ -98933,25 +98914,6 @@
    },
    "type": "Feature"
   },
-  {
-   "geometry": {
-    "coordinates": [
-     -123.147742,
-     49.139133
-    ],
-    "type": "Point"
-   },
-   "id": "6873",
-   "properties": {
-    "code": "56808",
-    "desc": "",
-    "id": "6873",
-    "name": "Northbound Gilbert Rd @ Bamberton Dr",
-    "wheelchair_boarding": null,
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
   {
    "geometry": {
     "coordinates": [
@@ -99465,44 +99427,6 @@
    },
    "type": "Feature"
   },
-  {
-   "geometry": {
-    "coordinates": [
-     -123.147996,
-     49.140645
-    ],
-    "type": "Point"
-   },
-   "id": "6902",
-   "properties": {
-    "code": "56837",
-    "desc": "",
-    "id": "6902",
-    "name": "Southbound Gilbert Rd @ Williams Rd",
-    "wheelchair_boarding": null,
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
-  {
-   "geometry": {
-    "coordinates": [
-     -123.147951,
-     49.138498
-    ],
-    "type": "Point"
-   },
-   "id": "6903",
-   "properties": {
-    "code": "56838",
-    "desc": "",
-    "id": "6903",
-    "name": "Southbound Gilbert Rd @ Bamberton Dr",
-    "wheelchair_boarding": null,
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
   {
    "geometry": {
     "coordinates": [
@@ -110431,8 +110355,8 @@
   {
    "geometry": {
     "coordinates": [
-     -122.942699,
-     49.155649
+     -122.942489,
+     49.155491
     ],
     "type": "Point"
    },
@@ -137180,25 +137104,6 @@
    },
    "type": "Feature"
   },
-  {
-   "geometry": {
-    "coordinates": [
-     -123.233387,
-     49.244611
-    ],
-    "type": "Point"
-   },
-   "id": "10559",
-   "properties": {
-    "code": "59489",
-    "desc": "",
-    "id": "10559",
-    "name": "Eastbound SW Marine Dr @ Wesbrook Mall",
-    "wheelchair_boarding": null,
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
   {
    "geometry": {
     "coordinates": [
@@ -166383,25 +166288,6 @@
    },
    "type": "Feature"
   },
-  {
-   "geometry": {
-    "coordinates": [
-     -123.185314,
-     49.25086
-    ],
-    "type": "Point"
-   },
-   "id": "12910",
-   "properties": {
-    "code": "60648",
-    "desc": "",
-    "id": "12910",
-    "name": "Southbound Dunbar St @ W 24 Ave",
-    "wheelchair_boarding": null,
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
   {
    "geometry": {
     "coordinates": [