Merge branch 'master' of git+ssh://git.ccss.cz/hsrs/owsproxy

OWS.py

@@ -111,7 +111,9 @@ class OWS:
         open(os.path.join(self.cachedir,"url.txt"),"w").write(self.url)
         return self.cachedir
 
-    def performRequest(self):
+    def dispatch(self):
+        """Dispatch given request
+        """
         request = mapscript.OWSRequest()
         request.loadParams()
         mapobj = None

owsproxy.cgi

@@ -7,10 +7,13 @@ import OWS
 import logging
 import OWSExceptions
 
+#debugger
+#import rpdb2; rpdb2.start_embedded_debugger("lucerna")
+
 logging.basicConfig(level=logging.DEBUG)
 
 try:
     service = OWS.getService()
-    service.performRequest()
+    service.dispatch()
 except OWSExceptions.OWSException,e:
     e.toXml()

wcs/__init__.py

@@ -58,6 +58,9 @@ class WCS(OWS):
                 if layer.crsOptions:
                     lyrobj.setProjection(layer.crsOptions[0])
                     extent = self.getLayerExtent(layer,layer.crsOptions[0])
+                elif  layer.supportedCRS:
+                    lyrobj.setProjection(layer.supportedCRS[0])
+                    extent = self.getLayerExtent(layer,layer.supportedCRS[0])
                 else:
                     sr = osr.SpatialReference()
                     sr.ImportFromWkt(ds.GetProjection())
@@ -73,7 +76,8 @@ class WCS(OWS):
                 lyrobj.type = mapscript.MS_LAYER_RASTER
                 lyrobj.dump = mapscript.MS_TRUE
                 lyrobj.template = "foo"
-                self.getTime(ds,lyrobj)
+                if ds:
+                    self.getTime(ds,lyrobj)
                 cls = mapscript.classObj(lyrobj)
                 mapscript.styleObj(cls)
             except Exception,e: