fix 'gtfs_next_intervals' when stops in feed has duplicated ids

Author: mpadge

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: m4ra
 Title: Many-to-Many Multi-Modal Routing Aggregator
-Version: 0.1.1.051
+Version: 0.1.1.052
 Authors@R: 
     person(given = "Mark",
            family = "Padgham",

R/gtfs.R

@@ -122,7 +122,7 @@ m4ra_gtfs_traveltimes <- function (gtfs,
         res_i [res_i == .Machine$integer.max] <- NA_integer_
 
         rownames (res_i) <- stops
-        colnames (res_i) <- gtfs$stops$stop_id
+        colnames (res_i) <- gtfs$stop_ids$stop_id
 
         # diag (res_i) <- 0L # diagonals set in "prepare-data" routines
 
@@ -140,6 +140,13 @@ m4ra_gtfs_traveltimes <- function (gtfs,
 
 #' Main function to calculate intervals to next fastest connection, called from
 #' `m4ra_gtfs_traveltimes()` if `next_interval = TRUE`.
+#'
+#' @param res Result of rcpp_traveltimes as a list of matrices (n, 3), where n
+#' is the number of "stop_id" values in gtfs$stops. The 'gtfs_next_start_times'
+#' routine returns a matrix with number of rows equal to 'nrow(gtfs$stop_ids)',
+#' which is generally less, because that is unique IDs only. The two have to
+#' reconciled below.
+#'
 #' @noRd
 gtfs_next_intervals <- function (gtfs, stops, res, start_time_limits) {
 
@@ -173,6 +180,10 @@ gtfs_next_intervals <- function (gtfs, stops, res, start_time_limits) {
     )
     next_starts [next_starts <= 0] <- NA_integer_
 
+    # reduce dimension to only unique stops:
+    index <- match (gtfs$stop_ids$stop_ids, gtfs$stops$stop_id)
+    next_starts <- next_starts [, index]
+
     first_starts <- lapply (res, function (i) as.vector (i [, 1]))
     first_starts <- do.call (rbind, first_starts)
     first_starts [first_starts == .Machine$integer.max | first_starts <= 0] <- NA_integer_
@@ -182,7 +193,7 @@ gtfs_next_intervals <- function (gtfs, stops, res, start_time_limits) {
     # diag (next_interval) <- NA_integer_
 
     rownames (next_interval) <- stops
-    colnames (next_interval) <- gtfs$stops$stop_id
+    colnames (next_interval) <- gtfs$stop_ids$stop_id
 
     return (next_interval)
 }

codemeta.json

@@ -7,7 +7,7 @@
   "codeRepository": "https://github.com/UrbanAnalyst/m4ra",
   "issueTracker": "https://github.com/UrbanAnalyst/m4ra/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.1.051",
+  "version": "0.1.1.052",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",