eblondel#185 implement GMLEnvelope, GMLEnvelopeWithTimePeriod backwar…

…d-compatibility for GML < 3
yvanlebras · Feb 14, 2022 · f3bdb3a · f3bdb3a
1 parent 3350f2b
commit f3bdb3a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/R/GMLEnvelope.R b/R/GMLEnvelope.R
@@ -71,10 +71,9 @@ GMLEnvelope <- R6Class("GMLEnvelope",
       super$decode(xml)
       #backward compatibility in case of GML < 3
       children <- xmlChildren(xml)
-      if(length(children) == 2 && names(children)[[1]]=="pos"){
-         self$lowerCorner <- t(as.matrix(as.numeric(unlist(strsplit(xmlValue(children[[1]]), " ")))))
-         self$upperCorner <- t(as.matrix(as.numeric(unlist(strsplit(xmlValue(children[[2]]), " ")))))
-      }
+      children <- children[names(children)=="pos"]
+      self$lowerCorner <- t(as.matrix(as.numeric(unlist(strsplit(xmlValue(children[[1]]), " ")))))
+      self$upperCorner <- t(as.matrix(as.numeric(unlist(strsplit(xmlValue(children[[2]]), " ")))))
    }
  )
 )
diff --git a/R/GMLEnvelopeWithTimePeriod.R b/R/GMLEnvelopeWithTimePeriod.R
@@ -53,6 +53,16 @@ GMLEnvelopeWithTimePeriod <- R6Class("GMLEnvelopeWithTimePeriod",
        }
      },
 
+     #decode
+     decode = function(xml){
+        super$decode(xml)
+        #backward compatibility in case of GML < 3
+        children <- xmlChildren(xml)
+        children <- children[names(children)=="timePosition"]
+        self$beginPosition <- as.POSIXct(strptime(unlist(strsplit(xmlValue(children[[1]]), " ")), "%Y-%m-%dT%H:%M:%S"), tz = "") 
+        self$endPosition <- as.POSIXct(strptime(unlist(strsplit(xmlValue(children[[2]]), " ")), "%Y-%m-%dT%H:%M:%S"), tz = "")
+     },
+
      #setBeginPosition
      setBeginPosition = function(beginPosition){
        if(!all(class(beginPosition)==c("POSIXct","POSIXt")) | is(beginPosition, "Date")){