Change maintainer, fix multipolygon issue, release Version 2.2.3

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SWMPrExtension
 Type: Package
 Title: Functions for Analyzing and Plotting Estuary Monitoring Data
-Version: 2.2.2.0
-Maintainer: Dave Eslinger <dave.eslinger@noaa.gov>
+Version: 2.2.3
+Maintainer: Kirk Waters <kirk.waters@noaa.gov>
 Description: Tools for performing routine analysis and plotting tasks with environmental
     data from the System Wide Monitoring Program of the National Estuarine
     Research Reserve System <http://cdmo.baruch.sc.edu/>. This package builds
@@ -57,14 +57,17 @@ Authors@R: c(
     role = c("ctb"),
 	email = "[email protected]"),
   person(given = "Dave", family = "Eslinger",
-    role = c("cre", "ctb"),
-	email = "[email protected]"),
+    role = c("aut", "ctb"),
+	email = "[email protected]"),
+  person(given = "Kirk", family = "Waters",
+    role = c("cre"),
+	email = "[email protected]"),
   person(given = "Bob", family = "Rudis",
     role = c("ctb"),
 	email = "[email protected]"),
   person(given = "Davis", family = "Vaughan",
     role = c("ctb"),
 	email = "[email protected]")
 	)
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.0
 

NEWS.md

@@ -1,3 +1,7 @@
+### SWMPrExtension 2.2.3
+* Change mapping checks to accommodate multi-polygons
+* Change Maintainer role to [email protected]
+
 ### SWMPrExtension 2.2.2.0
 * Change EPA National Condition Report to landing page instead of PDF download.
 * Checked for CRAN submission.

R/res_custom_map.R

@@ -93,8 +93,8 @@ res_custom_map <- function(stations
   abbrev <- lab_long <- lab_lat <- NULL
 
   # check that a shape file exists
-  if(class(shp) != 'SpatialPolygons') {
-    if(class(shp) != 'sf') {
+  if(!('SpatialPolygons' %in% class(shp))) {
+    if(!('sf' %in% class(shp))) {
       stop('shapefile (shp) must be sf (preferred) or SpatialPolygons object')
     }
   } else {

R/res_custom_sk_map.R

@@ -111,8 +111,8 @@ res_custom_sk_map <- function(stations
   abbrev <- lab_long <- lab_lat  <- Longitude <- Latitude <- NULL
 
   # check that a shape file exists
-  if(class(shp) != 'SpatialPolygons') {
-    if(class(shp) != 'sf') {
+  if(!('SpatialPolygons' %in% class(shp))) {
+    if(!('sf' %in% class(shp))) {
       stop('shapefile (shp) must be sf (preferred) or SpatialPolygons object')
     }
   } else {

R/res_local_map.R

@@ -115,8 +115,8 @@ res_local_map <- function(nerr_site_id
   abbrev <- lab_long <- lab_lat <- NULL
 
   # check that a shape file exists
-  if(class(shp) != 'SpatialPolygons') {
-    if(class(shp) != 'sf') {
+  if(!('SpatialPolygons' %in% class(shp))) {
+    if(!('sf' %in% class(shp))) {
       stop('shapefile (shp) must be sf (preferred) or SpatialPolygons object')
     }
   } else {

R/res_sk_map.R

@@ -105,8 +105,8 @@ res_sk_map <- function(nerr_site_id
   abbrev <- lab_long <- lab_lat <- Latitude <- Longitude <- NULL
 
   # check that a shape file exists
-  if(class(shp) != 'SpatialPolygons') {
-    if(class(shp) != 'sf') {
+  if(!('SpatialPolygons' %in% class(shp))) {
+    if(!('sf' %in% class(shp))) {
       stop('shapefile (shp) must be sf (preferred) or SpatialPolygons object')
     }
   } else {