?

Author: rhijmans

.Rbuildignore

@@ -2,3 +2,5 @@
 .gitattributes
 LICENSE
 README.md
+^revdep$
+.travis.yml

.gitignore

@@ -1,3 +1,4 @@
+revdep
 *.tar.gz
 *Rcheck/
 *.o

DESCRIPTION

@@ -1,13 +1,14 @@
 Package: geosphere
 Type: Package
 Title: Spherical Trigonometry
-Version: 1.5-9
-Date: 2018-07-18
+Version: 1.5-11
+Date: 2020-04-19
 Imports: sp
 Depends: R (>= 3.0.0)
 Suggests: methods, raster
 Authors@R: c(
 	person("Robert J.", "Hijmans", role = c("cre", "aut"),  email = "[email protected]"),
+	person("Charles", "Karney", role = "ctb", comment="GeographicLib"),	
 	person("Ed", "Williams", role = "ctb"),
 	person("Chris", "Vennes", role = "ctb"))
 Description: Spherical trigonometry for geographic applications. That is, compute distances and related measures for angular (longitude/latitude) locations. 

man/centroid.Rd

@@ -8,15 +8,15 @@
 \title{Centroid of spherical polygons}
 
 \description{
-Compute the centroid of longitude/latitude polygons. Unlike other functions in this package, there is no spherical trigonomery involved in the implementation of this function. Instead, the function projects the polygon to the (conformal) Mercator coordinate reference system, computes the centroid, and then inversely projects it to longitude and latitude. This approach fails for polygons that include one of the poles (and is rather biased for anything close to the poles). The function should work for polygons that cross the -180/180 meridian (date line). 
+Compute the centroid of longitude/latitude polygons. Unlike other functions in this package, there is no spherical trigonometry involved in the implementation of this function. Instead, the function projects the polygon to the (conformal) Mercator coordinate reference system, computes the centroid, and then inversely projects it to longitude and latitude. This approach fails for polygons that include one of the poles (and is rather biased for anything close to the poles). The function should work for polygons that cross the -180/180 meridian (date line). 
 }
 
 \usage{
 centroid(x, ...)
 }
 
 \arguments{
-\item{x}{a 2-column matrix (longitude/latitude)}
+\item{x}{SpatialPolygons* object, or a 2-column matrix or data.frame reprenting a single polgyon (longitude/latitude)}
 \item{...}{Additional arguments. None implemented}
 }
 

man/destPoint.Rd

@@ -27,7 +27,7 @@ destPoint(p, b, d, a=6378137, f=1/298.257223563, ...)
 
 
 \note{
-Direction changes continuously when travelling along a geodesic. Therefore, the final direction is not the same as the initial direction. You can compute the final direction with \code{\link[geosphere]{finalBearing}} (see examples, below)
+Direction changes continuously when travelling along a geodesic. Therefore, the final direction is not the same as the initial direction. You can compute the final direction with \code{\link{finalBearing}} (see examples, below)
 }
 
 

man/lengthLine.Rd

@@ -25,7 +25,7 @@ length (in meters) for each line
 
 
 \seealso{
-For planar coordinates, see \code{\link[rgeos]{gLength}}
+For planar coordinates, see \code{\link[rgeos:misc-gLength]{gLength}}
 }
 
 

man/perimeter.Rd

@@ -36,7 +36,7 @@ Numeric. The perimeter or length in m.
 }
 
 \seealso{
-\code{ \link[geosphere]{areaPolygon}, \link[geosphere]{centroid}  }
+\code{ \link{areaPolygon}, \link[geosphere]{centroid}  }
 }
 
 

src/dist.c

@@ -54,9 +54,10 @@ double distVinSph(double lon1, double lat1, double lon2, double lat2, double r)
 	lat1 = toRad(lat1);
 	lat2 = toRad(lat2);
 
-	x1 = sqrt(cos(lat2) * sin(lon1-lon2));
-	x2 = cos(lat1) * sin(lat2) - sin(lat1) * cos(lat2) * cos(lon1-lon2);
-	x = x1*x1 + x2*x2;
+    x1 = cos(lat2) * sin(lon1-lon2);
+    x2 = cos(lat1) * sin(lat2) - sin(lat1) * cos(lat2) * cos(lon1-lon2);
+    x = sqrt(x1*x1 + x2*x2);
+	
 	y = sin(lat1) * sin(lat2) + cos(lat1) * cos(lat2) * cos(lon1-lon2);
 
 	return r * atan2(x, y);