v0.1.46 issue #26 big fix

FluvialGeomorph · Aug 21, 2023 · 6e0a161 · 6e0a161
1 parent 71e6ff2
commit 6e0a161
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: fluvgeo
 Title: A Package for Fluvial Geomorphic Analysis
-Version: 0.1.44
+Version: 0.1.46
 Authors@R: c(
     person("Michael", "Dougherty", 
            email = "Michael.P.Dougherty@usace.army.mil", 

diff --git a/NAMESPACE b/NAMESPACE
@@ -163,7 +163,6 @@ importFrom(terra,vect)
 importFrom(terrainr,get_tiles)
 importFrom(testthat,expect_true)
 importFrom(tidyr,gather)
-importFrom(tmap,test)
 importFrom(tmap,tm_add_legend)
 importFrom(tmap,tm_compass)
 importFrom(tmap,tm_layout)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,16 @@
+# fluvgeo v0.1.46 (2023-08-21)
+
+## Major changes
+* None  
+
+## Bug Fixes
+* Removed immediate dependencies on `rgdal` to address issues with the Level 1 Reports failing.
+See [Issue 26](https://github.com/FluvialGeomorph/fluvgeo/issues/26)
+
+##Minor changes
+* None
+
+
 # fluvgeo v0.1.45 (2023-03-21)
 
 ## Major changes

diff --git a/R/map_xs.R b/R/map_xs.R
@@ -21,7 +21,6 @@
 #' @importFrom grDevices colorRampPalette grey
 #' @importFrom tmap tm_shape tm_raster tm_lines tm_text tm_add_legend
 #' tm_compass tm_scale_bar tm_layout
-#'test
 map_xs <- function(cross_section, xs_number, dem,
                    banklines = NULL,
                    extent_factor = 1) {

diff --git a/README.Rmd b/README.Rmd
@@ -14,7 +14,7 @@ An `R` Package for Performing **Fluv**ial **Geo**mrphology Analysis
 ## Package Status
 [![Maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle)
 [![Project Status: Active The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
-[![packageversion](https://img.shields.io/badge/Package%20version-0.1.45-orange.svg?style=flat-square)](commits/master)
+[![packageversion](https://img.shields.io/badge/Package%20version-0.1.46-orange.svg?style=flat-square)](commits/master)
 [![Last-changedate](https://img.shields.io/badge/last%20change-`r gsub('-', '--', Sys.Date())`-yellowgreen.svg)](/commits/master)
 [![Licence](https://img.shields.io/badge/licence-CC0-blue.svg)](http://choosealicense.com/licenses/cc0-1.0/)
 

diff --git a/tests/testthat/test_map_xs.R b/tests/testthat/test_map_xs.R
@@ -44,13 +44,13 @@ xs_number <- 1
 extent_factor <- 1.2
 
 
-# # sp
-# cross_section_sp <- fluvgeo::sin_riffle_floodplain_dims_L3_sp
-# banklines_sp     <- fluvgeo::sin_banklines_sp
-#
-# # sp to sf
-# xs_sp_sf <- sf::st_as_sf(cross_section_sp)
-# bl_sp_sf <- sf::st_as_sf(banklines_sp)
+# sp
+cross_section_sp <- fluvgeo::sin_riffle_floodplain_dims_L3_sp
+banklines_sp     <- fluvgeo::sin_banklines_sp
+
+# sp to sf
+xs_sp_sf <- sf::st_as_sf(cross_section_sp)
+bl_sp_sf <- sf::st_as_sf(banklines_sp)