Merge pull request #2 from ITSLeeds/master

Update Zipabout fork

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.github/workflows/check-standard.yaml

@@ -0,0 +1,49 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macos-latest,   r: 'release'}
+          - {os: windows-latest, r: 'release'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true

.github/workflows/pkgdown.yaml

@@ -0,0 +1,48 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+  release:
+    types: [published]
+  workflow_dispatch:
+
+name: pkgdown
+
+jobs:
+  pkgdown:
+    runs-on: ubuntu-latest
+    # Only restrict concurrency for non-PR jobs
+    concurrency:
+      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::pkgdown, local::.
+          needs: website
+
+      - name: Build site
+        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
+        shell: Rscript {0}
+
+      - name: Deploy to GitHub pages 🚀
+        if: github.event_name != 'pull_request'
+        uses: JamesIves/[email protected]
+        with:
+          clean: false
+          branch: gh-pages
+          folder: docs

.github/workflows/test-coverage.yaml

@@ -0,0 +1,50 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+name: test-coverage
+
+jobs:
+  test-coverage:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::covr
+          needs: coverage
+
+      - name: Test coverage
+        run: |
+          covr::codecov(
+            quiet = FALSE,
+            clean = FALSE,
+            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+          )
+        shell: Rscript {0}
+
+      - name: Show testthat output
+        if: always()
+        run: |
+          ## --------------------------------------------------------------------
+          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+        shell: bash
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-test-failures
+          path: ${{ runner.temp }}/package

DESCRIPTION

@@ -1,10 +1,12 @@
 Package: UK2GTFS
 Type: Package
 Title: Converts UK transport timetable datasets to GTFS format
-Version: 0.2
+Version: 0.2.1
 Authors@R: c(
     person("Malcolm", "Morgan", email = "[email protected]", role = c("aut","cre"), 
-      comment = c(ORCID = "0000-0002-9488-9183"))
+      comment = c(ORCID = "0000-0002-9488-9183")),
+    person("Adrian", "Schönig", role = c("ctb")),
+    person("Owen", "O'Neill",  role = c("ctb"))
     )
 Maintainer: Malcolm Morgan <[email protected]>
 Description: The UK uses a range of odd formats to store timetable data, this package converts them to the nice GTFS format.
@@ -15,27 +17,29 @@ URL: https://github.com/itsleeds/uk2gtfs, https://itsleeds.git.io/uk2gtfs/
 BugReports: https://github.com/itsleeds/uk2gtfs/issues
 Encoding: UTF-8
 LazyData: true
+LazyDataCompression: gzip
 Imports:
   checkmate,
+  calendar,
   data.table,
+  dodgr,
   doSNOW,
   dplyr,
-  sf,
-  parallel,
+  digest,
   foreach, 
-  calendar,
   geodist,
+  httr,
   iotools,
-  jsonlite,
-  purrr (>= 1.0),
-  furrr,
-  future,
-  digest,
+  stringr,
+  sf,
+  parallel,
   lubridate,
-  zip,
+  purrr (>= 1.0),
   pbapply,
+  readr (>= 2.0),
+  RcppSimdJson,
   xml2,
-  readr (>= 2.0)
+  zip,
 Suggests: 
     cli,
     covr,

NAMESPACE

@@ -1,12 +1,14 @@
 # Generated by roxygen2: do not edit by hand
 
+export(ATOC_shapes)
 export(atoc2gtfs)
 export(dl_example_file)
 export(get_bank_holidays)
 export(get_naptan)
 export(gtfs_clean)
 export(gtfs_clip)
 export(gtfs_compress)
+export(gtfs_fast_stops)
 export(gtfs_fast_trips)
 export(gtfs_force_valid)
 export(gtfs_interpolate_times)
@@ -24,8 +26,10 @@ export(importFLF)
 export(importMCA)
 export(importMSN)
 export(importTSI)
+export(load_data)
 export(nptdr2gtfs)
 export(nr2gtfs)
 export(station2stops)
 export(transxchange2gtfs)
 export(transxchange_import)
+export(update_data)

R/NI2gtfs.R

@@ -5,7 +5,6 @@
 #' @param path_in Path to CIF file
 #' @param silent Logical, should progress be shown
 #' @return A GTFS named list
-#' @details
 #'
 #'