#43 getfeatureinfo compatibility with wms 1.3

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ows4R
 Version: 0.2
-Date: 2020-10-30
+Date: 2021-01-27
 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")))

R/WMSClient.R

@@ -71,7 +71,7 @@ WMSClient <- R6Class("WMSClient",
      },
 
      #getFeatureInfo
-     getFeatureInfo = function(layer, srs = NULL, crs = NULL,
+     getFeatureInfo = function(layer, srs = NULL,
                                styles = NULL, feature_count = 1,
                                x, y, width, height, bbox, 
                                info_format = "application/vnd.ogc.gml",
@@ -80,7 +80,7 @@ WMSClient <- R6Class("WMSClient",
        features <- NULL
        if(is(wmsLayer,"WMSLayer")){
           features <- wmsLayer$getFeatureInfo(
-             srs = srs, crs = crs, styles = styles, feature_count = feature_count,
+             srs = srs, styles = styles, feature_count = feature_count,
              x = x, y = y, width = width, height = height, bbox = bbox,
              info_format = info_format,
              ...

R/WMSGetFeatureInfo.R

@@ -8,7 +8,8 @@
 #'
 #' @section Methods:
 #' \describe{
-#'  \item{\code{new(op, url, version, typeName, logger, ...)}}{
+#'  \item{\code{new(op, url, version, layers, srs, styles, feature_count,
+#'                  x, y, width, height, bbox, info_format, logger, ...)}}{
 #'    This method is used to instantiate a WMSGetFeatureInfo object
 #'  }
 #' }
@@ -23,7 +24,7 @@ WMSGetFeatureInfo <- R6Class("WMSGetFeatureInfo",
    name = "GetFeatureInfo"
  ), 
  public = list(
-   initialize = function(op, url, version, layers, srs, crs, styles, feature_count = 1,
+   initialize = function(op, url, version, layers, srs, styles, feature_count = 1,
                          x, y, width, height, bbox, info_format = "application/vnd.ogc.gml",
                          logger = NULL, ...) {
 
@@ -37,14 +38,14 @@ WMSGetFeatureInfo <- R6Class("WMSGetFeatureInfo",
      if(is(bbox, "matrix")){
         bbox <- paste0(bbox, collapse=",")
      }
+     #case of 1.1
      namedParams <- list(
        service = "WMS", 
        version = version,
        FORMAT = "image/png",
        TRANSPARENT = "true",
        QUERY_LAYERS = layers,
        SRS = srs,
-       CRS = crs,
        LAYERS = layers,
        STYLES = styles,
        FEATURE_COUNT = format(feature_count, scientific = FALSE),
@@ -53,6 +54,12 @@ WMSGetFeatureInfo <- R6Class("WMSGetFeatureInfo",
        BBOX = bbox,
        INFO_FORMAT = info_format
      )
+     if(startsWith(version, "1.3")){
+        names(namedParams)[which(names(namedParams)=="SRS")] <- "CRS"
+        names(namedParams)[which(names(namedParams)=="X")] <- "I"
+        names(namedParams)[which(names(namedParams)=="Y")] <- "J"
+     }
+
      vendorParams <- list(...)
      if(length(vendorParams)>0) namedParams <- c(namedParams, vendorParams)
      namedParams <- namedParams[!sapply(namedParams, is.null)]

R/ows4R.R

@@ -16,7 +16,7 @@
 #'    Type: \tab Package\cr
 #'    Version
 #'    : \tab 0.2\cr
-#'    Date: \tab 2020-10-30\cr
+#'    Date: \tab 2021-01-27\cr
 #'    License: \tab MIT\cr
 #'    LazyLoad: \tab yes\cr
 #'  }