switch on distances param in match_pts_to_graph for #103

UrbanAnalyst · Sep 4, 2022 · cb4ab14 · cb4ab14
1 parent 42237a0
commit cb4ab14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dodgr
 Title: Distances on Directed Graphs
-Version: 0.2.15.011
+Version: 0.2.15.012
 Authors@R: c(
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre")),
     person("Andreas", "Petutschnig", role = "aut"),

diff --git a/R/match-points.R b/R/match-points.R
@@ -162,11 +162,14 @@ match_pts_to_graph <- function (graph, xy,
     # rcpp_points_index is 0-indexed, so ...
     graph_index <- as.integer (res [index]) + 1L
 
-    # ret <- data.frame (
-    #    index = graph_index,
-    #    d_signed = signed_intersection_dists (graph, xy, res)
-    # )
-    ret <- graph_index
+    if (distances) {
+        ret <- data.frame (
+            index = graph_index,
+            d_signed = signed_intersection_dists (graph, xy, res)
+        )
+    } else {
+        ret <- graph_index
+    }
 
     return (ret)
 }

diff --git a/codemeta.json b/codemeta.json
@@ -7,7 +7,7 @@
   "codeRepository": "https://github.com/ATFutures/dodgr",
   "issueTracker": "https://github.com/ATFutures/dodgr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.2.15.011",
+  "version": "0.2.15.012",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",