docs: rebuilt docs for version 1.1.1

MazamaScience · Apr 3, 2023 · d189b4b · d189b4b
1 parent e7291ec
commit d189b4b
Show file tree

Hide file tree

Showing 142 changed files with 370 additions and 326 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -39,7 +39,7 @@ Imports:
     lubridate,
     magrittr,
     MazamaLocationUtils (>= 0.3.8),
-    MazamaSpatialUtils (>= 0.8.1),
+    MazamaSpatialUtils (>= 0.7.6),
     openair,
     PWFSLSmoke (>= 1.2.117),
     readr,
@@ -60,7 +60,8 @@ Suggests:
     markdown,
     testthat (>= 2.1.0),
     rmarkdown,
-    roxygen2
+    roxygen2,
+    sp
 Description: Process and display data from air quality sensors.
     Initial focus is on PM2.5 measurements from sensors produced by 'PurpleAir'
     <https://www2.purpleair.com>.

diff --git a/NEWS.md b/NEWS.md
@@ -4,6 +4,8 @@
 * Added "Working with PurpleAir API Keys" article.
 * When `show_only` is used, spatial bounding information is ignored in: 
 `pa_getSensorsData()`, `pas_downloadParseRawData()` and `pas_createNew()`.
+* Updated `pas_createNew()` to be backwards compatible with **MazamaSpatialUtils** 
+version 0.7.6.
 
 # AirSensor 1.1.0
 

diff --git a/R/pas_createNew.R b/R/pas_createNew.R
@@ -135,7 +135,6 @@ pas_createNew <- function(
         if ( length(stateCodes) != 1 ) {
           stop("please limit 'stateCodes' to a single state when using 'counties'")
         }
-
       }
     }
 
@@ -151,6 +150,8 @@ pas_createNew <- function(
 
   }
 
+  MSU_version <- utils::packageVersion("MazamaSpatialUtils")
+
   # ----- Get country/state bounding box ---------------------------------------
 
   if ( !is.null(show_only) ) {
@@ -175,46 +176,85 @@ pas_createNew <- function(
         isFIPS <- stringr::str_detect(counties[1], "[0-9]{5}")
 
         if ( isFIPS ) {
-          SFDF <-
-            get("USCensusCounties") %>%  # To pass R CMD check
-            dplyr::filter(.data$stateCode %in% stateCodes) %>%
-            dplyr::filter(.data$countyFIPS %in% counties)
-        } else {
+
+          if ( grepl("^0.7", MSU_version) ) {
+            SPDF <-
+              get("USCensusCounties") %>%
+              subset(stateCode %in% stateCodes) %>%
+              subset(countyFIPS %in% counties)
+          } else {
+            SFDF <-
+              get("USCensusCounties") %>%  # To pass R CMD check
+              dplyr::filter(.data$stateCode %in% stateCodes) %>%
+              dplyr::filter(.data$countyFIPS %in% counties)
+          }
+
+        } else{
+
           # Handle input inconsistencies
           counties <-
             stringr::str_to_title(counties) %>%
             stringr::str_replace(" County", "")
-          SFDF <-
-            get("USCensusCounties") %>%  # To pass R CMD check
-            dplyr::filter(.data$stateCode %in% stateCodes) %>%
-            dplyr::filter(.data$countyName %in% counties)
+
+          if ( grepl("^0.7", MSU_version) ) {
+            SPDF <-
+              get("USCensusCounties") %>%
+              subset(stateCode %in% stateCodes) %>%
+              subset(countyName %in% counties)
+          } else {
+            SFDF <-
+              get("USCensusCounties") %>%  # To pass R CMD check
+              dplyr::filter(.data$stateCode %in% stateCodes) %>%
+              dplyr::filter(.data$countyName %in% counties)
+          }
+
         }
 
       } else {
 
         # Use state but not counties
-        SFDF <-
-          get("NaturalEarthAdm1") %>% # To pass R CMD check
-          dplyr::filter(.data$countryCode %in% countryCodes) %>%
-          dplyr::filter(.data$stateCode %in% stateCodes)
+        if ( grepl("^0.7", MSU_version) ) { 
+          SPDF <-
+            get("NaturalEarthAdm1") %>% # To pass R CMD check
+            subset(countryCode %in% countryCodes) %>%
+            subset(stateCode %in% stateCodes)
+        } else {
+          SFDF <-
+            get("NaturalEarthAdm1") %>% # To pass R CMD check
+            dplyr::filter(.data$countryCode %in% countryCodes) %>%
+            dplyr::filter(.data$stateCode %in% stateCodes)
+        }
 
       }
 
     } else {
 
       # Neither state nor county is specified
-      SFDF <-
-        MazamaSpatialUtils::SimpleCountriesEEZ %>%
-        dplyr::filter(.data$countryCode %in% countryCodes)
+      if ( grepl("^0.7", MSU_version) ) {
+        SPDF <-
+          MazamaSpatialUtils::SimpleCountriesEEZ %>%
+          subset(countryCode %in% countryCodes)
+      } else {
+        SFDF <-
+          MazamaSpatialUtils::SimpleCountriesEEZ %>%
+          dplyr::filter(.data$countryCode %in% countryCodes)
+      }
 
     }
 
-    bbox <- sf::st_bbox(SFDF)
-
-    west <- bbox$xmin
-    east <- bbox$xmax
-    south <- bbox$ymin
-    north <- bbox$ymax
+    if ( grepl("^0.7", MSU_version) ) {
+      bbox <- sp::bbox(SPDF)
+      west <- bbox[1,1]
+      east <- bbox[1,2]
+      south <- bbox[2,1]
+      north <- bbox[2,2]
+    } else {
+      bbox <- sf::st_bbox(SFDF)
+      west <- bbox$xmin
+      east <- bbox$xmax
+      south <- bbox$ymin
+      north <- bbox$ymax
+    }
 
   }
 

diff --git a/docker/AirSensor_1.1.1.tar.gz b/docker/AirSensor_1.1.1.tar.gz
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/AirSensor_Function_Overview.html b/docs/articles/AirSensor_Function_Overview.html
diff --git a/docs/articles/Custom_QC_Algorithms.html b/docs/articles/Custom_QC_Algorithms.html
diff --git a/docs/articles/Developer_Style_Guide.html b/docs/articles/Developer_Style_Guide.html
diff --git a/docs/articles/Working_with_PurpleAir_API_Keys.html b/docs/articles/Working_with_PurpleAir_API_Keys.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/outlier_detection.html b/docs/articles/outlier_detection.html
diff --git a/docs/articles/pas_introduction.html b/docs/articles/pas_introduction.html
diff --git a/docs/articles/pat_introduction.html b/docs/articles/pat_introduction.html
diff --git a/docs/articles/pat_introduction_files/figure-html/scatterplot-1.png b/docs/articles/pat_introduction_files/figure-html/scatterplot-1.png
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -9,5 +9,5 @@ articles:
   outlier_detection: outlier_detection.html
   pas_introduction: pas_introduction.html
   pat_introduction: pat_introduction.html
-last_built: 2023-03-31T22:00Z
+last_built: 2023-04-03T00:22Z
 
diff --git a/docs/reference/AIRSENSOR_1_PAT_FIELDS.html b/docs/reference/AIRSENSOR_1_PAT_FIELDS.html
diff --git a/docs/reference/APIKeys.html b/docs/reference/APIKeys.html
diff --git a/docs/reference/AirSensor.html b/docs/reference/AirSensor.html
diff --git a/docs/reference/ArchiveBaseDir.html b/docs/reference/ArchiveBaseDir.html
diff --git a/docs/reference/ArchiveBaseUrl.html b/docs/reference/ArchiveBaseUrl.html
diff --git a/docs/reference/PurpleAirQC_hourly_AB_00.html b/docs/reference/PurpleAirQC_hourly_AB_00.html
diff --git a/docs/reference/PurpleAirQC_hourly_AB_01.html b/docs/reference/PurpleAirQC_hourly_AB_01.html
diff --git a/docs/reference/PurpleAirQC_hourly_AB_02.html b/docs/reference/PurpleAirQC_hourly_AB_02.html
diff --git a/docs/reference/PurpleAirQC_hourly_AB_03.html b/docs/reference/PurpleAirQC_hourly_AB_03.html
diff --git a/docs/reference/PurpleAirSoH_dailyABFit-1.png b/docs/reference/PurpleAirSoH_dailyABFit-1.png
diff --git a/docs/reference/PurpleAirSoH_dailyABFit.html b/docs/reference/PurpleAirSoH_dailyABFit.html
diff --git a/docs/reference/PurpleAirSoH_dailyABtTest.html b/docs/reference/PurpleAirSoH_dailyABtTest.html
diff --git a/docs/reference/PurpleAirSoH_dailyMetFit.html b/docs/reference/PurpleAirSoH_dailyMetFit.html