Changeset 1894 for TI02-CSML/branches/CSML2/csmllibs/csmlfeaturetypes.py

Timestamp:

19/12/06 11:38:41 (14 years ago)

Author:

domlowe

Message:

more on ReferenceableGrid

File:

• TI02-CSML/branches/CSML2/csmllibs/csmlfeaturetypes.py (modified) (3 diffs)

TI02-CSML/branches/CSML2/csmllibs/csmlfeaturetypes.py

@@ -7 +7 @@
 #**************************************************************************************
 
+import csml.parser as cp
 import csml.csmllibs
 import sys
@@ -107 +108 @@
                     #it's an axis or bounds not a feature, try next variable
                     continue
-                gsFeature=csml.parser.GridSeriesFeature()
+                gsFeature=cp.GridSeriesFeature()
                 gsFeature.id=str(allVarNames[i])
                 desc = self._getDescriptiveName(DI)
@@ -113 +114 @@
                 gsFeature.description=desc
                 #value (coverage)
-                gsCoverage=csml.parser.GridSeriesCoverage()
-                gsDomain=csml.parser.GridSeriesDomain()
-                gcT=csml.parser.GridCoordinatesTable()
-                
-                
-                
+                gsCoverage=cp.GridSeriesCoverage()
+                gsDomain=cp.GridSeriesDomain()
+                gcT=cp.GridCoordinatesTable()
+
                 #add an axisName element(s) for  each spatial dimension.
                 # and an ordinate element
-                axes=[]
+                axes=' '
                 for i in range (1, len(dimNames)):
-                    #axisNames
                     axisname ='dim'+str(i)
-                    axes.append(axisname)
+                    axes =axes + axisname + ' '
+                gsDomain.axisLabels=cp.csString(axes)
+                ordinates=[]
+                for i in range (1, len(dimNames)):
+                    dimName=dimNames[len(dimNames)-i]
+                    ord=cp.GridOrdinateDescription()
+                    ord.gridAxesSpanned=cp.csString('dim' + str(i))
+                    ord.coordAxisLabel=cp.csString(dimName)
+                    ord.sequenceRule=cp.csString(csml.csmllibs.csmlextra.getSeqRule(len(dimNames)))
+                    sptList=cp.SpatialOrTemporalPositionList()
                     
-                    ordinates=[]
-                    for i in range (1, len(dimNames)):
-                        ord=csml.parser.GridOrdinateDescription()
-                        #ord.gridAxesSpanned='dim' + str(i)
-                        #ord.sequenceRule=csml.csmllibs.csmlextra.getSeqRule(len(dimNames))
-                        #dimName=dimNames[len(dimNames)-i]
-                        #ord.definesAxis=dimName
-                        ##look up file extract name in dictionary
-                        ##(axisid stored in dictionary = current filename + variable name)
-                        #axisid=self.repfilename+dimName
-                        #if self.spatialstorage=='fileextract':
-                            ##refer to extract
-                            #ord.axisValues='#'+self.fileExtractDictionary[axisid]
-                        #else:
-                            ##store inline
-                             #DI.setAxis(dimName)
-                             #ord.axisValues=csml.csmllibs.csmlextra.cleanString(str(DI.getDataForAxis()))
-                             
-                        #ordinates.append(ord)
-                        gcT.addChildElem('gridOrdinates',ord)                    
-                    #grid.axisNames=axes
-                
+                    if self.spatialstorage=='fileextract':
+                        #look up file extract name in dictionary
+                        #(axisid stored in dictionary = current filename + variable name)
+                        axisid=self.repfilename+dimName
+                        sptList.coordinateList=cp.csString('#'+self.fileExtractDictionary[axisid])
+                    else:
+                        #store inline
+                        DI.setAxis(dimName)
+                        sptList.coordinateList=cp.csString(csml.csmllibs.csmlextra.cleanString(str(DI.getDataForAxis())))
+                    ord.coordAxisValues=sptList
+                    gcT.addChildElem('gridOrdinates',ord)                    
                 gsDomain.coordTransformTable=gcT
                 gsCoverage.gridSeriesDomain=gsDomain