Changeset 4228 for cows/trunk/cows/service/imps/wms_csmllayer.py

Timestamp:

24/09/08 15:19:12 (12 years ago)

Author:

spascoe

Message:

Changed print statements to loggging calls where appropriate.

File:

• cows/trunk/cows/service/imps/wms_csmllayer.py (modified) (8 diffs)

cows/trunk/cows/service/imps/wms_csmllayer.py

@@ -110 +110 @@
         @raise ValueError: If no layers are available for these keywords. 
         """
-        #print kwargs
         fileoruri=kwargs['fileoruri']
         if fileoruri in self.layermapcache.keys():
             #we've accessed this layer map before, get it from the cache dictionary
-            #print 'found layer map in cache'
             return self.layermapcache[fileoruri]
          
@@ -153 +151 @@
         self._feature=feature
         self.legendSize=(30,100)
-        bb= self._feature.getCSMLBoundingBox().getBox()
+        bb= self._feature.getCSMLBoundingBox().getBox()
         #convert 0 - 360 to -180, 180 as per common WMS convention
         if abs(bb[2]-bb[0]) >= 359 and abs(bb[2]-bb[0]) < 361:
             bb[0], bb[2]=-180, 180
-        self.wgs84BBox = bb
-        self.featureInfoFormats = ['text/html']
+        self.wgs84BBox = bb
+        self.featureInfoFormats = ['text/html']
         try:
             self.wgs84BBox = self.getBBox('EPSG:4326')
@@ -175 +173 @@
         #if abs(bb[2]-bb[0]) >= 359 and abs(bb[2]-bb[0]) < 361:
         #    bb[0], bb[2]=-180, 180
-        #self.wgs84BBox = bb
+        #self.wgs84BBox = bb
         return self.wgs84BBox
         #raise NotImplementedError
@@ -207 +205 @@
             result= self._feature.subsetToGridSeries(config['tmpfilebuffer'], ncname=randomname, **dimValues)
             #for now have to read netcdf back from 
-            #disk (limitiation of CSML api)
+            #disk (limitiation of CSML api)
             netcdf=cdms.open(result[1])
             #and then delete the temporary file
@@ -252 +250 @@
         dictindex=str((self._feature.id, dimValues))
         if dictindex in self.featureinfofilecache:
-            print 'calling cache'
+            log.debug('calling cache')
             f=self.featureinfofilecache[dictindex]
         else: #else, use the csml api to subset the feature afresh
-            print 'not calling cache'
+            log.debug('not calling cache')
             randomname= csml.csmllibs.csmlextra.getRandomID() + '.nc'
             result= self._feature.subsetToGridSeries(config['tmpfilebuffer'], ncname=randomname, **dimValues)
@@ -264 +262 @@
             #and then delete the temporary file
             os.system('rm %s'%result[1])
-        
+        
         netcdf = f(self.title)  #netcdf here is a cdms transient variable
         
        
         #Now grab the netCDF object for the point specified.
-        #The reason for the 'cob' option is so that if the grid the data 
-        #is defined on does not have a grid point at the point specified, 
-        #we should  still get the nearest location
-        
-        t_point = netcdf(latitude=(point[1], point[1], 'cob'), longitude=(point[0], point[0], 'cob'))
-        #now get the value recorded at this location
-        value = t_point.getValue().tolist()
-        print value
-        print t_point.fill_value()
-        #and the fill_value too
-        fill_value = t_point.fill_value()
-        #value is actually embedded in a multi dimensional list, 
-        #so we need to extract the actual value from the list
-        while type(value) is list:
-                value = value[0]
-
-        #now check if the value is actually the fill_value rather than 
-        #a value recorded at the point specified
-        print [value, fill_value]
-        if (2*fill_value) == value:
-                value = "No value found at position: "+str(point[1])+", "+str(point[0])
-        else:
-                value = "Value found at position: "+str(point[1])+", "+str(point[0])+" is: "+str(value)
+        #The reason for the 'cob' option is so that if the grid the data 
+        #is defined on does not have a grid point at the point specified, 
+        #we should  still get the nearest location
+        
+        t_point = netcdf(latitude=(point[1], point[1], 'cob'), longitude=(point[0], point[0], 'cob'))
+        #now get the value recorded at this location
+        value = t_point.getValue().tolist()
+        log.debug(value)
+        log.debug(t_point.fill_value())
+        #and the fill_value too
+        fill_value = t_point.fill_value()
+        #value is actually embedded in a multi dimensional list, 
+        #so we need to extract the actual value from the list
+        while type(value) is list:
+                value = value[0]
+
+        #now check if the value is actually the fill_value rather than 
+        #a value recorded at the point specified
+        log.debug('%s %s' % (value, fill_value))
+        if (2*fill_value) == value:
+                value = "No value found at position: "+str(point[1])+", "+str(point[0])
+        else:
+                value = "Value found at position: "+str(point[1])+", "+str(point[0])+" is: "+str(value)
         # finally return the value
         return value
@@ -407 +405 @@
     def __init__(self, layer, netcdf, bbox, width, height):
         #we know the axes are called latitude and longitude as the CSML code has written it:
-        #print netcdf
         v=netcdf(layer.title)
-        #print v
         tvar=v(latitude=(bbox[1], bbox[3]), longitude=(bbox[0],bbox[2]),squeeze=1)
         order=tvar.getOrder()
         #array of data
         self.value=tvar.getValue()
-        #print self.value
-        #order of axes
         if order == 'xy':
             self.ix=0
@@ -428 +422 @@
         self.dx=abs(lon[0]-lon[1])
         self.dy=abs(lat[0]-lat[1])
-        #print [lon, len(lon)]
-        #print len(self.value)
-        print len(lon)
-        print len(lat)
-
-    
-
-        
+        
+    
+
+        
 
         self.nx=len(lon)