Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PBA project cards from BCM #5

Draft
wants to merge 103 commits into
base: configure
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
ed95318
bart 19st and macarthur st SB stop fixes
i-am-sijia Jun 14, 2023
593e6cb
EA and EV frequency fixes
i-am-sijia Jun 14, 2023
c8de3e1
bart yellow line am southbound stop pattern fix
i-am-sijia Jul 3, 2023
5df3442
add 2035 transit project cards and their dependencies
yueshuaing May 3, 2024
b3f548b
Revert "add 2035 transit project cards and their dependencies"
yueshuaing May 3, 2024
54f90e5
Update update-registry.yml
yueshuaing May 3, 2024
8312470
add 2035 project cards and their dependencies
yueshuaing May 3, 2024
69956e7
Update update-registry.yml
yueshuaing May 3, 2024
68b905f
add 2050 transit project cards
yueshuaing May 3, 2024
eb0d8f6
Update update-registry.yml
yueshuaing May 3, 2024
6db9465
update node id to fix in the allowable range
yueshuaing May 3, 2024
de14867
update link id to fit in the allowable range
yueshuaing May 3, 2024
3e7453c
update model link id
yueshuaing May 3, 2024
3f8444f
update model_link_id in 2050 transit project cards
yueshuaing May 3, 2024
2e27254
GitHub Action automated registry update
modelbot May 3, 2024
bdf2a95
add missing argument in _is_id_in_allowable_range function
yueshuaing May 3, 2024
40db408
Merge branch 'bicounty' of https://github.com/wsp-sag/mtc_project_car…
yueshuaing May 3, 2024
d582fe8
GitHub Action automated registry update
modelbot May 3, 2024
879c23d
add 2020 highway project cards
yueshuaing May 3, 2024
c15ad5a
update model_link_id
yueshuaing May 3, 2024
241aa6f
update model_link_id
yueshuaing May 3, 2024
ae7b58d
Update CCTA.yml
yueshuaing May 3, 2024
2ca02de
add 2020 and 2035 highway project cards
yueshuaing May 4, 2024
d7a93a8
highway project cards
yueshuaing May 4, 2024
29bd98b
highway project cards
yueshuaing May 4, 2024
a1ab866
GitHub Action automated registry update
modelbot May 4, 2024
43d9457
Create Externals_SJQ_Add_complete_network_10032022.yml
yueshuaing May 4, 2024
c1b693c
Update Externals_SJQ_Add_complete_network_10032022.yml
yueshuaing May 4, 2024
bfbd20d
GitHub Action automated registry update
modelbot May 4, 2024
5ed49d1
add 2020 highway project cards
yueshuaing May 4, 2024
60d1a9e
GitHub Action automated registry update
modelbot May 4, 2024
140d7bb
add 2035 project cards
yueshuaing May 4, 2024
0ffaf78
GitHub Action automated registry update
modelbot May 4, 2024
2ead993
add 2050 highway projects
yueshuaing May 4, 2024
7775312
GitHub Action automated registry update
modelbot May 4, 2024
ca5bc46
Update BART_2036_Berryessa_to_Santa_Clara_add_rail_link.yml
yueshuaing May 4, 2024
64cc339
GitHub Action automated registry update
modelbot May 4, 2024
9c86ac6
move SMART highway changes to 2020
yueshuaing May 6, 2024
8daa1f6
GitHub Action automated registry update
modelbot May 6, 2024
8bd5ddc
move two highway project cards to 2050
yueshuaing May 6, 2024
dd7b8ea
GitHub Action automated registry update
modelbot May 6, 2024
0b5ce17
remove two outdated project cards from 2050
yueshuaing May 6, 2024
ad32c86
GitHub Action automated registry update
modelbot May 6, 2024
f05f0d0
add 2050 LINK21 projects
yueshuaing May 7, 2024
cb8e804
GitHub Action automated registry update
modelbot May 7, 2024
7f71678
update file names
yueshuaing Jun 27, 2024
b312b46
GitHub Action automated registry update
modelbot Jun 27, 2024
b0dad98
Update pacheco_pass_highway_missing_segments.yml
yueshuaing Jun 27, 2024
ada92c8
GitHub Action automated registry update
modelbot Jun 27, 2024
5978848
update and move project from 2020 to 2015
yueshuaing Jun 27, 2024
ef581f6
GitHub Action automated registry update
modelbot Jun 27, 2024
901bb96
update and move project from 2020 to 2015
yueshuaing Jun 27, 2024
4adbe41
GitHub Action automated registry update
modelbot Jun 27, 2024
8da4e93
add 2015 highway and transit project cards
yueshuaing Jun 28, 2024
175d5bb
Revert "add 2015 highway and transit project cards"
yueshuaing Jun 28, 2024
aa56811
GitHub Action automated registry update
modelbot Jun 28, 2024
d805bf4
add 2015 transit project cards
yueshuaing Jun 28, 2024
bac23e4
Merge branch 'bicounty' of https://github.com/wsp-sag/mtc_project_car…
yueshuaing Jun 28, 2024
ddafe93
GitHub Action automated registry update
modelbot Jun 28, 2024
66565f1
add 2015 highway projects
yueshuaing Jun 28, 2024
99b002c
GitHub Action automated registry update
modelbot Jun 28, 2024
3d0dae7
delete two projects as they're already in 2020
yueshuaing Jun 28, 2024
f21422e
GitHub Action automated registry update
modelbot Jun 28, 2024
eebe22a
move projects from 2020 to 2015
yueshuaing Jun 28, 2024
72cd889
Revert "move projects from 2020 to 2015"
yueshuaing Jun 28, 2024
2c662cb
GitHub Action automated registry update
modelbot Jun 28, 2024
f8751d8
move two 2020 projects to 2015
yueshuaing Jun 28, 2024
eb12283
GitHub Action automated registry update
modelbot Jun 28, 2024
b997b82
update existing 2020 project names
yueshuaing Jul 1, 2024
96a7b0e
GitHub Action automated registry update
modelbot Jul 1, 2024
423e6b8
reorganize and update 2020 projects
yueshuaing Jul 1, 2024
7beffe6
GitHub Action automated registry update
modelbot Jul 1, 2024
98c2ea9
add 2020 Oakland lanes modification
yueshuaing Jul 1, 2024
7c03043
GitHub Action automated registry update
modelbot Jul 1, 2024
5c5c0da
move projects from 2035 1-2 to 2020
yueshuaing Jul 1, 2024
b6f7284
GitHub Action automated registry update
modelbot Jul 1, 2024
dfc7d80
add Connection to Balboa Park BART stop
yueshuaing Jul 1, 2024
4e23e94
GitHub Action automated registry update
modelbot Jul 1, 2024
de9cdce
update 2035 project
yueshuaing Jul 1, 2024
7e69f2c
GitHub Action automated registry update
modelbot Jul 1, 2024
8dc141e
remove null values
yueshuaing Jul 1, 2024
db7d76a
GitHub Action automated registry update
modelbot Jul 1, 2024
338e82f
Delete sample_pnr_node.yml
yueshuaing Jul 1, 2024
fe2787c
GitHub Action automated registry update
modelbot Jul 1, 2024
1951340
add 2035 transit projects
yueshuaing Jul 1, 2024
62b1a93
Merge branch 'bicounty' of https://github.com/wsp-sag/mtc_project_car…
yueshuaing Jul 1, 2024
c57a772
GitHub Action automated registry update
modelbot Jul 1, 2024
0b5d7af
folder rename
yueshuaing Jul 1, 2024
23df120
GitHub Action automated registry update
modelbot Jul 1, 2024
dcd92c9
folder reorg
yueshuaing Jul 1, 2024
1967371
GitHub Action automated registry update
modelbot Jul 1, 2024
ff58556
Update year_2015_roadway_property_change_i580_should_be_5_lanes.yml
yueshuaing Jul 19, 2024
ceefd95
GitHub Action automated registry update
modelbot Jul 19, 2024
c0d4104
update ebart rail link
yueshuaing Jul 22, 2024
9d8e67e
GitHub Action automated registry update
modelbot Jul 22, 2024
5835c92
add ebart rail link and bart pnr connections
yueshuaing Jul 22, 2024
a54a917
GitHub Action automated registry update
modelbot Jul 22, 2024
c592355
update project name
yueshuaing Jul 22, 2024
ccd7edf
GitHub Action automated registry update
modelbot Jul 22, 2024
5901a3a
add new 2035 highway projects
yueshuaing Jul 22, 2024
4806852
GitHub Action automated registry update
modelbot Jul 22, 2024
d6040f8
add new 2050 highway projects
yueshuaing Jul 22, 2024
f5e1324
GitHub Action automated registry update
modelbot Jul 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 10 additions & 2 deletions .github/workflows/update-registry.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: Update Registry

on: [push]
on:
push:
branches:
- '*'

pull_request:
branches:
- '*'

jobs:
build:
Expand All @@ -20,6 +27,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install --user -e git+https://github.com/wsp-sag/network_wrangler.git@develop#egg=network_wrangler
pip install pytest
python update_registry.py

- name: commit files
Expand All @@ -33,4 +41,4 @@ jobs:
uses: ad-m/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: configure
branch: bicounty
4 changes: 3 additions & 1 deletion methods_add_cards.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ def _make_available(nodes_or_links: str, config: dict) -> list:

def _is_id_in_allowable_range(
nodes_or_links: str,
new_id: int,
project_name: str,
subject_id: int,
range_in_use: dict,
Expand All @@ -124,6 +125,7 @@ def _is_id_in_allowable_range(
"New {} id ({}) in project '{}' is not in the base networks allowable range"
"({} to {}) as defined in the configuration file.".format(
nodes_or_links,
new_id,
project_name,
min(range_in_use.keys()),
max(range_in_use.keys()),
Expand Down Expand Up @@ -241,7 +243,7 @@ def _update_registry(
for subject_index, subject in enumerate(card.changes[change_index][nodes_or_links]):
new_id = subject[subject_id_word]

_is_id_in_allowable_range(subject_word, card.project, new_id, range_in_use)
_is_id_in_allowable_range(subject_word, new_id, card.project, new_id, range_in_use)
_is_id_used_in_base_network(subject_word, card.project, new_id, range_in_use)
if new_id not in subject_df["id"].values:
updates_df = pd.DataFrame(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ changes:
- A: 2154279
B: 2192760
bike_access: 1
county: Santa Clara
drive_access: 1
model_link_id: 2660008
rail_only: 0
Expand All @@ -20,6 +21,7 @@ changes:
- A: 2192760
B: 2154279
bike_access: 1
county: Santa Clara
drive_access: 1
model_link_id: 2660009
rail_only: 0
Expand All @@ -31,6 +33,7 @@ changes:
- A: 2137905
B: 2129456
bike_access: 1
county: Santa Clara
drive_access: 1
model_link_id: 2660010
rail_only: 0
Expand All @@ -42,6 +45,7 @@ changes:
- A: 2129456
B: 2137905
bike_access: 1
county: Santa Clara
drive_access: 1
model_link_id: 2660011
rail_only: 0
Expand Down
Loading