new CRAN submission with earthDist: Map download excluded from checks…

… + numerical rounding.

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: OSMscale
 Title: Add a Scale Bar to 'OpenStreetMap' Plots
-Version: 0.4.0
-Date: 2017-01-18
+Version: 0.4.1
+Date: 2017-01-19
 Author: Berry Boessenkool
 Maintainer: Berry Boessenkool <[email protected]>
 Description: Functionality to handle and project lat-long coordinates, easily download background maps

NEWS

@@ -1,10 +1,15 @@
 package OSMscale: project points and add a scalebar to OpenStreetMap plots.
 Feedback, ideas, code suggestions welcome at [email protected] or via github.com/brry/OSMscale
 
+
+For all changes, see:
+https://github.com/brry/OSMscale/compare/master@{2017-01-18}...master@{2017-01-19}#files_bucket
+
+
 -----------------------------
 -----------------------------
 
-Version 0.4.0 (2017-01-18)
+Version 0.4.1 (2017-01-19)
 - scaleBar default choices improved
 - pointsMap remowes margins before plotting and has proj argument instead of utm
 - earthDist can now compute distance relative to any of the coordinate pairs

R/earthDist.R

@@ -15,16 +15,25 @@
 #' @examples
 #' d <- read.table(header=TRUE, sep=",", text="
 #' lat, long
-#' 52.514687, 13.350012   # Berlin
-#' 35.685024, 139.753365  # Tokio
-#' 51.503162, -0.131082") # London
-#' earthDist(lat, long, d)      # from Berlin to T and L: 8922 and 928 km
-#' earthDist(lat, long, d, i=3) # from London to B and T: 928 and 9562 km
+#' 52.514687,  13.350012   # Berlin
+#' 51.503162,  -0.131082   # London
+#' 35.685024, 139.753365") # Tokio
+#' earthDist(lat, long, d)      # from Berlin to L and T: 928 and 8922 km
+#' earthDist(lat, long, d, i=2) # from London to B and T: 928 and 9562 km
+#' # slightly different with other formulas:
+#' # install.packages("geosphere")
+#' # geosphere::distHaversine(as.matrix(d[1,2:1]), as.matrix(d[2,2:1])) / 1000
+#'
+#' \dontrun{ # don't download stuff in R CMD check
 #' map <- pointsMap(lat, long, d, zoom=2, abslen=5000, y=0.7)
 #' scaleBar(map, y=0.5, abslen=5000)   # in mercator projections, scale bars are not
 #' scaleBar(map, y=0.3, abslen=5000)   # transferable to other latitudes
-#' # slightly different with other formulas:
-#' # geosphere::distHaversine(as.matrix(d[1,2:1]), as.matrix(d[2,2:1])) / 1000
+#'
+#' map_utm <- pointsMap(lat, long, d[1:2,], proj=putm(long=d$long[1:2]),
+#'                      zoom=4, y=0.7, abslen=500)
+#' scaleBar(map_utm, y=0.5, abslen=500) # transferable in UTM projection
+#' scaleBar(map_utm, y=0.3, abslen=500)
+#' }
 #'
 #' # compare with UTM distance
 #' set.seed(42)
@@ -76,7 +85,8 @@ x2 <- long*pi/180
 # angle preparation (numerical inaccuracies may lead to 1.0000000000000002):
 cosinusangle <- sin(y1)*sin(y2) + cos(y1)*cos(y2)*cos(x1-x2)
 cosinusangle <- replace(cosinusangle, cosinusangle>1, 1)
-cosinusangle <- replace(cosinusangle, cosinusangle<0, 0)
+#cosinusangle <- replace(cosinusangle, cosinusangle<0, 0)
+cosinusangle[ sapply(cosinusangle, function(x) isTRUE(all.equal(x,1))) ] <- 1
 # angle between lines from earth center to coordinates:
 angle <- acos( cosinusangle )
 # compute great-circle-distance: