-
Notifications
You must be signed in to change notification settings - Fork 13
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
Merge changes from TfWM #58
base: master
Are you sure you want to change the base?
Commits on Aug 15, 2023
-
fix failure to merge BODS and NR gtfs files because data type of join…
… columns not being explicitly set - and some fields assumed to be present in route table (route_desc) are not present in BODS data
Configuration menu - View commit details
-
Copy full SHA for 1a7c832 - Browse repository at this point
Copy the full SHA 1a7c832View commit details
Commits on Aug 24, 2023
-
Configuration menu - View commit details
-
Copy full SHA for b31dfb7 - Browse repository at this point
Copy the full SHA b31dfb7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 074826c - Browse repository at this point
Copy the full SHA 074826cView commit details -
code was assuming a set of tables, and hence dumping tables like 'fre…
…quencies' and 'feed_info' when reading / writing BODS data. Removed assumptions about table names, all additional tables encountered in zip are read and written. also performance improvement when writing.
Configuration menu - View commit details
-
Copy full SHA for 8d4c2d8 - Browse repository at this point
Copy the full SHA 8d4c2d8View commit details -
merge was expecting a fixed set of tables and columns and throwing aw…
…ay anything else that it wasn't expecting. OK for the GTFS tables generated by this tool from CIF files, but caused data loss when using BODS data. modified to keep all encountered columns and tables - passes through if there isn't any specific code for the table in question.
Configuration menu - View commit details
-
Copy full SHA for ccd451e - Browse repository at this point
Copy the full SHA ccd451eView commit details -
added FOC YG + MV (appearing in NR timetable extracts)
renamed ZZ to reflect it's a generic obfuscated freight, not a specific operator
Configuration menu - View commit details
-
Copy full SHA for c9f7cce - Browse repository at this point
Copy the full SHA c9f7cceView commit details
Commits on Aug 25, 2023
-
fix null columns being inserted in calendar_dates key field when a ca…
…lendar_date exists with no calendar (rare but valid data configuration)
Configuration menu - View commit details
-
Copy full SHA for 0033338 - Browse repository at this point
Copy the full SHA 0033338View commit details -
Configuration menu - View commit details
-
Copy full SHA for bf8f460 - Browse repository at this point
Copy the full SHA bf8f460View commit details -
pass 'silent' value down the call stack and give some level of warnin…
…g about merge() failing
Configuration menu - View commit details
-
Copy full SHA for f04ae8b - Browse repository at this point
Copy the full SHA f04ae8bView commit details -
Configuration menu - View commit details
-
Copy full SHA for b4b5651 - Browse repository at this point
Copy the full SHA b4b5651View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4048f27 - Browse repository at this point
Copy the full SHA 4048f27View commit details -
Merge branch 'oo-tfwm-performance' of ssh://github.com/oweno-tfwm/UK2…
…GTFS into oo-tfwm-performance
Configuration menu - View commit details
-
Copy full SHA for bb1220d - Browse repository at this point
Copy the full SHA bb1220dView commit details -
Merge pull request #2 from ITSLeeds/master
merge up to latest leeds master
Configuration menu - View commit details
-
Copy full SHA for 772e072 - Browse repository at this point
Copy the full SHA 772e072View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5cb490c - Browse repository at this point
Copy the full SHA 5cb490cView commit details -
Merge pull request #3 from oweno-tfwm/oo-tfwm-performance
1) make load and merge agnostic about expected tables and fields, so that optional tables and fields are at least passed through rather than discarded. (allows GTFS generated by this tool and BODS to be merged) 2) tighten up data type expectations for fields in BODS data 3) fix bugs when calendar dates have no calendar (this is a legitimate but range arrangement of data) 4) performance improvement while formatting files before writing to file system (3 minute improvement when writing 400mb zipped GTFS file (all GB BODS extract) There is one line in merge that needs resolution - complex line that I couldn't understand so commented it out. calendar_dates <- calendar_dates[sapply(calendar_dates, function(x){ifelse(is.null(nrow(x)),0,nrow(x))}) > 0] no idea what it's supposed to do and no explanatory comment
Configuration menu - View commit details
-
Copy full SHA for c199bb4 - Browse repository at this point
Copy the full SHA c199bb4View commit details
Commits on Aug 29, 2023
-
stop errors in merge() being swallowed silently, with the only clue t…
…o the caller being a different shaped structure being passed back
Configuration menu - View commit details
-
Copy full SHA for 8391315 - Browse repository at this point
Copy the full SHA 8391315View commit details -
add additional combinations of activity codes arising from reading en…
…tries in LO table
Configuration menu - View commit details
-
Copy full SHA for baf5346 - Browse repository at this point
Copy the full SHA baf5346View commit details -
fix activity not being read from LO
change to use data.table (likely a breaking change) performance improvements add setting of route_long_name "Train from..." to change based on mode
Configuration menu - View commit details
-
Copy full SHA for 8742c56 - Browse repository at this point
Copy the full SHA 8742c56View commit details -
Configuration menu - View commit details
-
Copy full SHA for 77aa421 - Browse repository at this point
Copy the full SHA 77aa421View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c55584 - Browse repository at this point
Copy the full SHA 1c55584View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3078c81 - Browse repository at this point
Copy the full SHA 3078c81View commit details -
add unit test - the test currently passes - but the results look all …
…wrong, overlays not being applied correctly
Configuration menu - View commit details
-
Copy full SHA for d0218c7 - Browse repository at this point
Copy the full SHA d0218c7View commit details
Commits on Sep 4, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 618ffa6 - Browse repository at this point
Copy the full SHA 618ffa6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8b6990d - Browse repository at this point
Copy the full SHA 8b6990dView commit details -
move formatting to helper function which generically processes all ta…
…bles, change default options to highest performing write combination
Configuration menu - View commit details
-
Copy full SHA for 14c2d45 - Browse repository at this point
Copy the full SHA 14c2d45View commit details -
major overhaul to fix issues in timetable overlay rule processing - h…
…as also been extensively profiled and reasonable level of optimisation applied
Configuration menu - View commit details
-
Copy full SHA for 79a175e - Browse repository at this point
Copy the full SHA 79a175eView commit details -
move basic unit tests to their own file - add large number of unit te…
…sts for revised overlay functionality
Configuration menu - View commit details
-
Copy full SHA for 2c7cd1f - Browse repository at this point
Copy the full SHA 2c7cd1fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 47def4b - Browse repository at this point
Copy the full SHA 47def4bView commit details -
split atoc_export up because it's now far too long and my finger ache…
…s from too much scrolling
Configuration menu - View commit details
-
Copy full SHA for fa0e8c0 - Browse repository at this point
Copy the full SHA fa0e8c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for a40c02a - Browse repository at this point
Copy the full SHA a40c02aView commit details -
Configuration menu - View commit details
-
Copy full SHA for b6ff79d - Browse repository at this point
Copy the full SHA b6ff79dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1b5110d - Browse repository at this point
Copy the full SHA 1b5110dView commit details -
Merge branch 'master' of ssh://github.com/oweno-tfwm/UK2GTFS
# Conflicts: # tests/testthat/test_atoc.R
Configuration menu - View commit details
-
Copy full SHA for 1841b45 - Browse repository at this point
Copy the full SHA 1841b45View commit details
Commits on Sep 5, 2023
-
Configuration menu - View commit details
-
Copy full SHA for d56d912 - Browse repository at this point
Copy the full SHA d56d912View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9b67120 - Browse repository at this point
Copy the full SHA 9b67120View commit details -
Configuration menu - View commit details
-
Copy full SHA for 07bce70 - Browse repository at this point
Copy the full SHA 07bce70View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73727ec - Browse repository at this point
Copy the full SHA 73727ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for ba4074f - Browse repository at this point
Copy the full SHA ba4074fView commit details -
Configuration menu - View commit details
-
Copy full SHA for ac957d7 - Browse repository at this point
Copy the full SHA ac957d7View commit details -
1) bug fix for duplicated schedule ID
2) additional test for above 3) added debugging option to make it easier to capture problem services
Configuration menu - View commit details
-
Copy full SHA for 8a3315f - Browse repository at this point
Copy the full SHA 8a3315fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8554bd5 - Browse repository at this point
Copy the full SHA 8554bd5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 92818e8 - Browse repository at this point
Copy the full SHA 92818e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 14af9d9 - Browse repository at this point
Copy the full SHA 14af9d9View commit details -
Merge branch 'master' of github.com:ITSLeeds/UK2GTFS into ITSLeeds-ma…
…ster # Conflicts: # DESCRIPTION # NAMESPACE # R/atoc_export.R # R/atoc_main.R # R/atoc_nr.R # R/gtfs_cleaning.R # R/gtfs_merge.R # R/transxchange.R # data/atoc_agency.rda # man/gtfs_clean.Rd # man/nr2gtfs.Rd
Configuration menu - View commit details
-
Copy full SHA for adffc4d - Browse repository at this point
Copy the full SHA adffc4dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8a7b27f - Browse repository at this point
Copy the full SHA 8a7b27fView commit details -
update to read TIPLOC file in either lat/lon csv format or geometry file
+ more error checking that data files loaded ok
Configuration menu - View commit details
-
Copy full SHA for 67ba10a - Browse repository at this point
Copy the full SHA 67ba10aView commit details
Commits on Sep 6, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 43d4766 - Browse repository at this point
Copy the full SHA 43d4766View commit details -
Configuration menu - View commit details
-
Copy full SHA for a548652 - Browse repository at this point
Copy the full SHA a548652View commit details -
Configuration menu - View commit details
-
Copy full SHA for 77a7e3d - Browse repository at this point
Copy the full SHA 77a7e3dView commit details -
remove older style function and merge functionality to reduce number …
…of code paths and hence improve test coverage
Configuration menu - View commit details
-
Copy full SHA for 8cc04fa - Browse repository at this point
Copy the full SHA 8cc04faView commit details
Commits on Sep 7, 2023
-
fix broken tests after merge of externalisation of data - remove comm…
…on code to function to reduce maintenance
Configuration menu - View commit details
-
Copy full SHA for e6111fd - Browse repository at this point
Copy the full SHA e6111fdView commit details -
Configuration menu - View commit details
-
Copy full SHA for ab1871a - Browse repository at this point
Copy the full SHA ab1871aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 32b09e8 - Browse repository at this point
Copy the full SHA 32b09e8View commit details -
1) further performance, treat dates as int while building timetables
2) switch off "phone home" while loading package as a child process
Configuration menu - View commit details
-
Copy full SHA for a4bf856 - Browse repository at this point
Copy the full SHA a4bf856View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f5daf9 - Browse repository at this point
Copy the full SHA 0f5daf9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7d3191b - Browse repository at this point
Copy the full SHA 7d3191bView commit details
Commits on Sep 8, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 6354966 - Browse repository at this point
Copy the full SHA 6354966View commit details -
Configuration menu - View commit details
-
Copy full SHA for 69622fd - Browse repository at this point
Copy the full SHA 69622fdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c60dd3 - Browse repository at this point
Copy the full SHA 8c60dd3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c47eb7 - Browse repository at this point
Copy the full SHA 0c47eb7View commit details -
1) decrease sensitivity of update check to only look at date instead …
…of date+time (this means if github can't be reached should only nag once per day to update instead of on every single package load) 2) add timeout to update check on package load and make it short (but make default when explicitly called long)
Configuration menu - View commit details
-
Copy full SHA for 87210d6 - Browse repository at this point
Copy the full SHA 87210d6View commit details -
Configuration menu - View commit details
-
Copy full SHA for f8ef3d4 - Browse repository at this point
Copy the full SHA f8ef3d4View commit details -
added public_only and WTT flags to atco import consistent with NR import
(atoc data doesn't seem to have many non-public moves in it to start with)
Configuration menu - View commit details
-
Copy full SHA for d02c8f4 - Browse repository at this point
Copy the full SHA d02c8f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 344ed3e - Browse repository at this point
Copy the full SHA 344ed3eView commit details -
Configuration menu - View commit details
-
Copy full SHA for db3781b - Browse repository at this point
Copy the full SHA db3781bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c39bccc - Browse repository at this point
Copy the full SHA c39bcccView commit details -
performance- create data.table in place instead of by copy, more heav…
…ily vectorise process_activity
Configuration menu - View commit details
-
Copy full SHA for 3d57ad8 - Browse repository at this point
Copy the full SHA 3d57ad8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8b47e7a - Browse repository at this point
Copy the full SHA 8b47e7aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d74249 - Browse repository at this point
Copy the full SHA 8d74249View commit details
Commits on Sep 9, 2023
-
Configuration menu - View commit details
-
Copy full SHA for b7a3795 - Browse repository at this point
Copy the full SHA b7a3795View commit details -
Configuration menu - View commit details
-
Copy full SHA for db1a439 - Browse repository at this point
Copy the full SHA db1a439View commit details
Commits on Sep 10, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 5270ebf - Browse repository at this point
Copy the full SHA 5270ebfView commit details -
Configuration menu - View commit details
-
Copy full SHA for b074b8f - Browse repository at this point
Copy the full SHA b074b8fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 951da04 - Browse repository at this point
Copy the full SHA 951da04View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d28d76 - Browse repository at this point
Copy the full SHA 5d28d76View commit details -
Configuration menu - View commit details
-
Copy full SHA for 745653b - Browse repository at this point
Copy the full SHA 745653bView commit details -
Configuration menu - View commit details
-
Copy full SHA for e7dcbbe - Browse repository at this point
Copy the full SHA e7dcbbeView commit details
Commits on Sep 11, 2023
-
add 'frequencies' to cleaning - otherwise resulting GTFS file can't b…
…e loaded into OTP
Configuration menu - View commit details
-
Copy full SHA for 07995f8 - Browse repository at this point
Copy the full SHA 07995f8View commit details
Commits on Sep 18, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 7f45b96 - Browse repository at this point
Copy the full SHA 7f45b96View commit details
Commits on Sep 19, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 5df39a9 - Browse repository at this point
Copy the full SHA 5df39a9View commit details -
Configuration menu - View commit details
-
Copy full SHA for f32d620 - Browse repository at this point
Copy the full SHA f32d620View commit details -
add support for getting rail data from NAPTAN xml file since that has…
… more permissive licence than ATCO data.
Configuration menu - View commit details
-
Copy full SHA for 0ee68ea - Browse repository at this point
Copy the full SHA 0ee68eaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 62f83cd - Browse repository at this point
Copy the full SHA 62f83cdView commit details
Commits on Sep 20, 2023
-
stop null easting/northing leaking out as invalid lat/long and ensure…
… they are NA instead
Configuration menu - View commit details
-
Copy full SHA for 83a4441 - Browse repository at this point
Copy the full SHA 83a4441View commit details -
alter detection of ships so it actually works- real world data doesn'…
…t completely follow the schema. Also add 'metro' to long name for underground & Tyne&Wear metro services
Configuration menu - View commit details
-
Copy full SHA for 1b6e515 - Browse repository at this point
Copy the full SHA 1b6e515View commit details
Commits on Sep 22, 2023
-
if stop doesn't exist in TIPLOC file - put tiploc code name into rout…
…e name instead of NA
Configuration menu - View commit details
-
Copy full SHA for d889ee5 - Browse repository at this point
Copy the full SHA d889ee5View commit details
Commits on Sep 24, 2023
-
1) when no public arrival time available fall back to WTT time then p…
…ass time 2) when looking at non-public services include passes marked as 'no pickup/dropoff available' from a GTFS perspective
Configuration menu - View commit details
-
Copy full SHA for a148e70 - Browse repository at this point
Copy the full SHA a148e70View commit details