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.

Sign up for GitHub

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

Nov 2024 build #550

Merged
merged 34 commits into from
Dec 1, 2024
Merged

Nov 2024 build #550

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6184824
2024 Nov Build
wangzhao0217 Nov 4, 2024
52dc0ac
add route ids
wangzhao0217 Nov 5, 2024
6661ad2
Manually update route_ids, speed things up
Robinlovelace Nov 5, 2024
17b2c43
add route id from zw
wangzhao0217 Nov 6, 2024
ad4f0c6
fix typo in route_ids.csv
wangzhao0217 Nov 6, 2024
e5d67f2
pre processing os by adding osm orcp
wangzhao0217 Nov 6, 2024
0648059
Update route_ids for Glasgow
Robinlovelace Nov 7, 2024
a0c6876
Update gitignore
Robinlovelace Nov 7, 2024
61ac56b
Update route_ids.csv
Robinlovelace Nov 7, 2024
d6fac91
More utility trips
Robinlovelace Nov 7, 2024
e8c224f
Updates with final routes
Robinlovelace Nov 7, 2024
131b8a2
Debugging error
Robinlovelace Nov 7, 2024
ca20e19
Debugging simplify network, speed things up
Robinlovelace Nov 7, 2024
f4cb888
Tidy up
Robinlovelace Nov 7, 2024
b199c9e
Full build for Glasgow again
Robinlovelace Nov 7, 2024
3f2a167
Tweak simplify_network bit
Robinlovelace Nov 7, 2024
ce1e978
Fix simplified network
Robinlovelace Nov 8, 2024
b27e54a
fix UNCLOSED_STRING error in the rs_commute_quietest
wangzhao0217 Nov 19, 2024
7f94edf
update traffic results and save CN as gpkg (#554)
wangzhao0217 Nov 27, 2024
7dfa7e9
apply robin's suggestion
wangzhao0217 Nov 27, 2024
f65cd09
Update final_traffic
wangzhao0217 Nov 27, 2024
b1f32e7
Update _targets.R
wangzhao0217 Nov 27, 2024
c13f93f
Use newer version of traffic data
Robinlovelace Nov 27, 2024
80011f8
Do not force osm download every time
Robinlovelace Nov 27, 2024
cea2fab
Update cbd_layer traffic categories, see https://github.com/nptscot/n…
Robinlovelace Nov 28, 2024
19d85c4
Update traffic volume categorisation code
Robinlovelace Nov 28, 2024
8704d08
update oute_ids.csv
wangzhao0217 Nov 28, 2024
14fa73a
update route id
wangzhao0217 Nov 28, 2024
ca6e499
Update boundaries, to low water mark definition (#556)
Robinlovelace Nov 28, 2024
cdeb34d
update route ids
wangzhao0217 Nov 28, 2024
9619e8b
Fix lads (#557)
Robinlovelace Nov 28, 2024
f5c1d55
set nov
wangzhao0217 Nov 28, 2024
762ad14
remove line cause problem
wangzhao0217 Nov 29, 2024
f3f2e83
Merge branch 'main' into Nov-2024-build
wangzhao0217 Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _targets.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ library(targets) # Needed to make targets work
library(magrittr) # Light load of |>
library(sf) # Needed for sf support
set.seed(2023)
httr::set_config(httr::timeout(seconds = 600))
httr::set_config(httr::timeout(seconds = 6000))
tar_source()
pkgs = get_pkgs()

Expand Down
2 changes: 1 addition & 1 deletion parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"plans": ["fastest", "balanced", "quietest", "ebike"],
"min_flow": [1],
"max_to_route": [1000000],
"date_routing": ["2024-11-01"],
"date_routing": ["2024-12-01"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have you shifted it to December?

"geo_subset": [false],
"open_data_build": [false],
"disag_threshold": [100],
Expand Down
10 changes: 10 additions & 0 deletions route_ids.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
nrow,plan,purpose,region,date,id
93472,quietest,utility,Glasgow and Strathclyde,2024-12-01,11540
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

93472,fastest,utility,Glasgow and Strathclyde,2024-12-01,11539
93472,balanced,utility,Glasgow and Strathclyde,2024-12-01,11538
218877,ebike,commute,Glasgow and Strathclyde,2024-12-01,11536
218877,balanced,commute,Glasgow and Strathclyde,2024-12-01,11534
218877,fastest,commute,Glasgow and Strathclyde,2024-12-01,11532
29032,ebike,school,Glasgow and Strathclyde,2024-12-01,11531
29032,balanced,school,Glasgow and Strathclyde,2024-12-01,11530
29032,quietest,school,Glasgow and Strathclyde,2024-12-01,11529
29032,fastest,school,Glasgow and Strathclyde,2024-12-01,11528
93472,ebike,utility,Glasgow and Strathclyde,2024-11-01,11354
93472,quietest,utility,Glasgow and Strathclyde,2024-11-01,11353
93472,fastest,utility,Glasgow and Strathclyde,2024-11-01,11352
Expand Down