deprecate old discovery to alki, add alternative

Also update script to check start and end based on route type.
raceconditionrunning · May 19, 2024 · 2ab1acc · 2ab1acc
1 parent bdf9315
commit 2ab1acc
Show file tree

Hide file tree

Showing 10 changed files with 903 additions and 11 deletions.
diff --git a/_bin/route-db.py b/_bin/route-db.py
@@ -5,6 +5,7 @@
 FIELDS = ['id', 'name', 'start', 'dist', 'elev', 'end', 'type', 'map', 'deprecated']
 TYPES = ['Loop', 'P2P', 'OB']
 LOCS = [
+    'Alki',
     'Beacon',
     'BellDtwn',
     'CapHill',
@@ -52,6 +53,14 @@ def check_route(route, gpx_dir):
     if route['type'] not in TYPES:
         warn_rc(route, f"invalid type '{route['type']}'")
 
+    # sanity start and end wrt to type
+    if route['type'] in ['Loop', 'OB']:
+        if route['start'] != route['end']:
+            warn_rc(route, f"start and end must match for {route['type']} type")
+    if route['type'] == 'P2P':
+        if route['start'] == route['end']:
+            warn_rc(route, f"start and end must differ for P2P type")
+
     # valid start and end locations
     if route['start'] not in LOCS:
         warn_rc(route, f"invalid start '{route['start']}'")

diff --git a/_data/gpx/locks-magnolia-elliott-bay-cranes-alki.gpx b/_data/gpx/locks-magnolia-elliott-bay-cranes-alki.gpx
diff --git a/...h-discovery-magnolia-elliott-bay-alki.gpx → ...very-magnolia-elliott-bay-cranes-alki.gpx b/...h-discovery-magnolia-elliott-bay-alki.gpx → ...very-magnolia-elliott-bay-cranes-alki.gpx
diff --git a/_data/legacy-routes.yml b/_data/legacy-routes.yml
@@ -28,11 +28,6 @@
   dist: 3.07
   map: "http://www.gmap-pedometer.com/?r=7218014"
 
-- id: pp-discovery-alki
-  name: "PP: Discovery Park to Alki Beach"
-  dist: 13.54
-  map: "http://www.gmap-pedometer.com/?r=6875370"
-
 - id: ob-madison-seward
   name: "OB: Madison - Seward Park"
   dist: 13.82

diff --git a/_data/route-db.csv b/_data/route-db.csv
@@ -89,6 +89,7 @@
 "locks-discovery-salmon-bay-loop","Locks, Discovery Park, Salmon Bay Loop","Locks","8.1","890","Locks","Loop","https://onthegomap.com/s/uop4tt1d",""
 "locks-discovery-magnolia-interbay-loop","Locks, Discovery, Magnolia, Interbay Loop","Locks","8.8","880","Locks","Loop","https://onthegomap.com/s/kn1hi8ov",""
 "locks-discovery-magnolia-discovery-ob","Locks, Discovery, Magnolia, Discovery, Locks","Locks","10.0","1320","Locks","OB","https://onthegomap.com/s/huatu1m7",""
+"locks-magnolia-elliott-bay-cranes-alki","Locks, Magnolia, Elliott Bay Trail, Cranes, Alki Beach","Locks","15.2","810","Alki","P2P","https://onthegomap.com/s/u0jioq43",""
 "magnuson-park-loop","Magnuson Park Loop","Magnuson","2.2","67","Magnuson","Loop","https://onthegomap.com/s/m5g1hfj5","T"
 "mercer-slough-2-line","Mercer Slough, Follow the 2 Line","MerSlough","10.7","820","RedTech","P2P","https://onthegomap.com/s/nj4t9smr",""
 "mb-lwb-cc","Mount Bake, LWB, Columbia City","MtBaker","3.3","261","ColCity","P2P","https://onthegomap.com/s/3i1cco56",""
@@ -108,7 +109,7 @@
 "roosevelt-carkeek-phinney-ridge-loop","Roosevelt, Carkeek, Phinney Ridge Loop","Roosevelt","11.4","880","Roosevelt","Loop","https://onthegomap.com/s/chook6dv",""
 "roosevelt-carkeek-golden-gardens-roses","Roosevelt, Carkeek, Golden Gardens, Roses","Roosevelt","14.9","1260","Roosevelt","Loop","https://onthegomap.com/s/mtm7umvc",""
 "seward-park-loop","Seward Park Loop","Seward","2.4","170","Seward","Loop","https://onthegomap.com/s/0fetb9ad","T"
-"south-discovery-magnolia-elliott-bay-alki","South Discovery, Magnolia, Elliott Bay Trail, Alki Beach","SoDisco","13.7","510","SoDisco","P2P","https://onthegomap.com/s/cf62rbka",""
+"south-discovery-magnolia-elliott-bay-cranes-alki","South Discovery, Magnolia, Elliott Bay Trail, Cranes, Alki Beach","SoDisco","13.7","510","Alki","P2P","https://onthegomap.com/s/cf62rbka","T"
 "sodo-4th-ave-airport-way-industrial-loop","SODO, 4th Ave, Airport Way Industrial Loop","SODO","4.3","47","SODO","Loop","https://onthegomap.com/s/a7rniok4",""
 "sodo-mts-sound-i90-trail-ob","OB: SODO, Mts to Sound, I90 Trail, East Portal View","SODO","6.3","810","SODO","OB","https://onthegomap.com/s/hj89dka2",""
 "sodo-duwamish-trail-1st-loop","SODO, Duwamish Trail, 1st Ave Loop","SODO","7.9","172","SODO","Loop","https://onthegomap.com/s/9olfocio",""

diff --git a/_data/schedules/16-autumn.yml b/_data/schedules/16-autumn.yml
@@ -48,7 +48,7 @@
 - date: '2016-11-12'
   plan:
     - time: '8:50'
-      route_id: south-discovery-magnolia-elliott-bay-alki
+      route_id: south-discovery-magnolia-elliott-bay-cranes-alki
       cancelled: "Illness and deadlines"
 - date: '2016-11-19'
   plan:

diff --git a/_data/schedules/17-autumn.yml b/_data/schedules/17-autumn.yml
@@ -48,7 +48,7 @@
 - date: '2017-11-11'
   plan:
     - time: '8:50'
-      route_id: south-discovery-magnolia-elliott-bay-alki
+      route_id: south-discovery-magnolia-elliott-bay-cranes-alki
 - date: '2017-11-18'
   plan:
     - time: '8:50'

diff --git a/_data/schedules/18-autumn.yml b/_data/schedules/18-autumn.yml
@@ -79,7 +79,7 @@
 - date: '2018-12-14'
   plan:
     - time: '8:50'
-      route_id: south-discovery-magnolia-elliott-bay-alki
+      route_id: south-discovery-magnolia-elliott-bay-cranes-alki
 - date: '2018-12-29'
   plan:
     - time: '8:50'

diff --git a/_data/schedules/19-autumn.yml b/_data/schedules/19-autumn.yml
@@ -94,7 +94,7 @@
 - date: "2019-11-16"
   plan:
     - time: "8:50"
-      route_id: south-discovery-magnolia-elliott-bay-alki
+      route_id: south-discovery-magnolia-elliott-bay-cranes-alki
 
 - date: "2019-11-23"
   plan:

diff --git a/_data/schedules/19-spring.yml b/_data/schedules/19-spring.yml
@@ -31,7 +31,7 @@
 - date: "2019-05-18"
   plan:
     - time: "8:50"
-      route_id: south-discovery-magnolia-elliott-bay-alki
+      route_id: south-discovery-magnolia-elliott-bay-cranes-alki
 
 - date: "2019-05-25"
   plan: