Changeset 2562 for TI02-CSML

Timestamp:

08/06/07 10:04:31 (14 years ago)

Author:

domlowe

Message:

subsetting to point basic code added

Location:

TI02-CSML/trunk/csml/API

Files:

• __init__.py (modified) (1 diff)
• ops_FileExtract.py (modified) (2 diffs)
• ops_PointSeriesFeature.py (modified) (6 diffs)

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

@@ -43 +43 @@
 
 ##PointSeriesFeature methods:
-addMethods(csml.parser.PointSeriesFeature, [ops_PointSeriesFeature.testmethod,ops_PointSeriesFeature.getDomain, ops_PointSeriesFeature.subsetToPointSeries,  ops_PointSeriesFeature.getAllowedSubsettings])
+addMethods(csml.parser.PointSeriesFeature, [ops_PointSeriesFeature.testmethod,ops_PointSeriesFeature.getDomain, ops_PointSeriesFeature.subsetToPointSeries,ops_PointSeriesFeature.subsetToPoint,  ops_PointSeriesFeature.getAllowedSubsettings])
 
 ##ProfileFeature methods:

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

@@ -123 +123 @@
     fillvalue=DI.getVariableAttribute('_FillValue')
     axisorder=DI.getVariableAxes()
-    units=[]
-    for axis in axisorder:    
-        DI.setAxis(axis)
-        units.append(DI.getAxisAttribute('units'))    
       
     DI.closeFile()
@@ -133 +129 @@
     except:
         result =data
-    return result, fillvalue, units
+    return result, fillvalue
         
 def __calendar(file,timedim):

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

@@ -41 +41 @@
     pathToSubsetNetCDF=ncpath
     if type(times) is str:
-        selection = csml.csmllibs.csmlextra.listify(times)
+        selection = tuple(csml.csmllibs.csmlextra.listify(times))
     else:
-        selection = times
-    
+        selection = times  
     tlist=[]    
     for val in self.value.pointSeriesDomain.timePositionList.CONTENT.split():
         tlist.append(val)
-        
    
     indices=[]
@@ -68 +66 @@
         for domaintime in tlist:
             if selection[0] == domaintime:
+                
                 minIndex=tlist.index(domaintime)
                 maxIndex=minIndex
-                selectedTimes=selection[0]
+                selectedTimes=selection
                 break
     
@@ -80 +79 @@
     
     fextract=self.value.rangeSet.arrayDescriptor.components
-    data, fillvalue, units=fextract.getDataFromChunks(minIndex, maxIndex)
+    uom = self.value.rangeSet.arrayDescriptor.uom
+    data, fillvalue=fextract.getDataFromChunks(minIndex, maxIndex)
     
+    units=[uom.CONTENT]
    
     #Now write out the CSML Feature:
@@ -121 +122 @@
     
     #the parameter of the feature is of type Phenomenon, here href creates "xlink:href=..."
-    param=csml.parser.Phenomenon(href='CFStandardNames.xml#temperature')
+    param=self.parameter
     
-    
-    
+      
     #create a stand alone pointseries feature containing this coverage
     csmlWrap=csml.csmllibs.csmlfeaturewrap.CSMLWrapper()
     subsettedFeature=csmlWrap.createPointSeriesFeature(value=cvg,parameter=param,location=self.location,featureID=self.id,description=self.description)
     
-    
-    
+      
     
     #Now write out the NetCDF File:   
@@ -141 +140 @@
     
     floatTimes=[]
-    #determine base units for times:
-    tOne=csml.csmllibs.csmltime.getCDtime(times[0])
+    
+    tOne=csml.csmllibs.csmltime.getCDtime(selection[0])
     tbase=csml.csmllibs.csmltime.getBaseUnits(tOne)
     for time in selectedTimes:
@@ -158 +157 @@
     
     
+def subsetToPoint(self, csmlpath=None, ncpath=None,time=None):
+    pseriesFeature, pathToSubsetNetCDF, descriptor=self.subsetToPointSeries(csmlpath,ncpath,time)
+            
+    #now need to take this point series feature containing one time and rewrite it as a point feature.
+    pointFeature=csml.parser.PointFeature()
+    pointFeature.location=pseriesFeature.location
+    pointFeature.parameter=pseriesFeature.parameter
     
-    
-    
-    
+    return pointFeature, pathToSubsetNetCDF, descriptor