From f8ce666b8877502941a062ecc3ee29618cbbe03c Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:08:55 +0100 Subject: [PATCH 01/12] Update README.md updated readme with annoucement for next release --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9ba3c9f..12a4f72 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,10 @@ maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) +Announcement 27-03-2024: I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. +best, Jelle Stuurman +-- -- -- Updated: 15-05-2020 This R package automatically extracts elevation points or areas of the From 2d8ac57c2944690ef225e552fafda9f4e67d0dd6 Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:09:41 +0100 Subject: [PATCH 02/12] Update README.md updated readme with annoucement of next release --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12a4f72..af70fa2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) -Announcement 27-03-2024: I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. +**Announcement 27-03-2024: **I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. best, Jelle Stuurman -- -- -- From 34eec694421defa7053aaa5cc7f8a04b7f731ef4 Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:10:04 +0100 Subject: [PATCH 03/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af70fa2..4ab9418 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) -**Announcement 27-03-2024: **I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. +**Announcement 27-03-2024: ** I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. best, Jelle Stuurman -- -- -- From 8ea24cebc4556c9992e27c48f20c342a4ff4ff57 Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:10:30 +0100 Subject: [PATCH 04/12] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ab9418..4d5d748 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) -**Announcement 27-03-2024: ** I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. +## Announcement 27-03-2024 +I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. best, Jelle Stuurman -- -- -- From 39402cdbdd7f846099ee0e0905e4d8493264a58d Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:11:07 +0100 Subject: [PATCH 05/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d5d748..c5c1f63 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) ## Announcement 27-03-2024 -I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this pacage by the end of April 2024. +I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this package by the end of April 2024. best, Jelle Stuurman -- -- -- From 77aca89efee861e922ff0c1f1d049cc13d6e03ff Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:18:41 +0100 Subject: [PATCH 06/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5c1f63..280ad38 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) ## Announcement 27-03-2024 -I am in the process of udating this package to the latest standards. Retired PDOK URLs will be replaced with the new ones and old R package dependecies will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this package by the end of April 2024. +I am in the process of updating this package to the latest R and PDOK standards. Retired PDOK URLs will be replaced with the new ones and old R package dependencies (such as rgdal) will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this package by the end of April 2024. best, Jelle Stuurman -- -- -- From eb474b40da20918cd8596d50e58feb86bc7e8842 Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:23:11 +0100 Subject: [PATCH 07/12] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 280ad38..5a6764b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,12 @@ release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) ## Announcement 27-03-2024 -I am in the process of updating this package to the latest R and PDOK standards. Retired PDOK URLs will be replaced with the new ones and old R package dependencies (such as rgdal) will be replaced. Please note that the next release wil not include the point cloud functionalities. I hope to have updated this package by the end of April 2024. +I am in the process of updating this package to the latest R and PDOK standards. Retired PDOK URLs will be replaced with the new ones and old R package dependencies (such as rgdal) will be replaced. Please note that the next release wil not include the following features: +- Only the latest available AHN will be used. Getting height data from the AHN1, AHN2 or AHN3 will not be possible because PDOK no longer makes these AHN services available. +- Point cloud functionalities will not be preesent because deeper investigation needs to be done on which R packages support this features. Maybe this feature wil be come back in a future release. + + +I hope to have updated this package by the end of April 2024. best, Jelle Stuurman -- -- -- From f2aebe2f2e11dca76d40bbf06f35ca637481de8d Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 27 Mar 2024 18:24:07 +0100 Subject: [PATCH 08/12] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5a6764b..71d5fd1 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,7 @@ pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?inclu ## Announcement 27-03-2024 I am in the process of updating this package to the latest R and PDOK standards. Retired PDOK URLs will be replaced with the new ones and old R package dependencies (such as rgdal) will be replaced. Please note that the next release wil not include the following features: - Only the latest available AHN will be used. Getting height data from the AHN1, AHN2 or AHN3 will not be possible because PDOK no longer makes these AHN services available. -- Point cloud functionalities will not be preesent because deeper investigation needs to be done on which R packages support this features. Maybe this feature wil be come back in a future release. - +- Downloading point cloud data will not be available because deeper investigation needs to be done on which R packages support this feature. Maybe this feature wil be come back in a future release. I hope to have updated this package by the end of April 2024. From 258e3f03dfa5146e5d696d767b4a57454bc49b1b Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Wed, 10 Apr 2024 21:47:44 +0200 Subject: [PATCH 09/12] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index b733365..9eae77e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ AHN_output/ Rcode rAHNextract_test.qgz my_output/ -Nederwaard1/ Routput - Shortcut.lnk README_cache setupPackage.R From d18869a060850ec79a39e26d77117a9cabe8a279 Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Thu, 11 Apr 2024 01:39:01 +0200 Subject: [PATCH 10/12] removed print statement --- R/ahn_point.R | 1 - README.Rmd | 6 +++--- README.html | 6 +++--- README.md | 4 ++-- docs/index.html | 4 ++-- docs/pkgdown.yml | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/R/ahn_point.R b/R/ahn_point.R index 642f9e4..7975bdc 100644 --- a/R/ahn_point.R +++ b/R/ahn_point.R @@ -49,7 +49,6 @@ ahn_point <- function(name = "AHNelevation", X, Y, AHN = "AHN", dem, resolution, if (sheets.method == FALSE) { ##get elevation through WCS method (fast) wcs_source <- bladIndex.sf$wcs_url[1] - print(bladIndex.sf$wcs_url[1]) wcs_url <- create_wcs_url(type = "point", bbox = my_point$bbox, AHN = AHN, dem = dem, resolution = my_resolution, interpolate = interpolate, wcs = wcs_source) raster_data <- download_wcs_raster(wcsUrl = wcs_url, name = name_trim, area = ahn_area, AHN = AHN, dem = tolower(dem), resolution = my_resolution, output.dir = output.dir, interpolate = interpolate, type = "point") my_elevation <- extract_elevation(raster_data$data, my_point$point, extract.method = extract.method) diff --git a/README.Rmd b/README.Rmd index 455f7dd..983fa87 100644 --- a/README.Rmd +++ b/README.Rmd @@ -25,7 +25,7 @@ knitr::opts_chunk$set( ) ``` -# rAHNextract +# rAHNextract 0.98 [![Lifecycle: maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing)![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) @@ -110,7 +110,7 @@ The `ahn_area()`returns the AHN elevation raster of the provided area. ##### 4.2.1.1 circle This example gets a circular area from the AHN DSM, and saving its output raster in a custom output directory. ```{r AHN_raster_areas_circle} -Utrecht_circleWCS <- ahn_area(name = "Utrecht circle",X = 136544, Y = 456070, resolution = 0.5, radius = 130, output.dir = "C:/myProject") +Utrecht_circleWCS <- ahn_area(name = "Utrecht circle", X = 136544, Y = 456070, resolution = 0.5, radius = 130, output.dir = "C:/myProject") plot(Utrecht_circleWCS, xlab = "RD X", ylab = "RD Y", main = "AHN Elevation (m)") ``` @@ -158,5 +158,5 @@ ahn_area(AHN = "AHN", dem = "DTM", sheets = list("31HN1", "31HN2"), sheets.dir = Please see [here]() all the parameters available for `ahn_area()` -### 5 Point clouds areas +### 5. Point clouds areas Support for downloading point clouds is no longer available in this release. Support may come back in a future release. diff --git a/README.html b/README.html index 32e1377..60dedb4 100644 --- a/README.html +++ b/README.html @@ -601,10 +601,10 @@ -

rAHNextract

+

rAHNextract 0.98

-

Lifecycle: maturingGitHub release (latest by date including pre-releases)

+

Lifecycle: maturingGitHub release (latest by date including pre-releases)

Updated: 11-04-2024

@@ -842,7 +842,7 @@

4.3 Downloading only sheets

#> [1] "C:/myProject/AHN_sheets/AHN4/DTM/M_31HN1.tif" "C:/myProject/AHN_sheets/AHN4/DTM/M_31HN2.tif"

Please see here all the parameters available for ahn_area()

-

5 Point clouds areas

+

5. Point clouds areas

Support for downloading point clouds is no longer available in this release. Support may come back in a future release.

diff --git a/README.md b/README.md index 2bdca87..22eae7d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# rAHNextract +# rAHNextract 0.98 @@ -269,7 +269,7 @@ ahn_area(AHN = "AHN", dem = "DTM", sheets = list("31HN1", "31HN2"), sheets.dir = Please see [here]() all the parameters available for `ahn_area()` -### 5 Point clouds areas +### 5. Point clouds areas Support for downloading point clouds is no longer available in this release. Support may come back in a future release. diff --git a/docs/index.html b/docs/index.html index 871b9c9..7fc30c3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -65,7 +65,7 @@
-

rAHNextract +

rAHNextract 0.98

@@ -278,7 +278,7 @@

4.3 Downloading only sheets -

5 Point clouds areas +

5. Point clouds areas

Support for downloading point clouds is no longer available in this release. Support may come back in a future release.

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 59d659a..189fd18 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,5 +2,5 @@ pandoc: 3.1.13 pkgdown: 2.0.7 pkgdown_sha: ~ articles: {} -last_built: 2024-04-10T23:13Z +last_built: 2024-04-11T07:25Z From 1e5f8e7677197b61b53dedb6088b352438a19cbf Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Thu, 11 Apr 2024 09:52:35 +0200 Subject: [PATCH 11/12] fixed naming --- README.Rmd | 2 +- README.html | 2 +- README.md | 2 +- docs/index.html | 2 +- docs/pkgdown.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.Rmd b/README.Rmd index 983fa87..6dc1f44 100644 --- a/README.Rmd +++ b/README.Rmd @@ -25,7 +25,7 @@ knitr::opts_chunk$set( ) ``` -# rAHNextract 0.98 +# rAHNextract 0.98 dev [![Lifecycle: maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing)![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/Jellest/rAHNextract?include_prereleases) diff --git a/README.html b/README.html index 60dedb4..adf65a7 100644 --- a/README.html +++ b/README.html @@ -601,7 +601,7 @@ -

rAHNextract 0.98

+

rAHNextract 0.98 dev

Lifecycle: maturingGitHub release (latest by date including pre-releases)

diff --git a/README.md b/README.md index 22eae7d..a68d871 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# rAHNextract 0.98 +# rAHNextract 0.98 dev diff --git a/docs/index.html b/docs/index.html index 7fc30c3..6973510 100644 --- a/docs/index.html +++ b/docs/index.html @@ -65,7 +65,7 @@
-

rAHNextract 0.98 +

rAHNextract 0.98 dev

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 189fd18..37ad5d7 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,5 +2,5 @@ pandoc: 3.1.13 pkgdown: 2.0.7 pkgdown_sha: ~ articles: {} -last_built: 2024-04-11T07:25Z +last_built: 2024-04-11T07:48Z From 962d81863d01ba9b4d7702bbfedad07a4d083dfa Mon Sep 17 00:00:00 2001 From: Jelle Stuurman Date: Thu, 11 Apr 2024 10:13:58 +0200 Subject: [PATCH 12/12] fixed parameter --- R/ahn_sheets_info.R | 4 ++-- docs/pkgdown.yml | 2 +- man/ahn_sheets_info.Rd | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/R/ahn_sheets_info.R b/R/ahn_sheets_info.R index 41813ab..91a418d 100644 --- a/R/ahn_sheets_info.R +++ b/R/ahn_sheets_info.R @@ -1,9 +1,9 @@ #'@title AHN sheets info -#'@description get polygon features that desribe the AHN sheets +#'@description get polygon features that describe the AHN sheets #'@inheritParams ahn_area #'@export #'@author Jelle Stuurman -ahn_sheets_info <- function(AHN, dem, output.dir) { +ahn_sheets_info <- function(AHN, dem, resolution, output.dir) { if (missing(AHN) == TRUE) { stop("No value provided for the AHN prameter. Please enter a valid AHN parameter.") } diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 37ad5d7..5f8a840 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,5 +2,5 @@ pandoc: 3.1.13 pkgdown: 2.0.7 pkgdown_sha: ~ articles: {} -last_built: 2024-04-11T07:48Z +last_built: 2024-04-11T08:07Z diff --git a/man/ahn_sheets_info.Rd b/man/ahn_sheets_info.Rd index c6afe4e..0f836c0 100644 --- a/man/ahn_sheets_info.Rd +++ b/man/ahn_sheets_info.Rd @@ -4,17 +4,19 @@ \alias{ahn_sheets_info} \title{AHN sheets info} \usage{ -ahn_sheets_info(AHN, dem, output.dir) +ahn_sheets_info(AHN, dem, resolution, output.dir) } \arguments{ \item{AHN}{Default 'AHN'. 'AHN' This is the latest full version made available by \href{https://www.pdok.nl/introductie/-/article/actueel-hoogtebestand-nederland-ahn}{PDOK} through their OGC Web services. Choose between 'AHN4', 'AHN3', 'AHN2', or 'AHN1'.} \item{dem}{Default 'DSM'. Choose type of Digital Elevation Model. 'DSM' or 'DTM'. AHN1 only has 'DTM'.} +\item{resolution}{Default 0.5 meters for AHN2/AHN3/AHN4, 5 meters for AHN1. Choose resolution of AHN in meters. AHN3 and AHN2 both have 0.5 and 5 meters. AHN1 has 5 and 100 m.} + \item{output.dir}{Optional but unnecessary. Set location of output raster files. Leaving blank (default) will make all output point files be temporary files. This output directory excludes the location of the AHN sheets which is depicted with the \code{sheets.dir} parameter.} } \description{ -get polygon features that desribe the AHN sheets +get polygon features that describe the AHN sheets } \author{ Jelle Stuurman