#153 fix ISOImageryGCP, ISOImageryGeorectified, ISOImageryGeoreferenc…

…eable
eblondel · Jun 11, 2019 · f06d32e · f06d32e
1 parent 3ccdb44
commit f06d32e
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -202,7 +202,7 @@ export(ISOImageryGCP)
 export(ISOImageryGCPCollection)
 export(ISOImageryGeometryType)
 export(ISOImageryGeorectified)
-export(ISOImageryGeoreferencerable)
+export(ISOImageryGeoreferenceable)
 export(ISOImageryImageDescription)
 export(ISOImageryInstrument)
 export(ISOImageryMetadata)

diff --git a/R/ISOImageryGCP.R b/R/ISOImageryGCP.R
@@ -51,7 +51,7 @@ ISOImageryGCP <- R6Class("ISOImageryGCP",
  public = list(
    geographicCoordinates = matrix(NA_real_, 1, 2),
    initialize = function(xml = NULL){
-     super$initialize(xml = xml)
+     super$initialize(xml = xml, wrap = TRUE)
    },
 
    #setGeographicCoordinates

diff --git a/R/ISOImageryGeorectified.R b/R/ISOImageryGeorectified.R
@@ -37,7 +37,7 @@
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
-ISOImageryGeorectified <- R6Class("ISOImageGeorectified",
+ISOImageryGeorectified <- R6Class("ISOImageryGeorectified",
    inherit = ISOGeorectified,
    private = list(
      xmlElement = "MI_Georectified",
@@ -53,17 +53,17 @@ ISOImageryGeorectified <- R6Class("ISOImageGeorectified",
      },
 
      #addCheckPoint
-     addcheckPoint = function(sfg = NULL, m = NULL){
-       checkPoint <- ISOImageryGCP$new()
-       checkPoint$setGeographicCoordinates(sfg = sfg, m = m)
-       return(self$addListElement("checkPoint", checkPoint))
+     addCheckPoint = function(sfg = NULL, m = NULL){
+       gcp<- ISOImageryGCP$new()
+       gcp$setGeographicCoordinates(sfg = sfg, m = m)
+       return(self$addListElement("checkPoint", gcp))
      },
 
      #delCheckPoint
-     delcheckPoint = function(sfg = NULL, m = NULL){
-       checkPoint <- ISOImageryGCP$new()
-       checkPoint$setGeographicCoordinates(sfg = sfg, m = m)
-       return(self$delListElement("checkPoint", checkPoint))
+     delCheckPoint = function(sfg = NULL, m = NULL){
+       gcp<- ISOImageryGCP$new()
+       gcp$setGeographicCoordinates(sfg = sfg, m = m)
+       return(self$delListElement("checkPoint", gcp))
      }
 
    )                        

diff --git a/R/ISOImageryGeoreferenceable.R b/R/ISOImageryGeoreferenceable.R
@@ -1,18 +1,18 @@
-#' ISOImageryGeoreferencerable
+#' ISOImageryGeoreferenceable
 #'
 #' @docType class
 #' @importFrom R6 R6Class
 #' @export
-#' @keywords ISO imagery Georeferencerable
-#' @return Object of \code{\link{R6Class}} for modelling an ISO imagery Georeferencerable
+#' @keywords ISO imagery Georeferenceable
+#' @return Object of \code{\link{R6Class}} for modelling an ISO imagery Georeferenceable
 #' @format \code{\link{R6Class}} object.
 #'
 #' @field geolocationInformation [\code{list} of \code{\link{ISOImageryAbstractGeolocationInformation}}]
 #' 
 #' @section Methods:
 #' \describe{
 #'  \item{\code{new(xml,value)}}{
-#'    This method is used to instantiate an \code{\link{ISOImageryGeoreferencerable}}
+#'    This method is used to instantiate an \code{\link{ISOImageryGeoreferenceable}}
 #'  }
 #'  \item{\code{addGeolocationInformation(geolocationInformation)}}{
 #'    Adds a geolocation information, an object of class \code{\link{ISOImageryAbstractGeolocationInformation}}
@@ -37,8 +37,8 @@
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
-ISOImageryGeoreferencerable <- R6Class("ISOImageryGeoreferencerable",
-  inherit = ISOGeoreferencerable,
+ISOImageryGeoreferenceable <- R6Class("ISOImageryGeoreferenceable",
+  inherit = ISOGeoreferenceable,
   private = list(
     xmlElement = "MI_Georeferenceable",
     xmlNamespacePrefix = "GMI"

diff --git a/inst/extdata/coverage/geometa_coverage_inventory.csv b/inst/extdata/coverage/geometa_coverage_inventory.csv
@@ -166,7 +166,7 @@
 "ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_GCPCollection","ISOImageryGCPCollection",TRUE
 "ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_GeometryTypeCode","ISOImageryGeometryType",TRUE
 "ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_Georectified","ISOImageryGeorectified",TRUE
-"ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_Georeferenceable","ISOImageryGeoreferencerable",TRUE
+"ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_Georeferenceable","ISOImageryGeoreferenceable",TRUE
 "ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_ImageDescription","ISOImageryImageDescription",TRUE
 "ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_Instrument","ISOImageryInstrument",TRUE
 "ISO/TC211 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","MI_Metadata","ISOImageryMetadata",TRUE

diff --git a/man/ISOImageryGeoreferencerable.Rd → man/ISOImageryGeoreferenceable.Rd b/man/ISOImageryGeoreferencerable.Rd → man/ISOImageryGeoreferenceable.Rd
diff --git a/tests/testthat/test_ISOImageryGeorectified.R b/tests/testthat/test_ISOImageryGeorectified.R
@@ -11,7 +11,7 @@ context("ISOImageryGeorecrified")
 
 test_that("encoding",{
   #encoding
-  md <- ISOImageryGeorecrified$new()
+  md <- ISOImageryGeorectified$new()
   md$setNumberOfDimensions(1)
   md$setTransformationParameterAvailability(FALSE)
   dim1 <- ISODimension$new()
@@ -34,7 +34,7 @@ test_that("encoding",{
   expect_is(xml, "XMLInternalNode")
 
   #decoding
-  md2 <- ISOImageryGeorecrified$new(xml = xml)
+  md2 <- ISOImageryGeorectified$new(xml = xml)
   xml2 <- md2$encode()
 
   expect_true(ISOAbstractObject$compare(md, md2))