fix bug in connect-highways

Author: mpadge

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: osmplotr
 Title: Bespoke Images of 'OpenStreetMap' Data
-Version: 0.3.5.027
+Version: 0.3.5.028
 Authors@R: 
     c(person(given = "Mark",
              family = "Padgham",
@@ -40,6 +40,7 @@ Imports:
     spatstat.geom
 Suggests:
     curl,
+    geodist,
     knitr,
     magrittr,
     markdown,

R/connect-highways.R

@@ -63,6 +63,8 @@
 #' @export
 connect_highways <- function (highways, bbox, plot = FALSE) {
 
+    requireNamespace ("geodist", quietly = TRUE)
+
     if (missing (highways)) {
         stop ("A vector of highway names must be given")
     }
@@ -430,19 +432,23 @@ sps_through_cycle <- function (ways, cyc) {
             logical (1L)
         ))
         combs <- expand.grid (index_f, index_t)
-        cm <- osmplotr:::get_conmat (ways [[c0]])
-        asp <- e1071::allShortestPaths (cm)
-        paths <- apply (combs, 1, function (i) {
-            unique (e1071::extractPath (asp, i [1], i [2]))
-        }, simplify = FALSE)
-        path_lens <- vapply (paths, length, integer (1L))
-        paths <- paths [which (path_lens == min (path_lens))]
+        if (length (w0) > 1L) {
+            cm <- get_conmat (w0)
+            asp <- e1071::allShortestPaths (cm)
+            paths <- apply (combs, 1, function (i) {
+                unique (e1071::extractPath (asp, i [1], i [2]))
+            }, simplify = FALSE)
+            path_lens <- vapply (paths, length, integer (1L))
+            paths <- paths [which (path_lens == min (path_lens))]
+        } else {
+            paths <- list (1L)
+        }
         if (length (paths) > 1L) {
             # Choose paths with outermost elements:
-            dmax <- vapply (paths, function (p) {
+            dmax <- lapply (paths, function (p) {
                 these_ways <- do.call (rbind, w0 [p])
                 max (geodist::geodist (xy0, these_ways))
-            }, numeric (1L))
+            })
             paths <- paths [[which.max (dmax)]]
         }
         ways [[c0]] <- ways [[c0]] [unlist (paths)]

codemeta.json

@@ -8,13 +8,13 @@
   "codeRepository": "https://github.com/ropensci/osmplotr",
   "issueTracker": "https://github.com/ropensci/osmplotr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.3.5.027",
+  "version": "0.3.5.28",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.4.2 (2024-10-31)",
+  "runtimePlatform": "R version 4.5.1 (2025-06-13)",
   "author": [
     {
       "@type": "Person",
@@ -73,6 +73,18 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=curl"
     },
+    {
+      "@type": "SoftwareApplication",
+      "identifier": "geodist",
+      "name": "geodist",
+      "provider": {
+        "@id": "https://cran.r-project.org",
+        "@type": "Organization",
+        "name": "Comprehensive R Archive Network (CRAN)",
+        "url": "https://cran.r-project.org"
+      },
+      "sameAs": "https://CRAN.R-project.org/package=geodist"
+    },
     {
       "@type": "SoftwareApplication",
       "identifier": "knitr",
@@ -279,31 +291,17 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=spatstat.geom"
     },
-    "SystemRequirements": {}
+    "SystemRequirements": null
   },
-  "fileSize": "1371.45KB",
-  "releaseNotes": "https://github.com/ropensci/osmplotr/blob/master/NEWS.md",
+  "fileSize": "3214.001KB",
+  "releaseNotes": "https://github.com/ropensci/osmplotr/blob/main/NEWS.md",
   "readme": "https://github.com/ropensci/osmplotr/blob/main/README.md",
-  "contIntegration": [
-    "https://github.com/ropensci/osmplotr/actions?query=workflow%3AR-CMD-check",
-    "https://app.codecov.io/gh/ropensci/osmplotr"
-  ],
+  "contIntegration": ["https://github.com/ropensci/osmplotr/actions?query=workflow%3AR-CMD-check", "https://app.codecov.io/gh/ropensci/osmplotr"],
   "developmentStatus": "https://www.repostatus.org/",
   "review": {
     "@type": "Review",
     "url": "https://github.com/ropensci/software-review/issues/27",
     "provider": "https://ropensci.org"
   },
-  "keywords": [
-    "osm",
-    "openstreetmap",
-    "overpass-api",
-    "overpass",
-    "data-visualisation",
-    "highlighting-clusters",
-    "r",
-    "rstats",
-    "r-package",
-    "peer-reviewed"
-  ]
+  "keywords": ["osm", "openstreetmap", "overpass-api", "overpass", "data-visualisation", "highlighting-clusters", "r", "rstats", "r-package", "peer-reviewed"]
 }