fix load_cached_network with national sub-dirs

Author: mpadge

DESCRIPTION

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

R/cache.R

@@ -166,7 +166,12 @@ m4ra_load_cached_network <- function (city = NULL, mode = "foot",
 
         mode <- match.arg (tolower (mode), c ("foot", "bicycle", "motorcar"))
 
-        flist <- fs::dir_ls (fs::path (m4ra_cache_dir (), city), regexp = mode)
+        flist <- fs::dir_ls (m4ra_cache_dir (), type = "directory", recurse = TRUE)
+        city_dir <- flist [which (basename (flist) == city)]
+        if (length (city_dir) > 1L) {
+            cli::cli_abort ("Ambiguous city directories at {city_dir}.")
+        }
+        flist <- fs::dir_ls (city_dir, regexp = mode)
 
         f <- grep (ptn, flist, value = TRUE)
 

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.044",
+  "version": "0.1.1.045",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",