Changeset 2690

Timestamp:

03/07/07 13:23:05 (14 years ago)

Author:

domlowe

Message:

better support for 3 bounding box

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py (modified) (1 diff)

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

@@ -161 +161 @@
             sel['time']=timesequence
             
+            lon=feature.getLongitudeAxis()
+            lat=feature.getLatitudeAxis()
+            t=feature.getTimeAxis()
+            
+            if None in [lon, lat, time]:
+                #TODO need to return a suitable wcs error.
+                pass
+            
+            #create selection dictionary:
+            sel={}
+            sel[lat]=(boundingbox[1], boundingbox[3])
+            sel[lon]=(boundingbox[0], boundingbox[2])
+            sel[t]=timesequence
+            
+            #z is the 4th axis (eg height or pressure).
+            #NOTE, need to decide whether bounding box is of form: x1,y1,z1,x2,y2,z2 or x1,y1,x2,y2,z1,z2
+            #currently the latter is implemented. 
+           
+            if len(boundingbox)  == 6:
+                for ax in feature.getAxisLabels():
+                    if ax not in [lat, lon, t]:
+                        #must be Z  
+                        z=str(ax)
+                        sel[z]=(boundingbox[4], boundingbox[5])
+            
+           
+            axisNames=feature.getAxisLabels()
+                            
+            sel['time']=timesequence
             # Extract via CSML.subsetToGridSeries()
             if store: