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

Merge changes from TfWM V2 #66

Closed
wants to merge 87 commits into from

Commits on Aug 15, 2023

  1. 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
    oweno-tfwm committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    1a7c832 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Configuration menu
    Copy the full SHA
    b31dfb7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    074826c View commit details
    Browse the repository at this point in the history
  3. 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.
    oweno-tfwm committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    8d4c2d8 View commit details
    Browse the repository at this point in the history
  4. 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.
    oweno-tfwm committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    ccd451e View commit details
    Browse the repository at this point in the history
  5. added FOC YG + MV (appearing in NR timetable extracts)

    renamed ZZ to reflect it's a generic obfuscated freight, not a specific operator
    oweno-tfwm committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    c9f7cce View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. fix null columns being inserted in calendar_dates key field when a ca…

    …lendar_date exists with no calendar (rare but valid data configuration)
    oweno-tfwm committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    0033338 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bf8f460 View commit details
    Browse the repository at this point in the history
  3. pass 'silent' value down the call stack and give some level of warnin…

    …g about merge() failing
    oweno-tfwm committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    f04ae8b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b4b5651 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4048f27 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'oo-tfwm-performance' of ssh://github.com/oweno-tfwm/UK2…

    …GTFS into oo-tfwm-performance
    oweno-tfwm committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    bb1220d View commit details
    Browse the repository at this point in the history
  7. Merge pull request #2 from ITSLeeds/master

    merge up to latest leeds master
    oweno-tfwm authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    772e072 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5cb490c View commit details
    Browse the repository at this point in the history
  9. 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
    oweno-tfwm authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    c199bb4 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. stop errors in merge() being swallowed silently, with the only clue t…

    …o the caller being a different shaped structure being passed back
    oweno-tfwm committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    8391315 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    baf5346 View commit details
    Browse the repository at this point in the history
  3. 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
    oweno-tfwm committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    8742c56 View commit details
    Browse the repository at this point in the history
  4. rebuild documentation

    oweno-tfwm committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    77aa421 View commit details
    Browse the repository at this point in the history
  5. workround roxygen bug

    oweno-tfwm committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    1c55584 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3078c81 View commit details
    Browse the repository at this point in the history
  7. add unit test - the test currently passes - but the results look all …

    …wrong, overlays not being applied correctly
    oweno-tfwm committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    d0218c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Configuration menu
    Copy the full SHA
    618ffa6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b6990d View commit details
    Browse the repository at this point in the history
  3. move formatting to helper function which generically processes all ta…

    …bles, change default options to highest performing write combination
    oweno-tfwm committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    14c2d45 View commit details
    Browse the repository at this point in the history
  4. major overhaul to fix issues in timetable overlay rule processing - h…

    …as also been extensively profiled and reasonable level of optimisation applied
    oweno-tfwm committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    79a175e View commit details
    Browse the repository at this point in the history
  5. move basic unit tests to their own file - add large number of unit te…

    …sts for revised overlay functionality
    oweno-tfwm committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    2c7cd1f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    47def4b View commit details
    Browse the repository at this point in the history
  7. split atoc_export up because it's now far too long and my finger ache…

    …s from too much scrolling
    oweno-tfwm committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    fa0e8c0 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a40c02a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b6ff79d View commit details
    Browse the repository at this point in the history
  10. spelling mistake

    oweno-tfwm committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    1b5110d View commit details
    Browse the repository at this point in the history
  11. Merge branch 'master' of ssh://github.com/oweno-tfwm/UK2GTFS

    # Conflicts:
    #	tests/testthat/test_atoc.R
    oweno-tfwm committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    1841b45 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. spelling

    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    d56d912 View commit details
    Browse the repository at this point in the history
  2. spelling

    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    9b67120 View commit details
    Browse the repository at this point in the history
  3. spelling

    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    07bce70 View commit details
    Browse the repository at this point in the history
  4. spelling

    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    73727ec View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ba4074f View commit details
    Browse the repository at this point in the history
  6. spelling

    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    ac957d7 View commit details
    Browse the repository at this point in the history
  7. 1) bug fix for duplicated schedule ID

    2) additional test for above
    3) added debugging option to make it easier to capture problem services
    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    8a3315f View commit details
    Browse the repository at this point in the history
  8. tidy up logging messages

    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    8554bd5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    92818e8 View commit details
    Browse the repository at this point in the history
  10. fix warnings during tests

    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    14af9d9 View commit details
    Browse the repository at this point in the history
  11. 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
    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    adffc4d View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8a7b27f View commit details
    Browse the repository at this point in the history
  13. update to read TIPLOC file in either lat/lon csv format or geometry file

    + more error checking that data files loaded ok
    oweno-tfwm committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    67ba10a View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Configuration menu
    Copy the full SHA
    43d4766 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a548652 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    77a7e3d View commit details
    Browse the repository at this point in the history
  4. remove older style function and merge functionality to reduce number …

    …of code paths and hence improve test coverage
    oweno-tfwm committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    8cc04fa View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. fix broken tests after merge of externalisation of data - remove comm…

    …on code to function to reduce maintenance
    oweno-tfwm committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    e6111fd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ab1871a View commit details
    Browse the repository at this point in the history
  3. performance tuning

    oweno-tfwm committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    32b09e8 View commit details
    Browse the repository at this point in the history
  4. 1) further performance, treat dates as int while building timetables

    2) switch off "phone home" while loading package as a child process
    oweno-tfwm committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    a4bf856 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0f5daf9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7d3191b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. remove test code

    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    6354966 View commit details
    Browse the repository at this point in the history
  2. fix warning message typo

    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    69622fd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8c60dd3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0c47eb7 View commit details
    Browse the repository at this point in the history
  5. 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)
    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    87210d6 View commit details
    Browse the repository at this point in the history
  6. documentation update

    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    f8ef3d4 View commit details
    Browse the repository at this point in the history
  7. 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)
    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    d02c8f4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    344ed3e View commit details
    Browse the repository at this point in the history
  9. added missing dependency

    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    db3781b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c39bccc View commit details
    Browse the repository at this point in the history
  11. performance- create data.table in place instead of by copy, more heav…

    …ily vectorise process_activity
    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    3d57ad8 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8b47e7a View commit details
    Browse the repository at this point in the history
  13. typo

    oweno-tfwm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    8d74249 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2023

  1. Configuration menu
    Copy the full SHA
    b7a3795 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    db1a439 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. Configuration menu
    Copy the full SHA
    5270ebf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b074b8f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    951da04 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5d28d76 View commit details
    Browse the repository at this point in the history
  5. documentation update

    oweno-tfwm committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    745653b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e7dcbbe View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Configuration menu
    Copy the full SHA
    07995f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Configuration menu
    Copy the full SHA
    7f45b96 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Configuration menu
    Copy the full SHA
    5df39a9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f32d620 View commit details
    Browse the repository at this point in the history
  3. add support for getting rail data from NAPTAN xml file since that has…

    … more permissive licence than ATCO data.
    oweno-tfwm committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    0ee68ea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    62f83cd View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Configuration menu
    Copy the full SHA
    83a4441 View commit details
    Browse the repository at this point in the history
  2. 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
    oweno-tfwm committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    1b6e515 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Configuration menu
    Copy the full SHA
    d889ee5 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. 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
    oweno-tfwm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    a148e70 View commit details
    Browse the repository at this point in the history