Changeset 2061 for TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py

Timestamp:

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

Author:

domlowe

Message:

lots of changes to do with subsetting

File:

• TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py (modified) (9 diffs)

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