#181 support M4 - MSR (spatial representation) classes

eblondel · Oct 4, 2024 · 6e828e9 · 6e828e9
1 parent 3074694
commit 6e828e9
Show file tree

Hide file tree

Showing 40 changed files with 232 additions and 177 deletions.
diff --git a/R/ISOCellGeometry.R b/R/ISOCellGeometry.R
@@ -6,13 +6,6 @@
 #' @keywords ISO cell geometry
 #' @return Object of \code{\link{R6Class}} for modelling an ISO CellGeometryCode
 #' @format \code{\link{R6Class}} object.
-#'
-#' @section Methods:
-#' \describe{
-#'  \item{\code{new(xml,value, description)}}{
-#'    This method is used to instantiate an \code{\link{ISOCellGeometry}}
-#'  }
-#' }
 #' 
 #' @examples 
 #'   #possible values
@@ -22,15 +15,20 @@
 #'   pointCode <- ISOCellGeometry$new(value = "point")
 #'   
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata 
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_CellGeometryCode}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_CellGeometryCode}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOCellGeometry <- R6Class("ISOCellGeometry",
     inherit = ISOCodeListValue,
     private = list(
       xmlElement = "MD_CellGeometryCode",
-      xmlNamespacePrefix = "GMD"
+      xmlNamespacePrefix = list(
+        "19139" = "GMD",
+        "19115-3" = "MSR"
+      )
     ),
     public = list(
 

diff --git a/R/ISODimension.R b/R/ISODimension.R
@@ -16,15 +16,20 @@
 #'    xml <- md$encode()
 #'    
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata 
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_Dimension}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_Dimension}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISODimension <- R6Class("ISODimension",
    inherit = ISOAbstractObject,
    private = list(
      xmlElement = "MD_Dimension",
-     xmlNamespacePrefix = "GMD"
+     xmlNamespacePrefix = list(
+       "19139" = "GMD",
+       "19115-3" = "MSR"
+     )
    ),
    public = list(
      #'@field dimensionName dimensionName [1..1]: ISODimensionNameType

diff --git a/R/ISODimensionNameType.R b/R/ISODimensionNameType.R
@@ -15,15 +15,20 @@
 #'   rowType <- ISODimensionNameType$new(value = "row")
 #'   
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata 
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_DimensionNameTypeCode}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_DimensionNameTypeCode}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISODimensionNameType <- R6Class("ISODimensionNameType",
     inherit = ISOCodeListValue,
     private = list(
       xmlElement = "MD_DimensionNameTypeCode",
-      xmlNamespacePrefix = "GMD"
+      xmlNamespacePrefix = list(
+        "19139" = "GMD",
+        "19115-3" = "MSR"
+      )
     ),
     public = list(
 

diff --git a/R/ISOGeometricObjectType.R b/R/ISOGeometricObjectType.R
@@ -15,15 +15,20 @@
 #'   pt <- ISOGeometricObjectType$new(value = "point")
 #' 
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_GeometricObjectTypeCode}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_GeometricObjectTypeCode}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOGeometricObjectType <- R6Class("ISOGeometricObjectType",
   inherit = ISOCodeListValue,
   private = list(
     xmlElement = "MD_GeometricObjectTypeCode",
-    xmlNamespacePrefix = "GMD"
+    xmlNamespacePrefix = list(
+      "19139" = "GMD",
+      "19115-3" = "MSR"
+    )
   ),
   public = list(
 

diff --git a/R/ISOGeometricObjects.R b/R/ISOGeometricObjects.R
@@ -14,15 +14,20 @@
 #'   xml <- md$encode()
 #' 
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_GeometricObjects}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_GeometricObjects}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOGeometricObjects <- R6Class("ISOGeometricObjects",
    inherit = ISOAbstractObject,
    private = list(
      xmlElement = "MD_GeometricObjects",
-     xmlNamespacePrefix = "GMD"
+     xmlNamespacePrefix = list(
+       "19139" = "GMD",
+       "19115-3" = "MSR"
+     )
    ),
    public = list(
      #'@field geometricObjectType geometricObjectType

diff --git a/R/ISOGeorectified.R b/R/ISOGeorectified.R
@@ -8,15 +8,20 @@
 #' @format \code{\link{R6Class}} object.
 #'   
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata 
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_Georectified}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_Georectified}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOGeorectified <- R6Class("ISOGeorectified",
    inherit = ISOGridSpatialRepresentation,
    private = list(
      xmlElement = "MD_Georectified",
-     xmlNamespacePrefix = "GMD"
+     xmlNamespacePrefix = list(
+       "19139" = "GMD",
+       "19115-3" = "MSR"
+     )
    ),
    public = list(
 

diff --git a/R/ISOGeoreferenceable.R b/R/ISOGeoreferenceable.R
@@ -31,15 +31,20 @@
 #'   xml <- md$encode()
 #' 
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_Georeferenceable}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_Georeferenceable}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOGeoreferenceable <- R6Class("ISOGeoreferenceable",
     inherit = ISOGridSpatialRepresentation,
     private = list(
       xmlElement = "MD_Georeferenceable",
-      xmlNamespacePrefix = "GMD"
+      xmlNamespacePrefix = list(
+        "19139" = "GMD",
+        "19115-3" = "MSR"
+      )
     ),
     public = list(
 

diff --git a/R/ISOGridSpatialRepresentation.R b/R/ISOGridSpatialRepresentation.R
@@ -19,15 +19,20 @@
 #'   xml <- md$encode()
 #' 
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_GridSpatialRepresentation}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_GridSpatialRepresentation}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOGridSpatialRepresentation <- R6Class("ISOGridSpatialRepresentation",
     inherit = ISOSpatialRepresentation,
     private = list(
       xmlElement = "MD_GridSpatialRepresentation",
-      xmlNamespacePrefix = "GMD"
+      xmlNamespacePrefix = list(
+        "19139" = "GMD",
+        "19115-3" = "MSR"
+      )
     ),
     public = list(
 

diff --git a/R/ISOImageryGCP.R b/R/ISOImageryGCP.R
@@ -15,15 +15,20 @@
 #'   xml <- md$encode()
 #' 
 #' @references 
-#'   ISO 19115-2:2009 - Geographic information -- Metadata Part 2: Extensions for imagery and gridded data
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19115/-2/gmi/1.0/gmi/#element_MI_GCP}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MI_GCP}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOImageryGCP <- R6Class("ISOImageryGCP",
  inherit = GMLAbstractObject,
  private = list(
    xmlElement = "MI_GCP",
-   xmlNamespacePrefix = "GMI"
+   xmlNamespacePrefix = list(
+     "19139" = "GMI",
+     "19115-3" = "MSR"
+   )
  ),
  public = list(
    #'@field geographicCoordinates geographicCoordinates

diff --git a/R/ISOImageryGCPCollection.R b/R/ISOImageryGCPCollection.R
@@ -7,29 +7,6 @@
 #' @return Object of \code{\link{R6Class}} for modelling an ISO imagery gcp collection
 #' @format \code{\link{R6Class}} object.
 #' 
-#' @section Methods:
-#' \describe{
-#'  \item{\code{new(xml)}}{
-#'    This method is used to instantiate an \code{\link{ISOImageryGCPCollection}}
-#'  }
-#'  \item{\code{setCollectionIdentification(id)}}{
-#'    Set the identifier, object of class \code{integer}
-#'  }
-#'  \item{\code{setCollectionName(name, locales)}}{
-#'    Sets a name (object of class "character"). Locale names can be 
-#'    specified as \code{list} with the \code{locales} argument.
-#'  }
-#'  \item{\code{setCoordinateReferenceSystem(crs)}}{
-#'    Sets the crs, object of class \code{\link{ISOReferenceSystem}}
-#'  }
-#'  \item{\code{addGCP(gcp)}}{
-#'    Adds a GCP, object of class \code{\link{ISOImageryGCP}}
-#'  }
-#'  \item{\code{delGCP(gcp)}}{
-#'    Deletes a GCP, object of class \code{\link{ISOImageryGCP}}
-#'  }
-#' }
-#' 
 #' @examples
 #'   md <- ISOImageryGCPCollection$new()
 #'   md$setCollectionIdentification(1L)
@@ -41,23 +18,28 @@
 #'   xml <- md$encode()
 #' 
 #' @references 
-#'   ISO 19115-2:2009 - Geographic information -- Metadata Part 2: Extensions for imagery and gridded data
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19115/-2/gmi/1.0/gmi/#element_MI_GCPCollection}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MI_GCPCollection}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOImageryGCPCollection <- R6Class("ISOImageryGCPCollection",
   inherit = ISOImageryAbstractGeolocationInformation,
   private = list(
     xmlElement = "MI_GCPCollection",
-    xmlNamespacePrefix = "GMI"
+    xmlNamespacePrefix = list(
+      "19139" = "GMI",
+      "19115-3" = "MSR"
+    )
   ),
   public = list(
 
     #'@field collectionIdentification collectionIdentification [1..1]: integer
     collectionIdentification = NULL,
     #'@field collectionName collectionName [1..1]: character|ISOLocalisedCharacterString
     collectionName = NULL,
-    #'@field coordinateReferenceSystem coordinateReferenceSystem [1..1]: ISOReferenceSystem
+    #'@field coordinateReferenceSystem coordinateReferenceSystem [1..1]: ISOAbstractReferenceSystem
     coordinateReferenceSystem = NULL,
     #'@field gcp gcp [0..*]: list of ISOImageryGCP
     gcp = list(),
@@ -92,10 +74,10 @@ ISOImageryGCPCollection <- R6Class("ISOImageryGCPCollection",
     },
 
     #'@description Set coordinate reference system
-    #'@param crs object of class \link{ISOReferenceSystem}
+    #'@param crs object of class inheriting \link{ISOAbstractReferenceSystem}
     setCoordinateReferenceSystem = function(crs){
-      if(!is(crs, "ISOReferenceSystem")){
-        stop("The argument should be an object of class 'ISOReferenceSystem'")
+      if(!is(crs, "ISOAbstractReferenceSystem")){
+        stop("The argument should be an object inheriting class 'ISOAbstractReferenceSystem'")
       }
       self$coordinateReferenceSystem <- crs
     },

diff --git a/R/ISOImageryGeolocationInformation.R b/R/ISOImageryGeolocationInformation.R
@@ -10,15 +10,20 @@
 #' @note abstract class
 #'  
 #' @references 
-#'   ISO 19115-2:2009 - Geographic information -- Metadata Part 2: Extensions for imagery and gridded data
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19115/-2/gmi/1.0/gmi/#element_AbstractMI_GeolocationInformation}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_AbstractMI_GeolocationInformation}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOImageryAbstractGeolocationInformation <- R6Class("ISOImageryAbstractGeolocationInformation",
     inherit = ISOAbstractObject,
     private = list(
       xmlElement = "AbstractMI_GeolocationInformation",
-      xmlNamespacePrefix = "GMI"
+      xmlNamespacePrefix = list(
+        "19139" = "GMI",
+        "19115-3" = "MSR"
+      )
     ),
     public = list(
 

diff --git a/R/ISOImageryGeorectified.R b/R/ISOImageryGeorectified.R
@@ -8,15 +8,20 @@
 #' @format \code{\link{R6Class}} object.
 #'
 #' @references 
-#'   ISO 19115-2:2009 - Geographic information -- Metadata -- Part 2: Extensions for imagery and gridded data
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19115/-2/gmi/1.0/gmi/#element_MI_Georectified}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MI_Georectified}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOImageryGeorectified <- R6Class("ISOImageryGeorectified",
    inherit = ISOGeorectified,
    private = list(
      xmlElement = "MI_Georectified",
-     xmlNamespacePrefix = "GMI"
+     xmlNamespacePrefix = list(
+       "19139" = "GMI",
+       "19115-3" = "MSR"
+     )
    ),
    public = list(
 

diff --git a/R/ISOImageryGeoreferenceable.R b/R/ISOImageryGeoreferenceable.R
@@ -8,15 +8,20 @@
 #' @format \code{\link{R6Class}} object.
 #'
 #' @references 
-#'   ISO 19115-2:2009 - Geographic information -- Metadata -- Part 2: Extensions for imagery and gridded data
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19115/-2/gmi/1.0/gmi/#element_MI_Georeferenceable}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MI_Georeferenceable}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOImageryGeoreferenceable <- R6Class("ISOImageryGeoreferenceable",
   inherit = ISOGeoreferenceable,
   private = list(
     xmlElement = "MI_Georeferenceable",
-    xmlNamespacePrefix = "GMI"
+    xmlNamespacePrefix = list(
+      "19139" = "GMI",
+      "19115-3" = "MSR"
+    )
   ),
   public = list(
 

diff --git a/R/ISOPixelOrientation.R b/R/ISOPixelOrientation.R
@@ -15,15 +15,20 @@
 #'   PixelOrientation <- ISOPixelOrientation$new(value = "center")
 #' 
 #' @references 
-#'   ISO 19115:2003 - Geographic information -- Metadata
+#'   - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_PixelOrientationCode}
+#'   
+#'   - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/msr/1.0/msr/#element_MD_PixelOrientationCode}
 #' 
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOPixelOrientation <- R6Class("ISOPixelOrientation",
   inherit = ISOCodeListValue,
   private = list(
     xmlElement = "MD_PixelOrientationCode",
-    xmlNamespacePrefix = "GMD"
+    xmlNamespacePrefix = list(
+      "19139" = "GMD",
+      "19115-3" = "MSR"
+    )
   ),
   public = list(
 

diff --git a/R/ISOReferenceSystem.R b/R/ISOReferenceSystem.R
@@ -21,7 +21,7 @@
 #' @author Emmanuel Blondel <emmanuel.blondel1@@gmail.com>
 #'
 ISOReferenceSystem <- R6Class("ISOReferenceSystem",
-  inherit = ISOAbstractObject,
+  inherit = ISOAbstractReferenceSystem,
   private = list(
     xmlElement = "MD_ReferenceSystem",
     xmlNamespacePrefix = list(