fix: staticmap_getEsrimapBrick() now uses correct bounds

MazamaScience · Jul 26, 2021 · 399ef4d · 399ef4d
1 parent d783de9
commit 399ef4d
Show file tree

Hide file tree

Showing 186 changed files with 219 additions and 226 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Type: Package
 Package: PWFSLSmoke
-Version: 1.2.114
+Version: 1.2.115
 Title: Utilities for Working with Air Quality Monitoring Data
 Authors@R: c(
     person("Jonathan", "Callahan", email="[email protected]", role=c("aut","cre")), 

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
-# PWFSLSmoke 1.2.114
+# PWFSLSmoke 1.2.115
 
-* Updated AIRSIS EBAM QC RHi threshold from 45% to 50%.
+* Fixed a cropping issue in `staticmap_getEsrimapBrick()` which resulted in
+image boundaries that didn't exactly match the requested boundaries.
 
 # PWFSLSmoke 1.2.113
 

diff --git a/R/staticmap_getEsrimapBrick.R b/R/staticmap_getEsrimapBrick.R
@@ -139,6 +139,10 @@ staticmap_getEsrimapBrick <- function(
                     ymax = ymax),
                   crs = crs)
   } else if ( !is.null(bbox) ) {
+    xmin <- bbox[1]
+    xmax <- bbox[3]
+    ymin <- bbox[2]
+    ymax <- bbox[4]
     bbox <-
       sf::st_bbox(c(xmin = bbox[1],
                     xmax = bbox[3],
@@ -209,23 +213,11 @@ staticmap_getEsrimapBrick <- function(
 
   # ----- Crop image -----------------------------------------------------------
 
-  # NOTE:  Rows are latitude and columns are longitude
-  x_count <- nrow(rasterBrick)
-  if ( x_count > height ) {
-    x_mid <- floor(x_count/2)
-    x_lo <- x_mid - floor(height/2)
-    x_hi <- x_mid + floor(height/2)
-  }
-  y_count <- ncol(rasterBrick)
-  if ( y_count > width ) {
-    y_mid <- floor(y_count/2)
-    y_lo <- y_mid - floor(width/2)
-    y_hi <- y_mid + floor(width/2)
-  }
-
-  extent <- raster::extent(rasterBrick, x_lo, x_hi, y_lo, y_hi)
+  extent <- raster::extent(xmin, xmax, ymin, ymax)
   rasterBrick <- raster::crop(rasterBrick, extent)
 
+  raster::crs(rasterBrick) <- sp::CRS("+init=epsg:4326")
+
   # ----- Return ---------------------------------------------------------------
 
   return(rasterBrick)

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/Data_Model.html b/docs/articles/Data_Model.html
diff --git a/docs/articles/Maps_and_Timeseries_Plots.html b/docs/articles/Maps_and_Timeseries_Plots.html
diff --git a/docs/articles/NowCast.html b/docs/articles/NowCast.html
diff --git a/docs/articles/PWFSLSmoke.html b/docs/articles/PWFSLSmoke.html
diff --git a/docs/articles/articles/Example_Denver_Air_Quality_Forecast.html b/docs/articles/articles/Example_Denver_Air_Quality_Forecast.html
diff --git a/docs/articles/articles/Example_Save_Data_as_CSV.html b/docs/articles/articles/Example_Save_Data_as_CSV.html
diff --git a/docs/articles/articles/Loading_Monitoring_Data.html b/docs/articles/articles/Loading_Monitoring_Data.html
diff --git a/...articles/articles/Loading_Monitoring_Data_files/figure-html/loadLatest WA-1.png b/...articles/articles/Loading_Monitoring_Data_files/figure-html/loadLatest WA-1.png
diff --git a/docs/articles/index.html b/docs/articles/index.html
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:
   articles/Example_Denver_Air_Quality_Forecast: Example_Denver_Air_Quality_Forecast.html
   articles/Example_Save_Data_as_CSV: Example_Save_Data_as_CSV.html
   articles/Loading_Monitoring_Data: Loading_Monitoring_Data.html
-last_built: 2021-07-07T18:02Z
+last_built: 2021-07-26T20:28Z
 
diff --git a/docs/reference/AIRSIS.html b/docs/reference/AIRSIS.html
diff --git a/docs/reference/AQI.html b/docs/reference/AQI.html
diff --git a/docs/reference/AQI_en.html b/docs/reference/AQI_en.html
diff --git a/docs/reference/AQI_es.html b/docs/reference/AQI_es.html
diff --git a/docs/reference/CONUS.html b/docs/reference/CONUS.html
diff --git a/docs/reference/Carmel_Valley.html b/docs/reference/Carmel_Valley.html
diff --git a/docs/reference/Northwest_Megafires.html b/docs/reference/Northwest_Megafires.html
diff --git a/docs/reference/PWFSLSmoke-deprecated.html b/docs/reference/PWFSLSmoke-deprecated.html
diff --git a/docs/reference/US_52.html b/docs/reference/US_52.html
diff --git a/docs/reference/WRCC.html b/docs/reference/WRCC.html
diff --git a/docs/reference/addAQILegend.html b/docs/reference/addAQILegend.html
diff --git a/docs/reference/addAQILines.html b/docs/reference/addAQILines.html
diff --git a/docs/reference/addAQIStackedBar.html b/docs/reference/addAQIStackedBar.html
diff --git a/docs/reference/addBullseye.html b/docs/reference/addBullseye.html
diff --git a/docs/reference/addClustering.html b/docs/reference/addClustering.html
diff --git a/docs/reference/addEsriAddress.html b/docs/reference/addEsriAddress.html
diff --git a/docs/reference/addGoogleAddress.html b/docs/reference/addGoogleAddress.html
diff --git a/docs/reference/addGoogleElevation.html b/docs/reference/addGoogleElevation.html
diff --git a/docs/reference/addIcon.html b/docs/reference/addIcon.html
diff --git a/docs/reference/addMarker.html b/docs/reference/addMarker.html
diff --git a/docs/reference/addMazamaMetadata.html b/docs/reference/addMazamaMetadata.html
diff --git a/docs/reference/addPolygon.html b/docs/reference/addPolygon.html
diff --git a/docs/reference/addShadedBackground.html b/docs/reference/addShadedBackground.html
diff --git a/docs/reference/addShadedNight.html b/docs/reference/addShadedNight.html