From 7d8740063b30c13394aead418f0ae1f4b8225fb7 Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Mon, 9 Feb 2026 22:56:03 +0100
Subject: [PATCH 1/9] Add "snapped_distance" measure to osrmTable that adjusts
 distances by source/destination snapping distances

---
 R/osrmTable.R                      |  32 ++++++++++++++++++++++++-----
 inst/tinytest/coord_format_out.rds | Bin 283 -> 404 bytes
 inst/tinytest/test_osrmTable.R     |  13 ++++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/R/osrmTable.R b/R/osrmTable.R
index 963301d..fd60c8b 100644
--- a/R/osrmTable.R
+++ b/R/osrmTable.R
@@ -130,14 +130,21 @@ osrmTable <- function(src,
   if (!missing(exclude)) {
     url <- paste0(url, "exclude=", exclude, "&")
   }
+
+  # Manage "snapped_distance" measure
+  snapped <- "snapped_distance" %in% measure
+  measure_api <- setdiff(measure, "snapped_distance")
+  if (snapped && !("distance" %in% measure_api)) {
+    measure_api <- c(measure_api, "distance")
+  }
+
   # adding measure parameter
   url <- paste0(
     url,
     "annotations=",
-    paste0(measure, collapse = ","),
+    paste0(measure_api, collapse = ","),
     "&generate_hints=false"
   )
-  # print(url)
   e <- try(
     {
       req_handle <- curl::new_handle(verbose = FALSE)
@@ -155,9 +162,6 @@ osrmTable <- function(src,
 
   res <- RcppSimdJson::fparse(rawToChar(r$content))
 
-  # create dummy dataset for tests
-  # return(list(res = res, src = src_r, dst = dst_r))
-
   # format results
   output <- list()
   if (!is.null(res$durations)) {
@@ -180,5 +184,23 @@ osrmTable <- function(src,
   coords <- coord_format(res = res, src = src_r, dst = dst_r)
   output$sources <- coords$sources
   output$destinations <- coords$destinations
+
+  # compute snapped distances
+  if (snapped && !is.null(output$distances)) {
+    src_snap <- output$sources$snapping_distance
+    dst_snap <- output$destinations$snapping_distance
+    snap_sum <- outer(src_snap, dst_snap, "+")
+    output$snapped_distances <- output$distances + snap_sum
+    
+    # fix self-distance
+    ids_match <- outer(rownames(output$snapped_distances), 
+                       colnames(output$snapped_distances), "==")
+    output$snapped_distances[ids_match] <- 0
+    
+    if (!("distance" %in% measure)) {
+      output$distances <- NULL
+    }
+  }
+
   return(output)
 }
diff --git a/inst/tinytest/coord_format_out.rds b/inst/tinytest/coord_format_out.rds
index 7688e2f63f05f7742287b018e40f1038766f5895..7f83f4a3c899e370de006b9b78b34f38e175da5e 100644
GIT binary patch
delta 349
zcmV-j0iyn!0+a(WABzY80000000WEQVqjokW?*4uVqj(kG8tGyL)>&N7#Ns@fgC2F
zoG@4c0|Ot3c9AbKe_Wn>{lSRe&Nm$l?Y`$FvaNPd`n=+3TYDY@0}IeD21W)J22PM8
z@)C1Xi-8OQi0i<D%sKgaaAsl&lqp!8msn7cnU@})l384mn3tT2W)^2rez_ht^B4_b
z3?mrB7~LJoIf=zEeK0|;l*E!my|f~rkwD%*j3CnH;@E#kk+Tzj5k&SIy(YMGJ9s%L
z-&B@K1@eOgT~0rO%Ui2F{C?eLl7k#``NJJ=WgOH`7k?IeTnKR*<9~`mg$bnn9VBMq
z9^y|)O-n5*N==C`E-3=)L6c@lN-R!=it&QQAujlbBnI+53n;*Vm<>rC14JFjYG#<r
vafTy`|Cpev*o*TZON)|$kq6=Oq@)&?WacH7Waj6ABIX|ew_K`s!2$pP!U2)z

delta 222
zcmV<403rXB1DgUbABzY80000000WEQVqjokW?*4rWMF0mG8tGyL)>&N7#Ns@fgC2F
z9F%6@11WToF)~d9&<3D9BLfQqC&-e##N5<kAVUCbI7E;+CqEC)Oe{gylAM!R4ATM=
z<Vr~_Nz_X#0-A=VoU<suTo2h6W~c<CA&g-JV;BR8e;7X1k=+<o;ZysKUK8B89lRWr
zZz{{A0{KCLE~g(s+`;&t7|${NC*&XI|LD#)fiX;B3^R!Hv0BSsoL^d$3=9MamnS8)
YxFj<#u_QA;4-_!}036o^*Z%<k0I+*h-T(jq

diff --git a/inst/tinytest/test_osrmTable.R b/inst/tinytest/test_osrmTable.R
index 3248131..f05f2de 100644
--- a/inst/tinytest/test_osrmTable.R
+++ b/inst/tinytest/test_osrmTable.R
@@ -144,4 +144,17 @@ if(local_server){
   expect_error(osrmTable(loc = x_sf[1:10, ], 
                          osrm.server = "http://0.0.0.0:5100/", 
                          osrm.profile = "car"))
+  
+  # snapped_distance
+  A <- osrmTable(loc = x_sf[1:5, ], measure = "snapped_distance")
+  expect_true(!is.null(A$snapped_distances))
+  expect_true(is.null(A$distances))
+  expect_equal(dim(A$snapped_distances), c(5,5))
+  expect_equal(diag(A$snapped_distances), rep(0, 5))
+  
+  B <- osrmTable(loc = x_sf[1:5, ], measure = c("distance", "snapped_distance"))
+  expect_true(!is.null(B$distances))
+  expect_true(!is.null(B$snapped_distances))
+  expect_equal(B$snapped_distances[1,2], 
+               B$distances[1,2] + B$sources$snapping_distance[1] + B$destinations$snapping_distance[2])
 }
\ No newline at end of file

From 1b69258ab26577c66c1c0c993a5b0dbbd14bfbc8 Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Mon, 9 Feb 2026 23:09:48 +0100
Subject: [PATCH 2/9] Add snapping distance information to osrmRoute output

Expose OSRM waypoint snapping distances in route results: add `src_snapping_distance` and `dst_snapping_distance` fields to the returned sf object, attach full snapped waypoints as a `snapping` attribute, and include snapping distances in source/destination coordinate formatting. Update documentation and tests accordingly.
---
 R/osrmRoute.R                  | 26 +++++++++++++++++++++-----
 R/utils.R                      |  4 ++++
 inst/tinytest/test_osrmRoute.R | 32 ++++++++++++++++++++++++--------
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/R/osrmRoute.R b/R/osrmRoute.R
index 20d1763..ece6d30 100644
--- a/R/osrmRoute.R
+++ b/R/osrmRoute.R
@@ -51,12 +51,19 @@
 #' @param osrm.profile the routing profile to use, e.g. "car", "bike" or "foot".
 #' @return
 #' The output of this function is an sf LINESTRING of the shortest route.\cr
-#' It contains 4 fields: \itemize{
-#'   \item starting point identifier
-#'   \item destination identifier
-#'   \item travel time in minutes
-#'   \item travel distance in kilometers.
+#' It contains 6 fields: \itemize{
+#'   \item src: starting point identifier
+#'   \item dst: destination identifier
+#'   \item duration: travel time in minutes
+#'   \item distance: travel distance in kilometers
+#'   \item src_snapping_distance: distance from the starting point to the
+#'   snapped point on the network (in kilometers)
+#'   \item dst_snapping_distance: distance from the destination to the
+#'   snapped point on the network (in kilometers)
 #'   }
+#' The object also contains a \code{snapping} attribute that stores a data.frame
+#' of all snapped waypoints (including middle points if \code{loc} is used).
+#'
 #' If src (or loc) is a vector, a data.frame or a matrix, the coordinate
 #' reference system (CRS) of the route is EPSG:4326 (WGS84).\cr
 #' If src (or loc) is an sfc or sf object, the route has the same CRS
@@ -77,6 +84,12 @@
 #' plot(st_geometry(route1))
 #' plot(st_geometry(apotheke.sf[c(1, 16), ]), col = "red", pch = 20, add = TRUE)
 #'
+#' # View snapping distance
+#' route1$src_snapping_distance
+#'
+#' # View all snapped waypoints (including via points)
+#' attr(route1, "snapping")
+#'
 #' # Return only duration and distance
 #' route3 <- osrmRoute(
 #'   src = apotheke.df[1, c("lon", "lat")],
@@ -193,10 +206,13 @@ osrmRoute <- function(src,
     src = id1, dst = id2,
     duration = res$routes$duration / 60,
     distance = res$routes$distance / 1000,
+    src_snapping_distance = res$waypoints$distance[1] / 1000,
+    dst_snapping_distance = res$waypoints$distance[nrow(res$waypoints)] / 1000,
     geometry = st_as_sfc(paste0("LINESTRING(", rcoords, ")")),
     crs = 4326,
     row.names = paste(id1, id2, sep = "_")
   )
+  attr(rosf, "snapping") <- res$waypoints
   # prj
   if (!is.na(oprj)) {
     rosf <- st_transform(rosf, oprj)
diff --git a/R/utils.R b/R/utils.R
index 3196b16..0e70842 100644
--- a/R/utils.R
+++ b/R/utils.R
@@ -52,6 +52,8 @@ coord_format <- function(res, src, dst) {
     ncol = 2, byrow = TRUE,
     dimnames = list(src$id, c("lon", "lat"))
   ))
+  sources$snapping_distance <- res$sources$distance
+  
   destinations <- data.frame(matrix(
     unlist(res$destinations$location,
       use.names = TRUE
@@ -59,6 +61,8 @@ coord_format <- function(res, src, dst) {
     ncol = 2, byrow = TRUE,
     dimnames = list(dst$id, c("lon", "lat"))
   ))
+  destinations$snapping_distance <- res$destinations$distance
+  
   return(list(sources = sources, destinations = destinations))
 }
 
diff --git a/inst/tinytest/test_osrmRoute.R b/inst/tinytest/test_osrmRoute.R
index d53abfa..b17b505 100644
--- a/inst/tinytest/test_osrmRoute.R
+++ b/inst/tinytest/test_osrmRoute.R
@@ -8,7 +8,9 @@ if(demo_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -17,7 +19,9 @@ if(demo_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance
@@ -34,7 +38,9 @@ if(demo_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -43,7 +49,9 @@ if(demo_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance
@@ -62,7 +70,9 @@ if(demo_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
 
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -71,7 +81,9 @@ if(demo_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance
@@ -109,7 +121,9 @@ if(local_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -117,7 +131,9 @@ if(local_server){
   expect_identical(st_crs(r), st_crs(x_sf))
   expect_true(nrow(r) == 1)
   expect_identical(colnames(r), 
-                   c("src", "dst", "duration", "distance", "geometry"))
+                   c("src", "dst", "duration", "distance", "src_snapping_distance", 
+                     "dst_snapping_distance", "geometry"))
+  expect_true(!is.null(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance

From d651ceb7ec4718e646db79d898717ebdb5f428e4 Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Mon, 9 Feb 2026 23:22:39 +0100
Subject: [PATCH 3/9] osrmTable fix documentation on snapped measures

---
 R/osrmTable.R    | 16 +++++++++-------
 man/osrmTable.Rd | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/R/osrmTable.R b/R/osrmTable.R
index fd60c8b..c243a9f 100644
--- a/R/osrmTable.R
+++ b/R/osrmTable.R
@@ -29,22 +29,24 @@
 #' }
 #' If relevant, row names are used as identifiers.
 #' @param measure a character indicating what measures are calculated. It can
-#' be "duration" (in minutes), "distance" (meters), or both c('duration',
-#' 'distance').
+#' be "duration" (in minutes), "distance" (meters), "snapped_distance"
+#' (network distance + snapping distance, in meters) or any combination
+#' of them.
 #' @param exclude pass an optional "exclude" request option to the OSRM API
 #' (not allowed with the OSRM demo server).
 #' @param osrm.server the base URL of the routing server.
 #' @param osrm.profile the routing profile to use, e.g. "car", "bike" or "foot".
 #' @return
-#' The output of this function is a list composed of one or two matrices
+#' The output of this function is a list composed of one or several matrices
 #' and 2 data.frames
 #' \itemize{
 #'   \item{durations}: a matrix of travel times (in minutes)
-#'   \item{distances}: a matrix of distances (in meters)
+#'   \item{distances}: a matrix of network distances (in meters)
+#'   \item{snapped_distances}: a matrix of network + snapping distances (in meters)
 #'   \item{sources}: a data.frame of the coordinates of the points actually
-#'   used as starting points (EPSG:4326 - WGS84)
-#'   \item{sources}: a data.frame of the coordinates of the points actually
-#'   used as destinations (EPSG:4326 - WGS84)
+#'   used as starting points, including their snapping distance (EPSG:4326 - WGS84)
+#'   \item{destinations}: a data.frame of the coordinates of the points actually
+#'   used as destinations, including their snapping distance (EPSG:4326 - WGS84)
 #'   }
 #' @note
 #' The OSRM demo server does not allow large queries (more than 10000 distances
diff --git a/man/osrmTable.Rd b/man/osrmTable.Rd
index 2b52bc0..d1f01ba 100644
--- a/man/osrmTable.Rd
+++ b/man/osrmTable.Rd
@@ -45,23 +45,25 @@ If relevant, row names are used as identifiers.}
 (not allowed with the OSRM demo server).}
 
 \item{measure}{a character indicating what measures are calculated. It can
-be "duration" (in minutes), "distance" (meters), or both c('duration',
-'distance').}
+be "duration" (in minutes), "distance" (meters), "snapped_distance"
+(network distance + snapping distance, in meters) or any combination
+of them.}
 
 \item{osrm.server}{the base URL of the routing server.}
 
 \item{osrm.profile}{the routing profile to use, e.g. "car", "bike" or "foot".}
 }
 \value{
-The output of this function is a list composed of one or two matrices
+The output of this function is a list composed of one or several matrices
 and 2 data.frames
 \itemize{
   \item{durations}: a matrix of travel times (in minutes)
-  \item{distances}: a matrix of distances (in meters)
+  \item{distances}: a matrix of network distances (in meters)
+  \item{snapped_distances}: a matrix of network + snapping distances (in meters)
   \item{sources}: a data.frame of the coordinates of the points actually
-  used as starting points (EPSG:4326 - WGS84)
-  \item{sources}: a data.frame of the coordinates of the points actually
-  used as destinations (EPSG:4326 - WGS84)
+  used as starting points, including their snapping distance (EPSG:4326 - WGS84)
+  \item{destinations}: a data.frame of the coordinates of the points actually
+  used as destinations, including their snapping distance (EPSG:4326 - WGS84)
   }
 }
 \description{

From 348a59826c42d09560ea772ab06a0ebd016b6be0 Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Mon, 9 Feb 2026 23:25:27 +0100
Subject: [PATCH 4/9] Add snapped waypoints with snapping_distance to osrmTrip
 output

---
 R/osrmTrip.R                  | 28 ++++++++++++++++++++--------
 inst/tinytest/test_osrmTrip.R | 12 +++++++++++-
 man/osrmTrip.Rd               |  2 ++
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/R/osrmTrip.R b/R/osrmTrip.R
index c24cba5..2b83c98 100644
--- a/R/osrmTrip.R
+++ b/R/osrmTrip.R
@@ -34,6 +34,8 @@
 #' }
 #' \item{summary}{A list with 2 components: total duration (in minutes)
 #' and total distance (in kilometers) of the trip.}
+#' \item{waypoints}{An sf POINT object of the snapped waypoints used in the trip,
+#' including their \code{snapping_distance} (in kilometers).}
 #' }
 #' @export
 #' @examples
@@ -99,13 +101,16 @@ osrmTrip <- function(loc, exclude = NULL, overview = "simplified",
   res <- RcppSimdJson::fparse(rawToChar(r$content))
 
 
-  # Get all the waypoints
-  waypointsg <- data.frame(res$waypoints[, c(1, 2, 5)],
-    matrix(unlist(res$waypoints$location),
-      byrow = TRUE, ncol = 2
-    ),
-    id = loc$id
-  )
+  waypointsg <- res$waypoints
+  waypointsg$snapping_distance <- waypointsg$distance / 1000
+  waypointsg$distance <- NULL
+  waypointsg$lon <- sapply(res$waypoints$location, "[[", 1)
+  waypointsg$lat <- sapply(res$waypoints$location, "[[", 2)
+  # Alias for matching loop
+  waypointsg$X1 <- waypointsg$lon
+  waypointsg$X2 <- waypointsg$lat
+  waypointsg$location <- NULL
+  waypointsg$id <- loc$id
 
   # In case of island, multiple trips
   ntour <- dim(res$trips)[1]
@@ -177,7 +182,14 @@ osrmTrip <- function(loc, exclude = NULL, overview = "simplified",
       duration = res$trips[nt, ]$duration / 60,
       distance = res$trips[nt, ]$distance / 1000
     )
-    trips[[nt]] <- list(trip = sldf, summary = tripSummary)
+    trip_waypoints <- st_as_sf(waypoints, coords = c("lon", "lat"), crs = 4326)
+    # remove internal aliases
+    trip_waypoints$X1 <- NULL
+    trip_waypoints$X2 <- NULL
+    if (!is.na(oprj)) {
+      trip_waypoints <- sf::st_transform(trip_waypoints, oprj)
+    }
+    trips[[nt]] <- list(trip = sldf, summary = tripSummary, waypoints = trip_waypoints)
   }
   return(trips)
 }
diff --git a/inst/tinytest/test_osrmTrip.R b/inst/tinytest/test_osrmTrip.R
index 6c8d53c..03a5c26 100644
--- a/inst/tinytest/test_osrmTrip.R
+++ b/inst/tinytest/test_osrmTrip.R
@@ -13,6 +13,8 @@ if(demo_server){
                    c("start", "end", "duration", "distance", "geometry"))
   expect_true(st_geometry_type(trip, by_geometry = FALSE) == "LINESTRING")
   expect_identical(names(trip_summary),c('duration', 'distance'))
+  expect_true(!is.null(r[[1]]$waypoints))
+  expect_true("snapping_distance" %in% colnames(r[[1]]$waypoints))
   
   ################# DEMO BIKE #####################
   options(osrm.server = "https://routing.openstreetmap.de/", osrm.profile = "bike")
@@ -27,6 +29,8 @@ if(demo_server){
                    c("start", "end", "duration", "distance", "geometry"))
   expect_true(st_geometry_type(trip, by_geometry = FALSE) == "LINESTRING")
   expect_identical(names(trip_summary),c('duration', 'distance'))
+  expect_true(!is.null(r[[1]]$waypoints))
+  expect_true("snapping_distance" %in% colnames(r[[1]]$waypoints))
   
   
   ############## DEMO FOOT #################"""""
@@ -42,6 +46,8 @@ if(demo_server){
                    c("start", "end", "duration", "distance", "geometry"))
   expect_true(st_geometry_type(trip, by_geometry = FALSE) == "LINESTRING")
   expect_identical(names(trip_summary),c('duration', 'distance'))
+  expect_true(!is.null(r[[1]]$waypoints))
+  expect_true("snapping_distance" %in% colnames(r[[1]]$waypoints))
   
   ############# server param ##################""
   r <- osrmTrip(loc = x_sf[1:5,], 
@@ -56,7 +62,9 @@ if(demo_server){
   expect_identical(colnames(trip), 
                    c("start", "end", "duration", "distance", "geometry"))
   expect_true(st_geometry_type(trip, by_geometry = FALSE) == "LINESTRING")
-  expect_identical(names(trip_summary),c('duration', 'distance'))  
+  expect_identical(names(trip_summary),c('duration', 'distance'))
+  expect_true(!is.null(r[[1]]$waypoints))
+  expect_true("snapping_distance" %in% colnames(r[[1]]$waypoints))  
   # server error
   expect_error(osrmTrip(loc = x_sf[1:5, ], 
                         osrm.server = "https://router.project-osrm.orgS/", 
@@ -83,6 +91,8 @@ if(local_server){
                    c("start", "end", "duration", "distance", "geometry"))
   expect_true(st_geometry_type(trip, by_geometry = FALSE) == "LINESTRING")
   expect_identical(names(trip_summary),c('duration', 'distance'))
+  expect_true(!is.null(r[[1]]$waypoints))
+  expect_true("snapping_distance" %in% colnames(r[[1]]$waypoints))
   
   # server error
   expect_error(osrmTrip(loc = x_sf[1:5, ], 
diff --git a/man/osrmTrip.Rd b/man/osrmTrip.Rd
index 782b5bc..ec2e9bc 100644
--- a/man/osrmTrip.Rd
+++ b/man/osrmTrip.Rd
@@ -46,6 +46,8 @@ distance (length of the step in kilometers).
 }
 \item{summary}{A list with 2 components: total duration (in minutes)
 and total distance (in kilometers) of the trip.}
+\item{waypoints}{An sf POINT object of the snapped waypoints used in the trip,
+including their \code{snapping_distance} (in kilometers).}
 }
 }
 \description{

From cffeb5f5db569ed6a41171431d327f4ed488d648 Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Mon, 9 Feb 2026 23:25:42 +0100
Subject: [PATCH 5/9] Add snapping_distance column (in km) to snapping
 attribute and improve documentation

Convert the raw distance in the snapping waypoints from meters to kilometers, rename it to `snapping_distance`, and update documentation and tests accordingly.
---
 R/osrmRoute.R                  | 12 +++++++++---
 inst/tinytest/test_osrmRoute.R |  8 ++++++++
 man/osrmRoute.Rd               | 26 +++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/R/osrmRoute.R b/R/osrmRoute.R
index ece6d30..9b4f32b 100644
--- a/R/osrmRoute.R
+++ b/R/osrmRoute.R
@@ -61,8 +61,11 @@
 #'   \item dst_snapping_distance: distance from the destination to the
 #'   snapped point on the network (in kilometers)
 #'   }
-#' The object also contains a \code{snapping} attribute that stores a data.frame
-#' of all snapped waypoints (including middle points if \code{loc} is used).
+#' The object also contains a \code{snapping} attribute (accessible via
+#' \code{attr(res, "snapping")}) that stores a data.frame of all snapped
+#' waypoints (including middle points if \code{loc} is used).
+#' The \code{snapping} data.frame contains a \code{snapping_distance} column
+#' (in kilometers).
 #'
 #' If src (or loc) is a vector, a data.frame or a matrix, the coordinate
 #' reference system (CRS) of the route is EPSG:4326 (WGS84).\cr
@@ -212,7 +215,10 @@ osrmRoute <- function(src,
     crs = 4326,
     row.names = paste(id1, id2, sep = "_")
   )
-  attr(rosf, "snapping") <- res$waypoints
+  snapping <- res$waypoints
+  snapping$snapping_distance <- snapping$distance / 1000
+  snapping$distance <- NULL
+  attr(rosf, "snapping") <- snapping
   # prj
   if (!is.na(oprj)) {
     rosf <- st_transform(rosf, oprj)
diff --git a/inst/tinytest/test_osrmRoute.R b/inst/tinytest/test_osrmRoute.R
index b17b505..a53757e 100644
--- a/inst/tinytest/test_osrmRoute.R
+++ b/inst/tinytest/test_osrmRoute.R
@@ -11,6 +11,7 @@ if(demo_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -22,6 +23,7 @@ if(demo_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance
@@ -41,6 +43,7 @@ if(demo_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -52,6 +55,7 @@ if(demo_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance
@@ -73,6 +77,7 @@ if(demo_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
 
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -84,6 +89,7 @@ if(demo_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance
@@ -124,6 +130,7 @@ if(local_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   r <- osrmRoute(loc = x_sf[1:3, ])
@@ -134,6 +141,7 @@ if(local_server){
                    c("src", "dst", "duration", "distance", "src_snapping_distance", 
                      "dst_snapping_distance", "geometry"))
   expect_true(!is.null(attr(r, "snapping")))
+  expect_true("snapping_distance" %in% colnames(attr(r, "snapping")))
   expect_true(st_geometry_type(r) == "LINESTRING")
   
   # Return only duration and distance
diff --git a/man/osrmRoute.Rd b/man/osrmRoute.Rd
index 96896c9..3254092 100644
--- a/man/osrmRoute.Rd
+++ b/man/osrmRoute.Rd
@@ -63,12 +63,22 @@ FALSE to return only time and distance.}
 }
 \value{
 The output of this function is an sf LINESTRING of the shortest route.\cr
-It contains 4 fields: \itemize{
-  \item starting point identifier
-  \item destination identifier
-  \item travel time in minutes
-  \item travel distance in kilometers.
+It contains 6 fields: \itemize{
+  \item src: starting point identifier
+  \item dst: destination identifier
+  \item duration: travel time in minutes
+  \item distance: travel distance in kilometers
+  \item src_snapping_distance: distance from the starting point to the
+  snapped point on the network (in kilometers)
+  \item dst_snapping_distance: distance from the destination to the
+  snapped point on the network (in kilometers)
   }
+The object also contains a \code{snapping} attribute (accessible via
+\code{attr(res, "snapping")}) that stores a data.frame of all snapped
+waypoints (including middle points if \code{loc} is used).
+The \code{snapping} data.frame contains a \code{snapping_distance} column
+(in kilometers).
+
 If src (or loc) is a vector, a data.frame or a matrix, the coordinate
 reference system (CRS) of the route is EPSG:4326 (WGS84).\cr
 If src (or loc) is an sfc or sf object, the route has the same CRS
@@ -98,6 +108,12 @@ route1 <- osrmRoute(src = apotheke.sf[1, ], dst = apotheke.sf[16, ])
 plot(st_geometry(route1))
 plot(st_geometry(apotheke.sf[c(1, 16), ]), col = "red", pch = 20, add = TRUE)
 
+# View snapping distance
+route1$src_snapping_distance
+
+# View all snapped waypoints (including via points)
+attr(route1, "snapping")
+
 # Return only duration and distance
 route3 <- osrmRoute(
   src = apotheke.df[1, c("lon", "lat")],

From fc7f28e2196ec12310c3264976ad2756f24d9d4d Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Mon, 9 Feb 2026 23:38:29 +0100
Subject: [PATCH 6/9] Rename "snapped_distance" measure to "total_distance" in
 osrmTable

---
 R/osrmTable.R                  | 24 ++++++++++++------------
 inst/tinytest/test_osrmTable.R | 16 ++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/R/osrmTable.R b/R/osrmTable.R
index c243a9f..3e29f8f 100644
--- a/R/osrmTable.R
+++ b/R/osrmTable.R
@@ -29,7 +29,7 @@
 #' }
 #' If relevant, row names are used as identifiers.
 #' @param measure a character indicating what measures are calculated. It can
-#' be "duration" (in minutes), "distance" (meters), "snapped_distance"
+#' be "duration" (in minutes), "distance" (meters), "total_distance"
 #' (network distance + snapping distance, in meters) or any combination
 #' of them.
 #' @param exclude pass an optional "exclude" request option to the OSRM API
@@ -42,7 +42,7 @@
 #' \itemize{
 #'   \item{durations}: a matrix of travel times (in minutes)
 #'   \item{distances}: a matrix of network distances (in meters)
-#'   \item{snapped_distances}: a matrix of network + snapping distances (in meters)
+#'   \item{total_distances}: a matrix of network + snapping distances (in meters)
 #'   \item{sources}: a data.frame of the coordinates of the points actually
 #'   used as starting points, including their snapping distance (EPSG:4326 - WGS84)
 #'   \item{destinations}: a data.frame of the coordinates of the points actually
@@ -133,10 +133,10 @@ osrmTable <- function(src,
     url <- paste0(url, "exclude=", exclude, "&")
   }
 
-  # Manage "snapped_distance" measure
-  snapped <- "snapped_distance" %in% measure
-  measure_api <- setdiff(measure, "snapped_distance")
-  if (snapped && !("distance" %in% measure_api)) {
+  # Manage "total_distance" measure
+  total <- "total_distance" %in% measure
+  measure_api <- setdiff(measure, "total_distance")
+  if (total && !("distance" %in% measure_api)) {
     measure_api <- c(measure_api, "distance")
   }
 
@@ -187,17 +187,17 @@ osrmTable <- function(src,
   output$sources <- coords$sources
   output$destinations <- coords$destinations
 
-  # compute snapped distances
-  if (snapped && !is.null(output$distances)) {
+  # compute total distances
+  if (total && !is.null(output$distances)) {
     src_snap <- output$sources$snapping_distance
     dst_snap <- output$destinations$snapping_distance
     snap_sum <- outer(src_snap, dst_snap, "+")
-    output$snapped_distances <- output$distances + snap_sum
+    output$total_distances <- output$distances + snap_sum
     
     # fix self-distance
-    ids_match <- outer(rownames(output$snapped_distances), 
-                       colnames(output$snapped_distances), "==")
-    output$snapped_distances[ids_match] <- 0
+    ids_match <- outer(rownames(output$total_distances), 
+                       colnames(output$total_distances), "==")
+    output$total_distances[ids_match] <- 0
     
     if (!("distance" %in% measure)) {
       output$distances <- NULL
diff --git a/inst/tinytest/test_osrmTable.R b/inst/tinytest/test_osrmTable.R
index f05f2de..98b7596 100644
--- a/inst/tinytest/test_osrmTable.R
+++ b/inst/tinytest/test_osrmTable.R
@@ -145,16 +145,16 @@ if(local_server){
                          osrm.server = "http://0.0.0.0:5100/", 
                          osrm.profile = "car"))
   
-  # snapped_distance
-  A <- osrmTable(loc = x_sf[1:5, ], measure = "snapped_distance")
-  expect_true(!is.null(A$snapped_distances))
+  # total_distance
+  A <- osrmTable(loc = x_sf[1:5, ], measure = "total_distance")
+  expect_true(!is.null(A$total_distances))
   expect_true(is.null(A$distances))
-  expect_equal(dim(A$snapped_distances), c(5,5))
-  expect_equal(diag(A$snapped_distances), rep(0, 5))
+  expect_equal(dim(A$total_distances), c(5,5))
+  expect_equal(diag(A$total_distances), rep(0, 5))
   
-  B <- osrmTable(loc = x_sf[1:5, ], measure = c("distance", "snapped_distance"))
+  B <- osrmTable(loc = x_sf[1:5, ], measure = c("distance", "total_distance"))
   expect_true(!is.null(B$distances))
-  expect_true(!is.null(B$snapped_distances))
-  expect_equal(B$snapped_distances[1,2], 
+  expect_true(!is.null(B$total_distances))
+  expect_equal(B$total_distances[1,2], 
                B$distances[1,2] + B$sources$snapping_distance[1] + B$destinations$snapping_distance[2])
 }
\ No newline at end of file

From 9cacc7205e3e384215f7cbb92d8fbcdc6877f212 Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Tue, 10 Feb 2026 00:02:46 +0100
Subject: [PATCH 7/9] regenerate docs for osrmTable

---
 man/osrmTable.Rd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/osrmTable.Rd b/man/osrmTable.Rd
index d1f01ba..ebb975e 100644
--- a/man/osrmTable.Rd
+++ b/man/osrmTable.Rd
@@ -45,7 +45,7 @@ If relevant, row names are used as identifiers.}
 (not allowed with the OSRM demo server).}
 
 \item{measure}{a character indicating what measures are calculated. It can
-be "duration" (in minutes), "distance" (meters), "snapped_distance"
+be "duration" (in minutes), "distance" (meters), "total_distance"
 (network distance + snapping distance, in meters) or any combination
 of them.}
 
@@ -59,7 +59,7 @@ and 2 data.frames
 \itemize{
   \item{durations}: a matrix of travel times (in minutes)
   \item{distances}: a matrix of network distances (in meters)
-  \item{snapped_distances}: a matrix of network + snapping distances (in meters)
+  \item{total_distances}: a matrix of network + snapping distances (in meters)
   \item{sources}: a data.frame of the coordinates of the points actually
   used as starting points, including their snapping distance (EPSG:4326 - WGS84)
   \item{destinations}: a data.frame of the coordinates of the points actually

From b5c59413e123a26d3e8e18fd8adf3fe160c0779c Mon Sep 17 00:00:00 2001
From: Egor Kotov <e-kotov@users.noreply.github.com>
Date: Tue, 10 Feb 2026 00:03:25 +0100
Subject: [PATCH 8/9] Update R/osrmRoute.R

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 R/osrmRoute.R | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/R/osrmRoute.R b/R/osrmRoute.R
index 9b4f32b..035c7b3 100644
--- a/R/osrmRoute.R
+++ b/R/osrmRoute.R
@@ -62,9 +62,10 @@
 #'   snapped point on the network (in kilometers)
 #'   }
 #' The object also contains a \code{snapping} attribute (accessible via
-#' \code{attr(res, "snapping")}) that stores a data.frame of all snapped
-#' waypoints (including middle points if \code{loc} is used).
-#' The \code{snapping} data.frame contains a \code{snapping_distance} column
+#' \code{attr(result, "snapping")}, where \code{result} is the object
+#' returned by \code{osrmRoute()}) that stores a data.frame of all snapped
+#' waypoints (including middle points if \code{loc} is used). The
+#' \code{snapping} data.frame contains a \code{snapping_distance} column
 #' (in kilometers).
 #'
 #' If src (or loc) is a vector, a data.frame or a matrix, the coordinate

From df388e876e505d4cd367ed87612e9abb242a5108 Mon Sep 17 00:00:00 2001
From: Egor Kotov <kotov.egor@gmail.com>
Date: Tue, 10 Feb 2026 00:05:16 +0100
Subject: [PATCH 9/9] regenerate doc for osrmRoute

---
 man/osrmRoute.Rd | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/osrmRoute.Rd b/man/osrmRoute.Rd
index 3254092..1d78b1c 100644
--- a/man/osrmRoute.Rd
+++ b/man/osrmRoute.Rd
@@ -74,9 +74,10 @@ It contains 6 fields: \itemize{
   snapped point on the network (in kilometers)
   }
 The object also contains a \code{snapping} attribute (accessible via
-\code{attr(res, "snapping")}) that stores a data.frame of all snapped
-waypoints (including middle points if \code{loc} is used).
-The \code{snapping} data.frame contains a \code{snapping_distance} column
+\code{attr(result, "snapping")}, where \code{result} is the object
+returned by \code{osrmRoute()}) that stores a data.frame of all snapped
+waypoints (including middle points if \code{loc} is used). The
+\code{snapping} data.frame contains a \code{snapping_distance} column
 (in kilometers).
 
 If src (or loc) is a vector, a data.frame or a matrix, the coordinate