Changeset 2807

Timestamp:

15/08/07 09:46:30 (14 years ago)

Author:

domlowe

Message:

more on Trajectory

File:

• TI02-CSML/trunk/csml/API/ops_TrajectoryFeature.py (modified) (8 diffs)

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

@@ -37 +37 @@
     return self.__getAxis('time')
 
-
+                
 def getDomain(self):
     #returns domain as a dictionary of ordinates {name: [values], ...}
@@ -93 +93 @@
     
     #add auxiliary coordinate variables to hold the locations
-    for ax in self.spatialAxes:
+    for ax in self.spatialAxes:        
         var=MV.array(self.spatialAxes[ax])
         var.id=ax
@@ -109 +109 @@
 def subsetToTrajectory(self, outputdir=None, ncname='trajectory.nc' ,time=None, **kwargs):
     ''' subsetting a trajectory feature by time '''        
-        
+    dataToRemove=[] # list to hold index values of data that falls outside the bounding box,
     #work out where to store the resulting files:
     if outputdir is not None:
@@ -141 +141 @@
                 tlist.append(val)       
             indices=[]
+            if type(selection) in [str,unicode]: 
+                selection=[selection]
             if selection is None:
                 #select all times
@@ -192 +194 @@
             gridOrd.coordAxisValues.coordinateList=csml.parser.csString(datastr)
             gridOrd.coordAxisValues.id = csml.csmllibs.csmlextra.getRandomID()
-            self.spatialAxes[gridOrd.coordAxisLabel.CONTENT]=data        
-            
+            #if gridOrd.coordAxisLabel.CONTENT in kwargs:
+                ##then need to record position of any data outside the bounding box
+                #if gridOrd.coordAxisLabel.CONTENT in kwargs:
+                    #minval=kwargs[gridOrd.coordAxisLabel.CONTENT][0]                    
+                    #maxval=kwargs[gridOrd.coordAxisLabel.CONTENT][1]
+                    #for item in enumerate(data):
+                        #if item[1] <minval:
+                            #if item[1] not in dataToRemove:
+                                #dataToRemove.append(item[0])
+                            #continue
+                        #if item[1] >maxval:
+                            #if item[1] not in dataToRemove:
+                                #dataToRemove.append(item[0])
+                                #print type(data)
+            self.spatialAxes[gridOrd.coordAxisLabel.CONTENT]=data           
             #get rid of the old xlink attributes
             for att in [ 'href', 'role', 'arcrole', 'show','{http://www.w3.org/1999/xlink}href', '{http://www.w3.org/1999/xlink}role', '{http://www.w3.org/1999/xlink}arcrole', '{http://www.w3.org/1999/xlink}show']:
@@ -201 +216 @@
                     pass
     
+    print len(dataToRemove)
     #now get the actual rangeset data
     if hasattr(self.value.rangeSet.valueArray.valueComponent, 'insertedExtract'):
@@ -207 +223 @@
         print 'warning: inline rangeset not implemented'
 
+    
    
     #Now create the file extract
@@ -258 +275 @@
     csmlWrap=csml.csmllibs.csmlfeaturewrap.CSMLWrapper()
     subsettedFeature=csmlWrap.createTrajectoryFeature(value=cvg,parameter=param,featureID=csml.csmllibs.csmlextra.getRandomID(),description=self.description)
-    
+
     self._writeNetCDF()