Skip to content

Commit

Permalink
Merge pull request #388 from dblodgett-usgs/master
Browse files Browse the repository at this point in the history
CRS update
  • Loading branch information
Jordan S Read authored May 19, 2020
2 parents f5f53f4 + 07509f1 commit 86948b1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: geoknife
Type: Package
Title: Web-Processing of Large Gridded Datasets
Version: 1.6.3
Date: 2019-01-29
Version: 1.6.4
Date: 2020-05-20
Authors@R: c( person("Jordan", "Read", role = c("aut","cre"),
email = "jread@usgs.gov"),
person("Jordan", "Walker", role = c("aut"),
Expand Down
7 changes: 3 additions & 4 deletions R/06-simplegeom-obj.R
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,9 @@ setAs("data.frame", "simplegeom", function(from) {

#'@importFrom sp Polygons Polygon CRS proj4string
setAs("SpatialPolygons", "simplegeom", function(from) {

supported.CRS <- c("+proj=longlat +datum=WGS84 +ellps=WGS84 +towgs84=0,0,0", "+proj=longlat +datum=WGS84")

if (!proj4string(from) %in% supported.CRS){

if (!(grepl("+proj=longlat", as.character(proj4string(from))) &
grepl("+proj=longlat", as.character(proj4string(from))))) {
stop('"',proj4string(from), '" not supported for "simplegeom", use "+proj=longlat +datum=WGS84"')
}

Expand Down
2 changes: 2 additions & 0 deletions man/algorithm-webprocess.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions man/inputs-webprocess.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 86948b1

Please sign in to comment.