Merge pull request #52 from KWB-R/read-data-over-shape

Read data over shape

NAMESPACE

@@ -24,6 +24,7 @@ export(radolan_raw_to_raster)
 export(read_asc_gz_file)
 export(read_binary_radolan_file)
 export(read_daily_data_over_shape)
+export(read_data_over_shape)
 export(read_monthly_data_over_shape)
 export(read_relevant_years_radolan)
 export(temp_dir)

R/download_grids_germany.R

@@ -0,0 +1,17 @@
+download_grids_germany <- function(resolution, variable, from, to, quiet = FALSE)
+{
+  if (resolution == "daily") {
+
+    # Download and extract .tgz files from DWD server
+    download_daily_grids_germany(variable, from, to, quiet = quiet)
+
+  } else if (resolution == "monthly") {
+
+    # Download files from DWD server
+    download_monthly_grids_germany(variable, from, to, quiet = quiet)
+
+  } else {
+
+    clean_stop("resolution must be one of 'daily', 'monthly'.")
+  }
+}

R/get_radolan_projection_string.R

@@ -11,6 +11,9 @@
 #'  * [get_radolan_extension].
 get_radolan_projection_string <- function()
 {
+  # TODO: Is this the same?
+  # readLines(default_projection_file())
+
   to_projection_string(
     parameters = list(
       proj = "stere",

R/read_asc_gz_file.R

@@ -27,25 +27,22 @@ read_asc_gz_file <- function(file, url = NULL)
 
   #dir(target_dir)
 
-  # Provide a copy of the projection file in the download folder
-  provide_projection_file(grid_file)
-
-  raster::raster(grid_file)
+  # Read the .asc file into a raster object (with appropriate projection)
+  read_asc_file(grid_file)
 }
 
 # read_asc_file ----------------------------------------------------------------
 
 #' Read Raster Data from .ASC File
 #'
 #' @param file path to .asc file
-#' @param projection projection string used in Radolan data
+#' @param projection projection string used in Radolan data. Currently not used!
 #' @param dbg logical indicating whether to show debug messages
 #' @importFrom kwb.utils catAndRun
 #' @importFrom raster `crs<-` raster
 read_asc_file <- function(
     file,
     projection = get_radolan_projection_string(),
-    #projection = readLines(default_projection_file()),
     dbg = TRUE
 )
 {