Changeset 2105 for TI02-CSML

Timestamp:

05/02/07 10:20:06 (14 years ago)

Author:

domlowe

Message:

Parser changes -  csml:id for Dataset, TimeSeriesDomain? to TimeSeries?, plus fixing description/id in subsetting code

Location:

TI02-CSML/trunk/csml

Files:

• API/ops_GridSeriesFeature.py (modified) (2 diffs)
• csmllibs/csmlfeaturetypes.py (modified) (1 diff)
• csmllibs/csmlfeaturewrap.py (modified) (2 diffs)
• parser.py (modified) (3 diffs)

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

@@ -52 +52 @@
         else: 
             print 'crs not supported'
-              
-
-
-        
+ 
     ##Get names of variables in file and relate them to the subset selection 
     selection={}
     for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
         selection[gridOrd.gridAxesSpanned.CONTENT]=kwargs[gridOrd.coordAxisLabel.CONTENT]
-    
+   
     
     strTimes, axisorder, fulldata=csml.API.genSubset.getTheData(self, selection, times, timeName)
-    
+   
     
     #Okay, got the data now. Need to write CSML feature and NetCDF files.
@@ -83 +80 @@
     
     #create a stand alone gridseries feature containing this coverage
-    subsettedFeature=csmlWrap.createGridSeriesFeature(value=cvg,datasetID="A",featureID="B",description="C")
+    subsettedFeature=csmlWrap.createGridSeriesFeature(value=cvg,featureID=self.id,description=self.description)
  
     

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

@@ -163 +163 @@
         if len(dimNames) <= 2:
                 #it's an axis or bounds not a feature, try next variable
-            return None #(should this be None, None, None ?)
+            return None, None, None
         unitlist=[]
         for dim in dimNames:

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

@@ -51 +51 @@
         pass
 
-    def createGridSeriesFeature(self,value, parameter=None,datasetID=None,featureID=None,description=None):
+    def createGridSeriesFeature(self,value, parameter=None,featureID=None,description=None):
         feat=csml.parser.GridSeriesFeature()
         if featureID:
@@ -58 +58 @@
             feat.id='No ID'
         if description:
-            feat.description=csml.parser.csString(description)
+            feat.description=description
         else:
-            feat.description=csml.parser.csString('No Description')
+            feat.description='No Description'
         feat.value=value
         #feat.parameter=parameter

TI02-CSML/trunk/csml/parser.py

@@ -580 +580 @@
         csElement.__init__(self,**kwargs)
         
-class TimeSeriesDomain(AbstractGML, csElement):
+class TimeSeries(AbstractGML, csElement):
     def __init__(self, **kwargs):
         AbstractGML.__init__(self,**kwargs)
@@ -590 +590 @@
     def __init__(self, **kwargs):
         AbstractDiscreteCoverage.__init__(self,**kwargs)
-        children={'pointSeriesDomain':[CSML('TimeSeriesDomain'),'TimeSeriesDomain' ,CSML('pointSeriesDomain') ], 'rangeSet':[GML('rangeSet'), 'RangeSet'],'coverageFunction':[GML('coverageFunction'),'csString']}
+        children={'pointSeriesDomain':[CSML('TimeSeries'),'TimeSeries' ,CSML('pointSeriesDomain') ], 'rangeSet':[GML('rangeSet'), 'RangeSet'],'coverageFunction':[GML('coverageFunction'),'csString']}
         addchildren(self,children)
         csElement.__init__(self,**kwargs)
@@ -868 +868 @@
 
         
-class Dataset(AbstractGML, csElement):    
+class Dataset(csElement):    
     ''' Dataset class, needed as root of tree'''
     def __init__(self, **kwargs):
-        AbstractGML.__init__(self,**kwargs)
+        a=[CSML('id')]
+        addatts(self,a)
         children = {'featureCollection':[CSML('CSMLFeatureCollection') ,'CSMLFeatureCollection'],'storageDescriptor':[CSML('CSMLStorageDescriptor'), 'CSMLStorageDescriptor']}
         addchildren(self,children)