fix vector dist check for #26

hypertidy · Jul 2, 2020 · 401e296 · 401e296
1 parent 57a9507
commit 401e296
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: geodist
 Title: Fast, Dependency-Free Geodesic Distance Calculations
-Version: 0.0.4.009
+Version: 0.0.4.010
 Authors@R: 
     c(person(given = "Mark",
              family = "Padgham",

diff --git a/R/geodist-vec.R b/R/geodist-vec.R
@@ -76,12 +76,8 @@ geodist_vec <- function (x1, y1, x2, y2, paired = FALSE,
             res <- geodist_x_vec (x1, y1, measure)
     }
 
-    if (measure == "cheap") {
-        if (max (d) > 100000)
-            message ("Maximum distance is > 100km. The 'cheap' measure is ",
-                     "inaccurate over such\nlarge distances, you'd likely ",
-                     "be better using a different 'measure'.")
-    }
+    if (measure == "cheap")
+        check_max_d (res, measure)
 
     return (res)
 }

diff --git a/R/geodist.R b/R/geodist.R
@@ -77,7 +77,8 @@ geodist <- function (x, y, paired = FALSE,
             res <- geodist_x (x, measure)
     }
 
-    check_max_d (res, measure)
+    if (measure == "cheap")
+        check_max_d (res, measure)
 
     return (res)
 }

diff --git a/R/utils.R b/R/utils.R
@@ -128,10 +128,8 @@ convert_to_matrix <- function (obj)
 }
 
 check_max_d <- function (d, measure) {
-    if (measure == "cheap") {
-        if (max (d) > 100000)
-            message ("Maximum distance is > 100km. The 'cheap' measure is ",
-                     "inaccurate over such\nlarge distances, you'd likely ",
-                     "be better using a different 'measure'.")
-    }
+    if (max (d, na.rm = TRUE) > 100000)
+        message ("Maximum distance is > 100km. The 'cheap' measure is ",
+                 "inaccurate over such\nlarge distances, you'd likely ",
+                 "be better using a different 'measure'.")
 }
diff --git a/codemeta.json b/codemeta.json
@@ -10,7 +10,7 @@
   "codeRepository": "https://github.com/hypertidy/geodist",
   "issueTracker": "https://github.com/hypertidy/geodist/issues",
   "license": "https://spdx.org/licenses/MIT",
-  "version": "0.0.4.9",
+  "version": "0.0.4.010",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",