#9 fix serviceVersion-owsVersion mapping

eblondel · Feb 14, 2022 · 28053d6 · 28053d6
1 parent 838f94f
commit 28053d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/R/WCSCapabilities.R b/R/WCSCapabilities.R
@@ -52,13 +52,18 @@ WCSCapabilities <- R6Class("WCSCapabilities",
      #'@param ... any other parameter to pass to \link{OWSGetCapabilities} service request
      initialize = function(url, version, client = NULL, logger = NULL, ...) {
        owsVersion <- switch(version,
-                            "1.0" = "1.1",
+                            "1.0"   = "1.1",
                             "1.0.0" = "1.1",
+                            "1.1"   = "1.1",
                             "1.1.0" = "1.1",
                             "1.1.1" = "1.1",
                             "2.0.0" = "2.0",
-                            "2.0.1" = "2.0"
+                            "2.0.1" = "2.0",
+                            NULL
        )
+       if(is.null(owsVersion)){
+         stop(sprintf("Unknown WCS service version '%s'", version))
+       }
        super$initialize(element = private$xmlElement, namespacePrefix = private$xmlNamespacePrefix,
                         url, service = "WCS", owsVersion = owsVersion, serviceVersion = version, 
                         client = client, logger = logger, ...)

diff --git a/tests/testthat/test_WCSClient_v1_1.R b/tests/testthat/test_WCSClient_v1_1.R
@@ -50,7 +50,7 @@ test_that("WCS 1.1.1 - GeoServer",{
   expect_is(sfdem, "WCSCoverageSummary")
   sfdem_desc <- sfdem$getDescription()
   expect_is(sfdem_desc, "WCSCoverageDescription")
-  domain <- sfdem_desc$getDomain()
+
   expect_is(domain, "WCSCoverageDomain")
   expect_is(domain$getSpatialDomain(), "WCSCoverageSpatialDomain")
 })