Changeset 2630 for TI05-delivery/ows_framework

Timestamp:

21/06/07 15:05:06 (12 years ago)

Author:

spascoe

Message:

Added cache code but performance is still sluggish. Need to work out
exactly what's going on.

Location:

TI05-delivery/ows_framework/trunk/ows_server

Files:

• ez_setup/__init__.pyc (modified) (previous)
• ows_server/controllers/csml_wms.py (modified) (3 diffs)
• ows_server/lib/cache.py (added)
• ows_server/lib/csml_cache.py (added)
• ows_server/lib/csml_util.py (modified) (1 diff)
• ows_server/tests/functional/test_csml_wms.py (modified) (2 diffs)
• test.ini (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wms.py

@@ -12 +12 @@
 from ows_server.lib.decorators import *
 from ows_server.lib import grid_util, render
-from ows_server.lib.csml_util import get_csml_doc, extractToVariable
+from ows_server.lib.csml_util import get_csml_doc, extract_cache
 import ows_server.lib.validators as V
 
@@ -141 +141 @@
         # render.render_variable()
         #!TODO: This could be done better.
-        x1 = max(-180., min(180., bbox[0]))
-        x2 = max(-180., min(180., bbox[2]))
-        y1 = max(-90., min(90., bbox[1]))
-        y2 = max(-90., min(90., bbox[3]))
+        #x1 = max(-180., min(180., bbox[0]))
+        #x2 = max(-180., min(180., bbox[2]))
+        #y1 = max(-90., min(90., bbox[1]))
+        #y2 = max(-90., min(90., bbox[3]))
 
         # Define the extraction selector
-        sel = dict(latitude=(y1, y2), longitude=(x1, x2))
+        #sel = dict(latitude=(y1, y2), longitude=(x1, x2))
 
         # Parse dimensions.
+        sel = {}
         for dim in self._iterDimensions(feature):
             # For the moment hard-code time in.  We don't support any other dimension yet.
@@ -160 +161 @@
                 raise OWS_E.MissingParameterValue('%s dimension not specified' % dim, dim)
 
-        
+        # Get the entire lat/lon slice from the extract_cache
+        var = extract_cache[feature, sel]
 
-        try:
-            # Extract via CSML.subsetToGridSeries()
-            var = extractToVariable(feature, sel)
+        # Do geographical subsetting in cdms
+        var = var(latitude=(bbox[1], bbox[3]), longitude=(bbox[0], bbox[2]), squeeze=1)
 
-            # Deduce min and max
-            varmin = MA.minimum(var, None)
-            varmax = MA.maximum(var, None)
+        # Deduce min and max
+        #!TODO: How do we get the min/max?
+        #varmin = MA.minimum(var, None)
+        #varmax = MA.maximum(var, None)
+        varmin=0; varmax=100
 
-            # Render variable to a PIL image
-            img = render.render_variable(var, bbox, width, height, 0, 100) # varmin, varmax
+        # Render variable to a PIL image
+        img = render.render_variable(var, bbox, width, height, varmin, varmax)
 
-            # Serialise it to PNG
-            buf = StringIO()
-            img.save(buf, 'PNG')
-        except Exception, e:
-            import pdb; pdb.post_mortem(sys.exc_info()[2])
-            if isinstance(e, OWS_E.OwsError):
-                raise e
-            else:
-                raise OWS_E.NoApplicableCode(e)
+        # Serialise it to PNG
+        buf = StringIO()
+        img.save(buf, 'PNG')
 
         return Response(content=buf.getvalue(), mimetype='image/png')

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/csml_util.py

@@ -14 +14 @@
 import zipfile
 import tempfile
+
+from ows_server.lib import csml_cache
+extract_cache = csml_cache.CSMLCache(request.environ['paste.config']['app_conf']['tmp_dir'], max_size=3)
+
 
 def get_csml_doc(file):

TI05-delivery/ows_framework/trunk/ows_server/ows_server/tests/functional/test_csml_wms.py

@@ -6 +6 @@
 wms_ns = 'http://www.opengis.net/wms'
 
-# This depends on the value randomly generated by csmlscan.
-# However make_data.py sets the random seed so this should work.
-test_feature_id = 'DVVhDIq2'
+# Test id is hard coded for now until I work out how to get it dynamically within
+# the test harness.
+test_feature_id = 'QGYylL9h'
 
 class TestGetCapabilities(TestController):
     def setUp(self):
         url = url_for(controller='csml_wms',
-                      file='test',
+                      file='clim_10',
                       request='GetCapabilities',
                       service='WMS',
@@ -35 +35 @@
         # With 4 sub-layers
         layers = layers[0].findall('./{%(ns)s}Layer' % dict(ns=wms_ns))
-        assert len(layers) == 4
+        assert len(layers) == 9
 
 class TestGetMap(TestController):
     def setUp(self):
-        url = url_for(controller='csml_wms', file='test',
+        url = url_for(controller='csml_wms', file='clim_10',
                       request='GetMap',
                       layers=test_feature_id,

TI05-delivery/ows_framework/trunk/ows_server/test.ini

@@ -17 +17 @@
 [app:main]
 use = config:development.ini#main_app
-csml_dir = %(here)s/ows_server/tests/data
 
 # Add additional test specific configuration options as necessary.