Changeset 1557 for TI02-CSML

Timestamp:

06/10/06 14:14:26 (13 years ago)

Author:

domlowe

Message:

Improved csmlContainer mechanism to allow subsetting of multiple features and delivery in a single csml document with multiple CSML files

Location:

TI02-CSML/trunk

Files:

• Examples/parsing/apicalls.py (modified) (1 diff)
• csml/API/csmlContainer.py (modified) (1 diff)
• csml/API/ops_GridSeriesFeature.py (modified) (3 diffs)

TI02-CSML/trunk/Examples/parsing/apicalls.py

@@ -52 +52 @@
 spatialSubsetDictionary['longitude']=(-31.265,30.258)
 
-#request subsetted data from feature (can set paths here)
-feature.subsetToGridSeries(csmlContainer, timeSelection,  ncpath='myfile.nc',**spatialSubsetDictionary)
+#request subsetted data from features (can set paths here) and add to container
+#subset a feature
+csmlContainer.add(feature.subsetToGridSeries(timeSelection,  ncpath='myfile.nc',**spatialSubsetDictionary))
+#subset another feature (in fact it's the same feature again, but it proves the concept)
+csmlContainer.add(feature.subsetToGridSeries(timeSelection,  ncpath='myfile2.nc',**spatialSubsetDictionary))
+
+#when you have finished, get the contents of the container
 csmlbundle=csmlContainer.getContents()
-
 print 'CSML %s'%csmlbundle[0] # csml document
-
-#parse and pretty print the result
-# strCSML=parser_extra.PrettyPrint(subsetCSML)
-# strCSML=parser_extra.removeInlineNS(strCSML)
-# print strCSML #csml document (string)
-# print subsetCSML
-# print subsetNetCDF # netcdf file (file)
-# print 'arraySize: %s' %arraySize
+paths=csmlbundle[1:]
+print paths #paths to netcdf files

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

@@ -50 +50 @@
     def attachNetCDFFile(self, ncfile):
         ''' Attach a NetCDF file to the container object. Multiple NetCDF files can be referenced from multiple features and returned with the CSML document'''
-        #append NetCDF file object to containerContents
-        #need to think about whether it is best to append the file object or just a path to the file
+        #append NetCDF file path to containerContents
         self.ncfiles.append(ncfile)
 
+    def add(self, featureplusfile):
+        #featureplusfile should be a feature, and a filepath to the netcdf file 
+        self.appendFeature(featureplusfile[0])
+        self.attachNetCDFFile(featureplusfile[1])
         
+   
     def getContents(self):
         self.ds.arrayDescriptors=self.ad

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

@@ -53 +53 @@
 
 
-def subsetToGridSeries(self, container, timeSubset,  csmlpath=None, ncpath=None,**kwargs):
+def subsetToGridSeries(self, timeSubset,  csmlpath=None, ncpath=None,**kwargs):
     #MUST be supplied with a CSMLContainer object to store the subsetted feature in
     
-    pathToSubsetCSML = container.csmlpath
+    #pathToSubsetCSML = container.csmlpath
     if ncpath is not None:
         pathToSubsetNetCDF=ncpath
@@ -178 +178 @@
     csmlWrap=csml.csmllibs.csmlfeaturewrap.CSMLWrapper()
     subsettedFeature=csmlWrap.createGridSeriesFeature(domain,rangeSet,datasetID="A",featureID="B",description="C")
-    container.appendFeature(subsettedFeature)
+    #container.appendFeature(subsettedFeature)
 
     ### write netcdf using NCWriter class (wraps cdms) ###
@@ -204 +204 @@
     nc.addVariable(fulldata,self.id, axes,units='') #to do, units attribute for CF compliance
     nc.closeFinishedFile()
-    container.attachNetCDFFile(nc)
+    return subsettedFeature, pathToSubsetNetCDF
+    #container.attachNetCDFFile(nc)