Introduced IsInArea

DESCRIPTION

@@ -1,10 +1,10 @@
 Package: knmiR
 Type: Package
 Title: Import KNMI Data
-Version: 0.1.5.6
+Version: 0.1.5.7
 Authors@R: person("Martin", "Roth", email = "[email protected]",
  role = c("aut", "cre"))
-Date: 2017-03-11
+Date: 2017-05-23
 Description: Import KNMI data into R.
 License: MIT + file LICENSE
 LazyData: TRUE

NAMESPACE

@@ -18,6 +18,7 @@ export(EOBS)
 export(EOBSLocal)
 export(Earthquakes)
 export(HomogenPrecip)
+export(IsInArea)
 export(KIS)
 export(KnmiData)
 export(License)

R/ImportData.R

@@ -127,21 +127,41 @@ EarthquakesDownload <- function(type, area, period, call) {
  KnmiData(tmp, call, "Earthquakes")
 }
 
-#' Select earthquake sover area
+#' Select earthquakes over area
 #'
 #' @param quakes data.table with earthquakes
-#' @param area SpatialPolygons
+#' @param area SpatialPolygons or SpatialPolygonsDataFrame
 #' @export
 ClipQuakes <- function(quakes, area) {
  lat <- lon <- NULL
  points <- as.data.frame(quakes[, list(lon, lat)])
  points <- sp::SpatialPoints(points, CRS("+proj=longlat +datum=WGS84"))
- points <- sp::spTransform(points, area@proj4string)
- index <- which(!is.na(sp::over(points, area)))
+ index <- IsInArea(points, area)
  return(quakes[index, ])
 }
 
-
+#' Is point in area?
+#'
+#' @param points SpatialPoints
+#' @param area SpatialPolygons of SpatialPolygonsDataFrame
+#'
+#' @return logical indicating whether point is in area
+#' @export
+IsInArea <- function(points, area) {
+ points <- sp::spTransform(points, area@proj4string)
+ if (class(area) == "SpatialPolygons") {
+ index <- !is.na(sp::over(points, area))
+ } else if (class(area) == "SpatialPolygonsDataFrame") {
+ tmp <- sp::over(points, area)
+ index <- as.vector(!is.na(tmp[, 1, drop = FALSE]))
+ } else {
+ stop("Area should be of class `SpatialPolygons' or `SpatialPolygonsDataFrame'")
+ }
+ if (class(index) != "logical" & length(points) != length(index)) {
+ stop("index should be a logical of the same length as points")
+ }
+ index
+}