Changeset 3823

Timestamp:

25/04/08 15:45:16 (13 years ago)

Author:

spascoe

Message:

removed stuff added by svn due to local conflicts

This line, and those below, will be ignored--

M ows_common/service/imps/wms_csmllayer.py

File:

• TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/service/imps/wms_csmllayer.py (modified) (4 diffs)

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/service/imps/wms_csmllayer.py

@@ -114 +114 @@
         self._feature=feature
         self.legendSize=(30,100)
-<<<<<<< .mine
         bb= self._feature.getCSMLBoundingBox().getBox()
         #convert 0 - 360 to -180, 180 as per common WMS convention
@@ -120 +119 @@
             bb[0], bb[2]=-180, 180
         self.wgs84BBox = bb
-        self.featureInfoFormats = ['text/html']
-=======
+        self.featureInfoFormats = ['text/htm']
         try:
             self.wgs84BBox = self.getBBox('EPSG:4326')
@@ -128 +126 @@
                              "coordinates for compatibility with WMS-1.3.0")
 
->>>>>>> .r3821
     def getBBox(self, crs):
         """
@@ -169 +166 @@
             randomname= csml.csmllibs.csmlextra.getRandomID() + '.nc'
             result= self._feature.subsetToGridSeries(config['tmpfilebuffer'], ncname=randomname, **dimValues)
-            #for now have to read netcdf back from disk (limitiation of CSML api)
+            #for now have to read netcdf back from 
+            #disk (limitiation of CSML api)
             print ['h', result[1]]
             netcdf=cdms.open(result[1])