Changeset 2198

Timestamp:

21/02/07 13:25:11 (14 years ago)

Author:

domlowe

Message:

Added new crs (xyh) and integrated into ProfileSeries? code

Location:

TI02-CSML/trunk/csml/csmllibs

Files:

• csmlcrs.py (modified) (3 diffs)
• csmlfeaturetypes.py (modified) (2 diffs)

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

@@ -41 +41 @@
         crs.timeAxis=2
         
+        # define lon lat height CRS:
+        crs=CRSystem(srsName='ndg:crs:xyh', axes =['longitude', 'latitude','height'])
+        self.systems['ndg:crs:xyh']=crs
+        crs.lonAxis=0
+        crs.latAxis=1
+        crs.timeAxis=None
+        
+        
         # define height time CRS:
         crs=CRSystem(srsName='ndg:crs:ht', axes =['height', 'time'])
@@ -72 +80 @@
             return self.systems['ndg:crs:unknown']
     
-    def determineCRS(self, axes, units):
+    def getUnitType(self, unit):
+        unittype='unknown'
+        if string.lower(unit) in ['second', 'seconds', 's', 'mins','minute','minutes','hour','hours','h','hr','hrs','day','days']:
+            unittype='time'
+        elif string.lower(unit)[:10] in ['days since', 'seconds si', 'minutes si', 'hours sinc','months sin', 'years sinc']:
+            unittype='time'
+        elif string.lower(unit) in ['mbar', 'pa','level']:
+            unittype='pressure'
+        elif string.lower(unit) in ['m', 'km']:
+            unittype='height'
+        elif string.lower(unit) in ['degrees_north', 'degrees_south']:
+            unittype='latitude'
+        elif string.lower(unit) in ['degrees_east','degrees_west']:
+            unittype='longitude'
+        return unittype
+    
+    def determineCRS(self, axes=None, units=None, knownCRSAxes=None):
         '''given any list of axis names and a list of units for these axes attempt to determine the CRS and return the CRSystem object and an axis order list.
         e.g passing in: (axes=['t', 'ht', 'latitude', 'longitude'],units=['days since 1991-09-01 00:00:00', 'm', 'degrees_north', 'degrees_east'])
         returns self.systems['ndg:crs:xypt'], [3,2,1,0]
-        Assumes the units are ordered to correspond with the axes!
+        Assumes the units are ordered to correspond with the axes
+        Alternatively, supply with a list of knownCRSAxes names (e.g. 'latitude', 'longitude', 'height') to get the right crs object        
         '''
+                       
         axisorder=[]
+        if knownCRSAxes is not None:
+            axes=knownCRSAxes
+                    
         if len(axes)==2:
             crs=self.systems['ndg:crs:unknown2d']
@@ -87 +116 @@
         else :
             crs=self.systems['ndg:crs:unknown']
-        crsMap=[]
-        #this can be extended to accomodate more units
-        for axis in axes:
-            print axis
-            unit=units[axes.index(axis)]
-            unittype='unknown'
-            if string.lower(unit) in ['second', 'seconds', 's', 'mins','minute','minutes','hour','hours','h','hr','hrs','day','days']:
-                unittype='time'
-            elif string.lower(unit)[:10] in ['days since', 'seconds si', 'minutes si', 'hours sinc','months sin', 'years sinc']:
-                unittype='time'
-            elif string.lower(unit) in ['mbar', 'pa','level']:
-                unittype='pressure'
-            elif string.lower(unit) in ['m', 'km']:
-                unittype='height'
-            elif string.lower(unit) in ['degrees_north', 'degrees_south']:
-                unittype='latitude'
-            elif string.lower(unit) in ['degrees_east','degrees_west']:
-                unittype='longitude'
-            crsMap.append(unittype)
+        
+        #this can be extended to accomodate more units       
+        if knownCRSAxes is not None:
+            crsMap=knownCRSAxes          
+        else:
+            crsMap=[]
+            for axis in axes:
+                unit=units[axes.index(axis)]
+                unittype=self.getUnitType(unit)            
+                crsMap.append(unittype)
+        
         
         #now try and match up crsMap with known crsystems.        

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

@@ -158 +158 @@
             gcT.addChildElem('gridOrdinates',ord)                         
         return gcT
+       
+    def __getLocation(self):
+        #attempts to get a fixed location, eg for a ProfileSeriesFeature.
+        lonval=None
+        latval=None
+        heightval=None
+        vars=self.DI.getListofVariables()
+        cat = csml.csmllibs.csmlcrs.CRSCatalogue()
+        axes=[]
+        for var in vars:
+            self.DI.setVariable(var)
+            unitname=self.DI.getVariableAttribute('units')
+            unittype=cat.getUnitType(unitname)
+            if unittype == 'latitude':
+                latval=self.DI.getDataForVar()
+                axes.append(unittype)
+            elif unittype == 'longitude':
+                lonval=self.DI.getDataForVar() 
+                axes.append(unittype)
+            elif unittype=='height':
+                heightval=self.DI.getDataForVar() 
+                axes.append(unittype)
+                
+        #returns lat lon height, but note that any of these may be None     
+        crs=cat.determineCRS(knownCRSAxes =axes) #TODO, may need to rethink csmlcrs module a bit
+        srsName= crs[0].srsName
+        return latval, lonval, heightval, srsName
        
     def __getCRS(self,varName,catalogue):
@@ -314 +341 @@
                 psFeature.parameter=csml.parser.Phenomenon(href='http://badc.rl.ac.uk/localparams#%s'%allVarNames[i])
                 psFeature.value=psCoverage
-                
-                psFeature.location=csml.parser.DirectPositionList(CONTENT='blahha', srsName='blah')
+                (latval, lonval, heightval, srs)=self.__getLocation()
+                posString ='%s %s %s'%(latval, lonval, heightval)
+                
+                psFeature.location=csml.parser.DirectPositionList(CONTENT=posString, srsName=srs)
                 self.fms.append(psFeature)
             self.DI.closeFile()