Ignore:
Timestamp:
25/04/08 15:45:16 (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/service/imps/wms_csmllayer.py

    r3822 r3823  
    114114        self._feature=feature 
    115115        self.legendSize=(30,100) 
    116 <<<<<<< .mine 
    117116        bb= self._feature.getCSMLBoundingBox().getBox() 
    118117        #convert 0 - 360 to -180, 180 as per common WMS convention 
     
    120119            bb[0], bb[2]=-180, 180 
    121120        self.wgs84BBox = bb 
    122         self.featureInfoFormats = ['text/html'] 
    123 ======= 
     121        self.featureInfoFormats = ['text/htm'] 
    124122        try: 
    125123            self.wgs84BBox = self.getBBox('EPSG:4326') 
     
    128126                             "coordinates for compatibility with WMS-1.3.0") 
    129127 
    130 >>>>>>> .r3821 
    131128    def getBBox(self, crs): 
    132129        """ 
     
    169166            randomname= csml.csmllibs.csmlextra.getRandomID() + '.nc' 
    170167            result= self._feature.subsetToGridSeries(config['tmpfilebuffer'], ncname=randomname, **dimValues) 
    171             #for now have to read netcdf back from disk (limitiation of CSML api) 
     168            #for now have to read netcdf back from  
     169            #disk (limitiation of CSML api) 
    172170            print ['h', result[1]] 
    173171            netcdf=cdms.open(result[1]) 
Note: See TracChangeset for help on using the changeset viewer.