Changeset 2061 for TI02-CSML/trunk/csml

Timestamp:

26/01/07 15:01:10 (13 years ago)

Author:

domlowe

Message:

lots of changes to do with subsetting

Location:

TI02-CSML/trunk/csml

Files:

• API/csmlContainer.py (modified) (3 diffs)
• API/ops_AbstractFeature.py (modified) (3 diffs)
• API/ops_Dataset.py (modified) (2 diffs)
• API/ops_GridSeriesFeature.py (modified) (9 diffs)
• csmllibs/csmlcrs.py (modified) (1 diff)
• csmllibs/csmldataiface.py (modified) (1 diff)
• testfiles/basictest.py (modified) (1 diff)

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

@@ -15 +15 @@
         #Create an Empty Dataset & FeatureCollection
         self.ds = csml.parser.Dataset()
-        self.fc=csml.parser.FeatureCollection()
         #Set attributes of dataset
         #if 'metadata' is a URI, set it as href attribute if MetaDataProperty instance,
@@ -31 +30 @@
         self.dm=[] #empty list to hold definition members (e.g. UnitDefinitions)
         self.fm=[] #empty list to hold feature members (e.g. GridFeatures, PointFeatures)
-        self.ad=[] #empty list to hold array descriptors (e.g. NetCDFExtract)
+        self.sd=[] #empty list to hold storage descriptors (e.g. NetCDFExtract)
         #the dataset is now initialised. now you can add features/defintions/arraydescriptors
         #using the methods supplied.
@@ -62 +61 @@
    
     def getContents(self):
-        self.ds.arrayDescriptors=self.ad
-        self.ds.featureCollection=csml.parser.FeatureCollection(members=self.fm)
+        self.ds.storageDescriptor=self.sd
+        self.ds.featureCollection=csml.parser.CSMLFeatureCollection(featureMembers=self.fm)
         csmlout=self.ds.toXML()
         #parse and pretty print the result to file

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

@@ -10 +10 @@
     return ['none']
 
-def _identifyTimeAxis(self,listToCheck):
+def _identifyTimeAxis(self,listToCheck): 
     #given a list of possible axes, find the one which is most probably the time axis.
     for name in listToCheck:
@@ -18 +18 @@
 
 def __compareTimes(timemin, timecheck, timemax):
+    timeok=0
     try:
         year=int(timecheck.split('-')[0])
@@ -27 +28 @@
             if tcheck.cmp(timemax) < 1:
                 timeok = 1
+        print 'TMIN time  %s'%timemin
+        print 'CHECK time  %s'%tcheck
+        print 'TMAX time  %s'%timemax
     except:
         #if it's not a proper internet time e.g. time = '6' then just compare numerically

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

@@ -39 +39 @@
     #returns a list of feature ids for the dataset
     self.featureList = []
-    for member in self.featureCollection.members:
+    for member in self.featureCollection.featureMembers:
             self.featureList.append(member.id)
     return self.featureList
@@ -45 +45 @@
 def getFeature(self, featureID):
     """ returns a single feature object """
-    for member in self.featureCollection.members:
+    for member in self.featureCollection.featureMembers:
             if member.id == featureID:
                 return member    

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

@@ -22 +22 @@
     for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
         name=gridOrd.coordAxisLabel.CONTENT
-        if isinstance(gridOrd.coordAxisValues, csml.parser.FileExtract):
-            #not tested with file extracts yet: (01/01/07)
-            self.domain[name]=gridOrd.coordAxisValues.getData()
+        if hasattr(gridOrd.coordAxisValues, '__insertedExtract'):
+            self.domain[name]=gridOrd.coordAxisValues.__insertedExtract.getData()
         else:
             vals=gridOrd.coordAxisValues.coordinateList.CONTENT
             valList=[]
-            for val in vals.split(','):  #remove commas
+            print 'splitting'
+            for val in vals.split():  
                 valList.append(val)
+                print val
             self.domain[name]=valList
     return self.domain
@@ -41 +42 @@
     
     self.getDomain()
+    
+    #TODO - incoporate the crsCatalogue. into this
     #deal with longitude requests
     #if the request is in -ve,+ve eg (-30,30) but the data is in (0,360) need to handle this by changing the args.
     kwargs=csmlutils.fixLongitude(self.domain,kwargs)
-    #deal with times
-    timeAxis=self._identifyTimeAxis(self.domain.keys())
-    self.times=kwargs[timeAxis]
+    
+    #deal with times   
+    #need to find the time axis:
+    cat=csml.csmllibs.csmlcrs.CRSCatalogue()
+    crs=cat.getCRS(self.value.gridSeriesDomain.srsName)
+    #get the position of the time axis in crs/ axis labels
+    timeAxisPos=crs.timeAxis
+    #get the name of the time axis in the crs
+    timeName=crs.axes[timeAxisPos]
+    #get the ordinate with that name and find the original time name for the file.
+    for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
+        if gridOrd.coordAxisLabel.CONTENT==timeName:
+            timeAxis = gridOrd.gridAxesSpanned.CONTENT  #only works for regular grids atm
+        else: 
+            print 'crs not supported'
+   
+    
+    #here, timeName is the name given to the time axis by the CRS,
+    #and timeAxis is the name given to the time axis in the file.
+    #currently supporting domain subsetting only by CRS name 
+    #(but should be easy to extend later)
+    self.times=kwargs[timeName]
     self.files=[]
     strTimes=''
@@ -52 +74 @@
     
     #set the reference system for the time axis
-    
+    calset=False
     for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
-        if gridOrd.coordAxisLabel.CONTENT==timeAxis:
+        if gridOrd.coordAxisLabel.CONTENT==timeName:
             try:
                 caltype=gridOrd.coordAxisValues.frame.split(':',1)[0]
@@ -69 +91 @@
     except:
         csml.csmllibs.csmltime.setcdtimeCalendar(csml.csmllibs.csmltime.cdtime.DefaultCalendar)
-    
-    
+  
+       
     if len(self.times) == 2:
         #then this is a range of times (t1, tn)
         try:
-            tone=ops_AbstractFeature.__getCDtime(self.times[0])
+            tone=csml.API.ops_AbstractFeature.__getCDtime(self.times[0])
         except:
             tone=self.times[0]
         try:
-            ttwo=ops_AbstractFeature.__getCDtime(self.times[1])
+            ttwo=csml.API.ops_AbstractFeature.__getCDtime(self.times[1])
         except:
             ttwo=self.times[1]
@@ -86 +108 @@
         else:
             self.getDomain()
-        for time in self.domain[timeAxis][0].split():
+            
+        for time in self.domain[timeName]:
             timeok=csml.API.ops_AbstractFeature.__compareTimes(tone,time,ttwo)
             if timeok ==1:
                 self.times.append(time)
+     #okay up to here!
+
     if hasattr(self.value.rangeSet, 'aggregatedArray'):
         #handle aggregatedArray
@@ -159 +184 @@
         straxisValues=''
         #now deal with each argument:
-            
-        print "KWARGS"
-        print kwargs
-        print  "DOM"
-        print self.domain
+   
         if key in kwargs:
-            if kwargs[key][0] < kwargs[key][1]:   
+            if key ==timeName:
+                continue #dealt with time earlier            
+            elif kwargs[key][0] < kwargs[key][1]:   
                 for val in self.domain[key]:
-                    print self.domain[key]
                     if val is not '':
                             if float(val) >= kwargs[key][0]:
@@ -173 +195 @@
                                     arraySize=arraySize+1
                                     straxisValues=straxisValues+ str(val) + ', '
-
             else:#this if deals with selections such as longitude (330,30) where the lower limit is 'greater' than the upper limit in a mathematical sense.
                     for val in self.domain[key]:
@@ -210 +231 @@
         floatTimes.append(time.value)
     nc.addAxis('t',floatTimes,isTime=1,units=calunits,calendar=caltype)
+    #USE CRS!    
     for ordinate in ordinates:
         lon,lat=None,None
@@ -223 +245 @@
     if len(ordinates)==3:
         axes=['t',axisorder[1],axisorder[2],axisorder[3]]
-    elif len(grid.ordinates)==2:
+    elif len(ordinates)==2:
         axes=['t',axisorder[1],axisorder[2]]
     nc.addVariable(fulldata,self.id, axes,units='') #to do, units attribute for CF compliance

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

@@ -37 +37 @@
         crs=CRSystem(srsName='ndg:crs:xyt', axes =['Lon', 'Lat','Time'])
         self.systems['ndg:crs:xyt']=crs
+        crs.lonAxis=0
+        crs.latAxis=1
+        crs.timeAxis=2
         
         #define unknown 1D CRS:

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

@@ -19 +19 @@
 import sys
 import csml.csmllibs.csmltime
+# This is required to prevent Numeric arrays being truncated when printed.
+import MA
+MA.set_print_limit(0)
+
 
 class DataInterface(object):

TI02-CSML/trunk/csml/testfiles/basictest.py

@@ -15 +15 @@
 # 1. Test parsing from CSML file
 #tree = ElementTree(file='../XMLInstances/CSMLExample_SuperWrap.xml')
-tree = ElementTree(file='../testfiles/gridseries/testout.xml')
+tree = ElementTree(file='../DDCTestfiles/DDCout.xml')