From f758b5211931f6ded7b3de8af515536d18408acc Mon Sep 17 00:00:00 2001 From: eblondel Date: Tue, 12 Nov 2019 16:28:00 +0100 Subject: [PATCH] #32 fix major bug with WFS vendor params --- DESCRIPTION | 4 ++-- NEWS.md | 14 +++++++++----- R/WFSGetFeature.R | 3 +-- R/ows4R.R | 4 ++-- README.md | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 92896aa..1af6928 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ows4R -Version: 0.1-3 -Date: 2019-11-05 +Version: 0.1-4 +Date: 2019-11-12 Title: Interface to OGC Web-Services (OWS) Authors@R: c(person("Emmanuel", "Blondel", role = c("aut", "cre"), email = "emmanuel.blondel1@gmail.com", comment = c(ORCID = "0000-0002-5870-5762")), person("Norbert", "Billet", role = c("ctb"))) diff --git a/NEWS.md b/NEWS.md index d966a6c..5fc9531 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,13 @@ -# **[ows4R 0.2](https://github.com/eblondel/ows4R/issues?milestone=2)** -## **_0.2-0_** | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-unavailable-red.svg)](https://cran.r-project.org/package=ows4R) +# **[ows4R 0.1](https://github.com/eblondel/ows4R/issues?milestone=1)** + +## **_0.1-4_** | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-published-blue.svg)](https://cran.r-project.org/package=ows4R) + +**Corrections** + +*[#32](https://github.com/eblondel/ows4R/issues/32) Regression with WFS getfeatures - issue when setting CQL_filter + +## **_0.1-3_** | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-published-blue.svg)](https://cran.r-project.org/package=ows4R) **Corrections** @@ -16,9 +23,6 @@ _No enhancements_ * [#16](https://github.com/eblondel/ows4R/issues/26) Add support for Bearer (token) authentication * [#28](https://github.com/eblondel/ows4R/issues/28) Support geometa record validate/inspire options in CSW-T - -# **[ows4R 0.1](https://github.com/eblondel/ows4R/issues?milestone=1)** - ## **_0.1-2_** | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-published-blue.svg)](https://cran.r-project.org/package=ows4R) **Corrections** diff --git a/R/WFSGetFeature.R b/R/WFSGetFeature.R index 51478ea..a89f36e 100644 --- a/R/WFSGetFeature.R +++ b/R/WFSGetFeature.R @@ -28,8 +28,7 @@ WFSGetFeature <- R6Class("WFSGetFeature", vendorParams <- list(...) if(length(vendorParams)>0) namedParams <- c(namedParams, vendorParams) super$initialize(op, "GET", url, request = private$name, - namedParams = namedParams, mimeType = "text/xml", logger = logger, - ...) + namedParams = namedParams, mimeType = "text/xml", logger = logger) self$execute() } ) diff --git a/R/ows4R.R b/R/ows4R.R index dc2c946..b2c3640 100644 --- a/R/ows4R.R +++ b/R/ows4R.R @@ -15,8 +15,8 @@ #' Package: \tab ows4R\cr #' Type: \tab Package\cr #' Version -#' : \tab 0.1-3\cr -#' Date: \tab 2019-11-05\cr +#' : \tab 0.1-4\cr +#' Date: \tab 2019-11-12\cr #' License: \tab MIT\cr #' LazyLoad: \tab yes\cr #' } diff --git a/README.md b/README.md index 214ae5c..e1ed162 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![codecov.io](http://codecov.io/github/eblondel/ows4R/coverage.svg?branch=master)](http://codecov.io/github/eblondel/ows4R?branch=master) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/ows4R)](https://cran.r-project.org/package=ows4R) [![cran checks](https://cranchecks.info/badges/worst/ows4R)](https://cran.r-project.org/web/checks/check_results_ows4R.html) -[![Github_Status_Badge](https://img.shields.io/badge/Github-0.1--3-blue.svg)](https://github.com/eblondel/ows4R) +[![Github_Status_Badge](https://img.shields.io/badge/Github-0.1--4-blue.svg)](https://github.com/eblondel/ows4R) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1345111.svg)](https://doi.org/10.5281/zenodo.1345111) R client for OGC Web-Services