Merge pull request #22 from paleolimbot/development

fix CRAN problems of file size and test run time

.Rbuildignore

@@ -7,3 +7,4 @@
 ^README\.md$
 ^\.travis\.yml$
 ^codecov\.yml$
+^tests/testthat/Rplots\.pdf$

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: ggspatial
 Type: Package
 Title: Spatial Data Framework for ggplot2
-Version: 1.0.0
+Version: 1.0.1
 Authors@R: c(
     person("Dewey", "Dunnington", , "[email protected]", c("aut", "cre")),
     person("Brent", "Thorne", role = "ctb")

README.rmd

@@ -7,7 +7,7 @@ output: github_document
 
 ```{r setup, include = FALSE}
 rosm::set_default_cachedir(system.file("rosm.cache", package = "ggspatial"))
-knitr::opts_chunk$set(dpi = 300, echo = TRUE)
+knitr::opts_chunk$set(dpi = 150, echo = TRUE)
 ```
 
 Spatial data plus the power of the `ggplot2` framework means easier mapping.

tests/testthat/test-annotation-map-tile.R

@@ -1,68 +1,73 @@
 context("test-geom-osm.R")
 
-test_that("geom_osm works as intended", {
-  load_longlake_data()
+# max test length was exceeded on CRAN, so these tests are skipped
+if (identical(Sys.getenv("NOT_CRAN"), "true")) {
 
-  expect_message(
-    print(
-      ggplot() +
-        annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
-        geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
-        labs("This plot sould have they grey outlines line up with the OSM map beneath")
-    ),
-    "Zoom: 13"
-  )
+  test_that("geom_osm works as intended", {
+    load_longlake_data()
 
-  expect_message(
-    print(
-      ggplot() +
-        annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
-        geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
-        coord_sf(crs = 26920) +
-        labs("This plot sould have they grey outlines line up with the OSM map beneath")
-    ),
-    "Zoom: 13"
-  )
+    expect_message(
+      print(
+        ggplot() +
+          annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
+          geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
+          labs("This plot sould have they grey outlines line up with the OSM map beneath")
+      ),
+      "Zoom: 13"
+    )
 
-  expect_message(
-    print(
-      ggplot() +
-        annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
-        geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
-        coord_sf(crs = 3857) +
-        labs("This plot sould have they grey outlines line up with the OSM map beneath")
-    ),
-    "Zoom: 13"
-  )
+    expect_message(
+      print(
+        ggplot() +
+          annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
+          geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
+          coord_sf(crs = 26920) +
+          labs("This plot sould have they grey outlines line up with the OSM map beneath")
+      ),
+      "Zoom: 13"
+    )
 
-  expect_message(
-    print(
-      ggplot() +
-        annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
-        geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
-        coord_sf(crs = 3978) +
-        labs("This plot sould have they grey outlines line up with the OSM map beneath")
-    ),
-    "Zoom: 13"
-  )
+    expect_message(
+      print(
+        ggplot() +
+          annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
+          geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
+          coord_sf(crs = 3857) +
+          labs("This plot sould have they grey outlines line up with the OSM map beneath")
+      ),
+      "Zoom: 13"
+    )
 
-  expect_message(
-    print(
-      ggplot() +
-        annotation_map_tile(
-          data = tibble::tibble(
-            type = c("osm", "stamenbw", "cartolight", "cartodark"),
-            zoom = 13
-          ),
-          cachedir = system.file("rosm.cache", package = "ggspatial"),
-          mapping = aes(type = type, zoom = zoom)
-        ) +
-        geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
-        coord_sf(crs = 3857) +
-        facet_wrap(~type) +
-        labs(caption = "this should have the maptypes correspond to the backdrop")
-    ),
-    "Zoom: 13"
-  )
+    expect_message(
+      print(
+        ggplot() +
+          annotation_map_tile(zoom = 13, cachedir = system.file("rosm.cache", package = "ggspatial")) +
+          geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
+          coord_sf(crs = 3978) +
+          labs("This plot sould have they grey outlines line up with the OSM map beneath")
+      ),
+      "Zoom: 13"
+    )
 
-})
+    expect_message(
+      print(
+        ggplot() +
+          annotation_map_tile(
+            data = tibble::tibble(
+              type = c("osm", "stamenbw", "cartolight", "cartodark"),
+              zoom = 13
+            ),
+            cachedir = system.file("rosm.cache", package = "ggspatial"),
+            mapping = aes(type = type, zoom = zoom)
+          ) +
+          geom_sf(data = longlake_waterdf, fill = NA, col = "grey50") +
+          coord_sf(crs = 3857) +
+          facet_wrap(~type) +
+          labs(caption = "this should have the maptypes correspond to the backdrop")
+      ),
+      "Zoom: 13"
+    )
+
+  })
+
+}