#1 missing Rdoc

NAMESPACE

@@ -4,7 +4,6 @@ export(OWSClient)
 export(OWSRequest)
 export(OWSServiceIdentification)
 export(OWSUtils)
-export(OWSUtilsInternal)
 export(WFSCapabilities)
 export(WFSClient)
 export(WFSDescribeFeatureType)

R/OWSRequest.R

@@ -1,11 +1,31 @@
+#' OWSRequest
+#'
+#' @docType class
 #' @export
+#' @keywords OGC OWS Request
+#' @return Object of \code{\link{R6Class}} for modelling a generic OWS request
+#' @format \code{\link{R6Class}} object.
+#'
+#' @field request
+#' @field status
+#' @field response
+#'
+#' @section Methods:
+#' \describe{
+#'  \item{\code{new(url, namedParams, mimeType)}}{
+#'    This method is used to instantiate a object for doing an OWS request
+#'  }
+#' }
+#' 
+#' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
+#'
 OWSRequest <- R6Class("OWSRequest",
   #private methods
   private = list(
     #buildRequest
-    buildRequest = function(baseUrl, namedParams, mimeType){
+    buildRequest = function(url, namedParams, mimeType){
       params <- paste(names(namedParams), namedParams, sep = "=", collapse = "&")
-      request <- paste(baseUrl, "&", params, sep = "")
+      request <- paste(url, "&", params, sep = "")
       message("Fetching ", request)
       r <- GET(request)
       responseContent <- NULL
@@ -28,8 +48,8 @@ OWSRequest <- R6Class("OWSRequest",
     status = NA,
     response = NA,
     #initialize
-    initialize = function(baseUrl, namedParams, mimeType = "text/xml") {
-      req <- private$buildRequest(baseUrl, namedParams, mimeType)
+    initialize = function(url, namedParams, mimeType = "text/xml") {
+      req <- private$buildRequest(url, namedParams, mimeType)
       self$request <- req$request
       self$status <- req$status
       self$response <- req$response

R/OWSUtils.R

@@ -1,10 +1,18 @@
+#' OWSUtils
+#'
 #' @export
-OWSUtilsInternal <- R6Class("OWSUtilsInternal",
-  public = list(
-
-    initialize = function(){
-    },
-
+#' @keywords OGC OWS Utils
+#' @return set of OWS Utilities
+#' @format \code{\link{R6Class}} object.
+#'
+#' @section Static methods:
+#' \describe{
+#' }
+#' 
+#' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
+#'
+OWSUtils <- list(
+
     #getNamespaces
     #---------------------------------------------------------------
     getNamespaces = function(xmlObj) {
@@ -137,16 +145,4 @@ OWSUtilsInternal <- R6Class("OWSUtilsInternal",
       ratio <- (bbox[1,2]-bbox[1,1]) / (bbox[2,2]-bbox[2,1])
       return(ratio)
     }
-
-  )
-)
-
-#'@export
-OWSUtils <- list(
-  getNamespaces = OWSUtilsInternal$new()$getNamespaces,
-  findNamespace = OWSUtilsInternal$new()$findNamespace,
-  toBBOX = OWSUtilsInternal$new()$toBBOX,
-  toCRS = OWSUtilsInternal$new()$toCRS,
-  toEPSG = OWSUtilsInternal$new()$toEPSG,
-  getAspectRatio = OWSUtilsInternal$new()$getAspectRatio
-)  
+)