Changeset 1506 for TI02-CSML

Timestamp:

11/09/06 15:25:05 (13 years ago)

Author:

domlowe

Message:

Aggregation working in both time and space

File:

• TI02-CSML/trunk/Examples/parsing/csml2moles.py (modified) (7 diffs)

TI02-CSML/trunk/Examples/parsing/csml2moles.py

@@ -5 +5 @@
 import cElementTree
 import elementtree.ElementTree as etree
+import datetime
 #this is a fix to the  ElementTree namespace problem that namespaces are usually represented as ns0, ns1, ns2 etc.
 etree._namespace_map.update({
         'http://www.opengis.net/om': 'om',  'http://www.opengis.net/gml': 'gml','http://ndg.nerc.ac.uk/csml' : 'csml', 'http://www.w3.org/1999/xlink':'xlink'})
 
-            
+     
+def _strToDate(ymd):
+    '''given a string in form '2006-01-01' returns a datetime object'''
+    return datetime.date(*map(int, ymd.split('-')))
+
 def _getEnvelopefromFile(f):
-    #parses a file and gets the bounding box from the feature collection
+    '''parses a file and gets the bounding box from the feature collection'''
     tree = cElementTree.ElementTree(file=f)
     dataset = csml.parser.Dataset()
@@ -20 +25 @@
 class EnvelopeAggregator(object):
     def __init__(self,envelope):
-        #start with aggregated envelope equal to the initialising envelope
-        #envelope must be of type csml.parser.EnvelopeWithTimePeriod
+        '''start with aggregated envelope equal to the initialising envelope
+        envelope must be of type csml.parser.EnvelopeWithTimePeriod'''
         self.envelope=envelope
         self.minX=self.envelope.lowerCorner.vals.split()[0]
@@ -27 +32 @@
         self.maxX=self.envelope.upperCorner.vals.split()[0]
         self.maxY=self.envelope.upperCorner.vals.split()[1]
+        self.t1= _strToDate(self.envelope.timePosition)
+        self.t2= _strToDate(self.envelope.timePosition)
  
     def _compareLowerCorners(self,lowerCorner):
@@ -36 +43 @@
             self.envelope.lowerCorner.vals=str(self.minX +' '+ minY)
             self.minY=minY
+            
     def _compareUpperCorners(self,upperCorner):
         maxX,maxY=upperCorner.vals.split()[0],upperCorner.vals.split()[1]
@@ -44 +52 @@
             self.envelope.upperCorner.vals=str(self.maxX +' '+ maxY)
             self.maxY=maxY
-        return upperCorner
-    def _compareLowerTimes(self,timeposlist):
-        return timeposlist
-    def _compareUpperTimes(self,timeposlist):
-        return timeposlist
+            
+    def _compareLowerTimes(self,timepos):
+        t=_strToDate(timepos)
+        if t<self.t1:
+            self.t1=t
+        
+    def _compareUpperTimes(self,timepos):
+        t=_strToDate(timepos)
+        if t>self.t2:
+            self.t2=t 
     
     def compareEnvelope(self,envtocheck):
-        #compares new envelope, and if necessary changes the aggregated envelope.
+        '''compares new envelope, and if necessary changes the aggregated envelope.'''
         if envtocheck.srsName!=self.envelope.srsName:
             print 'can currently only perform aggregation within the same spatio-temporal reference system.'
@@ -62 +75 @@
     
     def getAggregatedEnvelope(self):
+        self.envelope.timePosition=str(self.t1)  #convert from datetime types
+        self.envelope.timePosition2=str(self.t2)
         return self.envelope
    
@@ -67 +82 @@
 
 def main(args=None):
-    #Get command line arguments, should be csml files: 'file1' 'file2'
+    '''Get command line arguments, should be csml files '''
     if args:
         sys.argv =args