Changeset 2071 for TI02-CSML

Timestamp:

29/01/07 10:01:34 (14 years ago)

Author:

domlowe

Message:

added EnvelopeWithTimePeriod?, also, more on subsetting

Location:

TI02-CSML/trunk/csml

Files:

• API/ops_FileExtract.py (modified) (1 diff)
• API/ops_GridSeriesFeature.py (modified) (1 diff)
• csmllibs/csmlbuilder.py (modified) (2 diffs)
• csmllibs/csmlextra.py (modified) (2 diffs)
• parser.py (modified) (2 diffs)

TI02-CSML/trunk/csml/API/ops_FileExtract.py

@@ -14 +14 @@
     #print self.fileName
     
-    #get the right file
+    #get the right file  ##TO DO< check this is ok with FILE LIST
     if fileposition is not None:
-        file=self.fileName.CONTENT.split()[fileposition]
+        file =self.fileList.fileNames.CONTENT.split()[fileposition]
+        #file=self.fileName.CONTENT.split()[fileposition]
     else:
         file=self.fileName.CONTENT

TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py

@@ -124 +124 @@
                             selection[kw]=kwargs[kw]
             for time in self.times:
-                listPosition=self.domain[timeAxis][0].split().index(time)
+                print time
+                listPosition=self.domain[timeName].index(time)
                 strTimes= strTimes + ' ' + time
-                for comp in csmlutils.listify(self.value.rangeSet.aggregatedArray.components): 
+                for comp in csmlutils.listify(self.value.rangeSet.valueArray.valueComponent.quantityList.__insertedExtract.components): 
                     filePos=(listPosition)/timeToFileRatio
                     if filePos in filesFetched:
                         continue #already got data from this file, try next time
-                    print comp
-                    print dir(comp)
+                   
                     data=comp.getData(fileposition=filePos, **selection)
-                    self.files.append(comp.fileName.CONTENT.split()[filePos])
+                    print comp.fileList.fileNames.CONTENT
+                    self.files.append(comp.fileList.fileNames.CONTENT[filePos]) #TODO, get the right file name
                     if fulldata ==[]:
                         fulldata = data.tolist()

TI02-CSML/trunk/csml/csmllibs/csmlbuilder.py

@@ -88 +88 @@
         self.extractDictionary=feBuilder.fileExtractDictionary
 
+   
+    
     def createFeatureCollection(self):
         #creates empty feature collection (list)
@@ -103 +105 @@
         self.ds=thefeatures.ds_element
         self.featureCollection = thefeatures.featureCollection
+        self.featureCollection =csml.csmllibs.csmlextra.addEnvelope(self.featureCollection)        
         self.ds.featureCollection=self.featureCollection
 

TI02-CSML/trunk/csml/csmllibs/csmlextra.py

@@ -2 +2 @@
 import random
 import string
+import csml.parser
 
 def getRandomID():
@@ -13 +14 @@
     return randomID
     
+
+def addEnvelope(fc):
+    #adds EnvelopeWithTimePeriod to feature collection, based on the spatial extent of the features within.
+    #TO DO - this calculation, placeholder for now
+    env=csml.parser.EnvelopeWithTimePeriod()
+    env.lowerCorner=csml.parser.csString('lc')
+    env.upperCorner=csml.parser.csString('uc')
+    env.timePosition1=csml.parser.csString('tp1')
+    env.timePosition2=csml.parser.csString('tp2')
+    fc.boundedBy=env
+    return fc
 
 def getSeqRule(nDims):

TI02-CSML/trunk/csml/parser.py

@@ -320 +320 @@
         addchildren(self,children)
         csElement.__init__(self,**kwargs)
-        
-class DirectPosition(AbstractGML, SRSReferenceGroup,SRSInformationGroup,csElement):
-    def __init__(self, **kwargs):
-        AbstractGML.__init__(self,**kwargs)
-        csElement.__init__(self,**kwargs)
-        
+                
 class GridEnvelope(AbstractGML,SRSReferenceGroup, csElement):
     def __init__(self, **kwargs):
@@ -338 +333 @@
         SRSReferenceGroup.__init__(self,**kwargs)
         AbstractGML.__init__(self,**kwargs)
-        children={'lowerCorner':[GML('lowerCorner'), 'DirectPosition'],'upperCorner':[GML('upperCorner'), 'DirectPosition']}
-        addchildren(self,children)
-        csElement.__init__(self,**kwargs)
-        
+        children={'lowerCorner':[GML('lowerCorner'), 'csString'],'upperCorner':[GML('upperCorner'), 'csString']}
+        addchildren(self,children)
+        csElement.__init__(self,**kwargs)
+        
+class EnvelopeWithTimePeriod(Envelope):
+    def __init__(self, **kwargs):
+        Envelope.__init__(self,**kwargs)
+        children={'timePosition1':[GML('timePosition'), 'csString'],'timePosition2':[GML('timePosition'), 'csString']}
+        addchildren(self,children)
+        csElement.__init__(self,**kwargs)
 
 class AbstractFeature(AbstractGML,csElement):