Code

Merge changes from TfWM#58

Code

Open

oweno-tfwm wants to merge 87 commits intoitsleeds:masteritsleeds/UK2GTFS:masterfrom oweno-tfwm:merge-leeds-trunkoweno-tfwm/UK2GTFS:merge-leeds-trunkCopy head branch name to clipboard

+4,442-1,097

Commits

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

  oweno-tfwm

  committed
  1a7c832

Commits on Aug 24, 2023

• trip id is a varchar in BODS data - remove assumption that it's an int

  oweno-tfwm

  committed
  b31dfb7

• exception_type is an int - tests failing after tightening up data type definitions

  oweno-tfwm

  committed
  074826c

• code was assuming a set of tables, and hence dumping tables like 'frequencies' and 'feed_info' when reading / writing BODS data.

  Show description for 8d4c2d8
  oweno-tfwm

  committed
  8d4c2d8

• merge was expecting a fixed set of tables and columns and throwing away anything else that it wasn't expecting. OK for the GTFS tables generated by this tool from CIF files, but caused data loss wh…

  Show description for ccd451e
  oweno-tfwm

  committed
  ccd451e

• added FOC YG + MV (appearing in NR timetable extracts)

  Show description for c9f7cce
  oweno-tfwm

  committed
  c9f7cce

Commits on Aug 25, 2023

• fix null columns being inserted in calendar_dates key field when a calendar_date exists with no calendar (rare but valid data configuration)

  oweno-tfwm

  committed
  0033338

• correct comment - column is a 3 valued enum, not bool

  oweno-tfwm

  committed
  bf8f460

• pass 'silent' value down the call stack and give some level of warning about merge() failing

  oweno-tfwm

  committed
  f04ae8b

• format frequencies table columns correctly

  oweno-tfwm

  committed
  b4b5651

• exercise more code paths with test by producing more verbose output

  oweno-tfwm

  committed
  4048f27

• Merge branch 'oo-tfwm-performance' of ssh://github.com/oweno-tfwm/UK2GTFS into oo-tfwm-performance

  oweno-tfwm

  committed
  bb1220d

• Merge pull request #2 from ITSLeeds/master

  Show description for 772e072
  oweno-tfwm

  authored
  772e072

• Merge branch 'master' into oo-tfwm-performance

  oweno-tfwm

  authored
  5cb490c

• Merge pull request #3 from oweno-tfwm/oo-tfwm-performance

  Show description for c199bb4
  oweno-tfwm

  authored
  c199bb4

Commits on Aug 29, 2023

• stop errors in merge() being swallowed silently, with the only clue to the caller being a different shaped structure being passed back

  oweno-tfwm

  committed
  8391315

• add additional combinations of activity codes arising from reading entries in LO table

  oweno-tfwm

  committed
  baf5346

• fix activity not being read from LO

  Show description for 8742c56
  oweno-tfwm

  committed
  8742c56

• rebuild documentation

  oweno-tfwm

  committed
  77aa421

• workround roxygen bug

  oweno-tfwm

  committed
  1c55584

• add unit test for overlay code

  oweno-tfwm

  committed
  3078c81

• add unit test - the test currently passes - but the results look all wrong, overlays not being applied correctly

  oweno-tfwm

  committed
  d0218c7

Commits on Sep 4, 2023

• performance improvement - do evaluation outside data.table then insert afterwards

  oweno-tfwm

  committed
  618ffa6

• make code more compact so more of function can be seen on one screen

  oweno-tfwm

  committed
  8b6990d

• move formatting to helper function which generically processes all tables, change default options to highest performing write combination

  oweno-tfwm

  committed
  14c2d45

• major overhaul to fix issues in timetable overlay rule processing - has also been extensively profiled and reasonable level of optimisation applied

  oweno-tfwm

  committed
  79a175e

• move basic unit tests to their own file - add large number of unit tests for revised overlay functionality

  oweno-tfwm

  committed
  2c7cd1f

• rename write_gtfs to gtfs_write so it's consistent with other files

  oweno-tfwm

  committed
  47def4b

• split atoc_export up because it's now far too long and my finger aches from too much scrolling

  oweno-tfwm

  committed
  fa0e8c0

• add file split from atoc_export

  oweno-tfwm

  committed
  a40c02a

• up-rev version number, add author comment, fix warning in unit test

  oweno-tfwm

  committed
  b6ff79d

• spelling mistake

  oweno-tfwm

  committed
  1b5110d

• Merge branch 'master' of ssh://github.com/oweno-tfwm/UK2GTFS

  Show description for 1841b45
  oweno-tfwm

  committed
  1841b45

Commits on Sep 5, 2023

• spelling

  oweno-tfwm

  committed
  d56d912

• spelling

  oweno-tfwm

  committed
  9b67120

• spelling

  oweno-tfwm

  committed
  07bce70

• spelling

  oweno-tfwm

  committed
  73727ec

• fix bug contributed by my cat.

  oweno-tfwm

  committed
  ba4074f

• spelling

  oweno-tfwm

  committed
  ac957d7

• 1) bug fix for duplicated schedule ID

  Show description for 8a3315f
  oweno-tfwm

  committed
  8a3315f

• tidy up logging messages

  oweno-tfwm

  committed
  8554bd5

• updated comment after documentation build

  oweno-tfwm

  committed
  92818e8

• fix warnings during tests

  oweno-tfwm

  committed
  14af9d9

• Merge branch 'master' of github.com:ITSLeeds/UK2GTFS into ITSLeeds-master

  Show description for adffc4d
  oweno-tfwm

  committed
  adffc4d

• don't think this should be under version control ?

  oweno-tfwm

  committed
  8a7b27f

• update to read TIPLOC file in either lat/lon csv format or geometry file

  Show description for 67ba10a
  oweno-tfwm

  committed
  67ba10a

Commits on Sep 6, 2023

• reduce double space to single space

  oweno-tfwm

  committed
  43d4766

• swap lat and long round when reading from .rda file (was getting swapped by mistake)

  oweno-tfwm

  committed
  a548652

• stop update code blowing up as thread loads

  oweno-tfwm

  committed
  77a7e3d

• remove older style function and merge functionality to reduce number of code paths and hence improve test coverage

  oweno-tfwm

  committed
  8cc04fa

Commits on Sep 7, 2023

• fix broken tests after merge of externalisation of data - remove common code to function to reduce maintenance

  oweno-tfwm

  committed
  e6111fd

• bit more error checking - that we have stops before starting next part of process

  oweno-tfwm

  committed
  ab1871a

• performance tuning

  oweno-tfwm

  committed
  32b09e8

• 1) further performance, treat dates as int while building timetables

  Show description for a4bf856
  oweno-tfwm

  committed
  a4bf856

• make process dates as int work in child processes

  oweno-tfwm

  committed
  0f5daf9

• comment update after investigating hand when >1 thread used

  oweno-tfwm

  committed
  7d3191b

Commits on Sep 8, 2023

• remove test code

  oweno-tfwm

  committed
  6354966

• fix warning message typo

  oweno-tfwm

  committed
  69622fd

• more informative warning message about bad data

  oweno-tfwm

  committed
  8c60dd3

• tidy up exception handling

  oweno-tfwm

  committed
  0c47eb7

• 1) decrease sensitivity of update check to only look at date instead of date+time

  Show description for 87210d6
  oweno-tfwm

  committed
  87210d6

• documentation update

  oweno-tfwm

  committed
  f8ef3d4

• added public_only and WTT flags to atco import consistent with NR import

  Show description for d02c8f4
  oweno-tfwm

  committed
  d02c8f4

• rebuilt documentation after adding 2 parameters

  oweno-tfwm

  committed
  344ed3e

• added missing dependency

  oweno-tfwm

  committed
  db3781b

• reduce build warning about undeclared variables in data.table joins

  oweno-tfwm

  committed
  c39bccc

• performance- create data.table in place instead of by copy, more heavily vectorise process_activity

  oweno-tfwm

  committed
  3d57ad8

• final performance optimisation

  oweno-tfwm

  committed
  8b47e7a

• typo

  oweno-tfwm

  committed
  8d74249

Commits on Sep 9, 2023

• bug fix for strange data.table / Period memory allocation problem

  oweno-tfwm

  committed
  b7a3795

• bring in seconds from WTT instead of throwing them away

  oweno-tfwm

  committed
  db1a439

Commits on Sep 10, 2023

• further information on bug workaround

  oweno-tfwm

  committed
  5270ebf

• performance optimisation when copying row data

  oweno-tfwm

  committed
  b074b8f

• performance optimisations while reading input file

  oweno-tfwm

  committed
  951da04

• small performance improvement

  oweno-tfwm

  committed
  5d28d76

• documentation update

  oweno-tfwm

  committed
  745653b

• fix build warning about missing import

  oweno-tfwm

  committed
  e7dcbbe

Commits on Sep 11, 2023

• add 'frequencies' to cleaning - otherwise resulting GTFS file can't be loaded into OTP

  oweno-tfwm

  committed
  07995f8

Commits on Sep 18, 2023

• code tidy - mark everything as integer

  oweno-tfwm

  committed
  7f45b96

Commits on Sep 19, 2023

• explanatory comment why data is mangled

  oweno-tfwm

  committed
  5df39a9

• better mapping of additional field onto field defined in GTFS standard

  oweno-tfwm

  committed
  f32d620

• add support for getting rail data from NAPTAN xml file since that has more permissive licence than ATCO data.

  oweno-tfwm

  committed
  0ee68ea

• further little code tidy adding L decoration to numbers

  oweno-tfwm

  committed
  62f83cd

Commits on Sep 20, 2023

• stop null easting/northing leaking out as invalid lat/long and ensure they are NA instead

  oweno-tfwm

  committed
  83a4441

• alter detection of ships so it actually works- real world data doesn't completely follow the schema.

  Show description for 1b6e515
  oweno-tfwm

  committed
  1b6e515

Commits on Sep 22, 2023

• if stop doesn't exist in TIPLOC file - put tiploc code name into route name instead of NA

  oweno-tfwm

  committed
  d889ee5

Commits on Sep 24, 2023

• 1) when no public arrival time available fall back to WTT time then pass time

  Show description for a148e70
  oweno-tfwm

  committed
  a148e70