Commit 06b42e8b authored by Albrecht Gebhardt's avatar Albrecht Gebhardt
Browse files

small fixes

parent 5509f5b3
......@@ -28,7 +28,7 @@ Imports: sp
NeedsCompilation: yes
Packaged: 2020-05-30 09:17:28 UTC; ripley
Author: Hiroshi Akima [aut, cph] (Fortran code (TOMS 760, 761, 697 and 433)),
Albrecht Gebhardt [aut, cre, cph] (R port (interp* functions, bicubic*
Albrecht Gebhardt [aut, cre, cph] (R port (interp*, bicubic*
functions), bilinear code),
Thomas Petzold [ctb, cph] (aspline function),
Martin Maechler [ctb, cph] (interp2xyz function + enhancements),
......
......@@ -13,7 +13,7 @@ interp <-
sp.z <- NULL
sp.proj4string <- NULL
if(is.null(y)&&is.character(z)){
if(inherits(x,"SpatialPointsDataFrame"){
if(inherits(x,"SpatialPointsDataFrame")){
sp.coord <- dimnames(coordinates(x))[[2]]
sp.z <- z
sp.proj4string <- x@proj4string
......
......@@ -10,14 +10,14 @@
sp.z <- NULL
sp.proj4string <- NULL
if(is.null(y)&&is.character(z)){
if(inherits(xo,"SpatialPointsDataFrame"){
if(inherits(xo,"SpatialPointsDataFrame")){
yo <- coordinates(xo)[,2]
xo <- coordinates(xo)[,1]
} else
stop(paste("either x,y,z,xo,yo have to be numeric vectors",
"or both x and xo have to be SpatialPointsDataFrames",
"and z a name of a data column in x"))
if(inherits(x,"SpatialPointsDataFrame"){
if(inherits(x,"SpatialPointsDataFrame")){
sp.coord <- dimnames(coordinates(x))[[2]]
sp.z <- z
sp.proj4string <- x@proj4string
......
This diff is collapsed.
# package/configure.in
AC_PREREQ([2.71])
AC_PREREQ([2.69])
AC_INIT([akima],[0.6-3])
AC_CONFIG_SRCDIR(src/tripack.f)
#if you want to use more macros
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment