Changeset 1341

Timestamp:

31/07/06 09:00:15 (13 years ago)

Author:

domlowe

Message:

code to handle longitude requests in -ve,+ve format even if data is +ve,+ve)

Location:

TI02-CSML/trunk/parser

Files:

• API/ops_GridSeriesFeature.py (modified) (4 diffs)
• apicalls.py (modified) (1 diff)

TI02-CSML/trunk/parser/API/ops_GridSeriesFeature.py

@@ -59 +59 @@
     else:
         pathToSubsetNetCDF='temp.nc'
-
+    
+    #deal with longitude requests
+    #if the request is in -ve,+ve eg (-30,30) but the data is in (0,360) need to handle this by changing the args.
+    dc = self.getDomainComplement()
+    for key in dc.keys():
+        if key == 'longitude': #how do we test if it is longitude properly?
+            print dc[key]
+            for val in dc[key]:
+                if val < 0:
+                    pass
+                else:
+                    if kwargs[key][0] < 0:
+                        kwargs[key]=(kwargs[key][0]+360,kwargs[key][1])
+                    if kwargs[key][1] < 0:
+                        kwargs[key]=(kwargs[key][0],kwargs[key][1]+360)
+         
     domainref = getDomainReference(self)
     self.times=timeSubset
@@ -104 +119 @@
     domain.domainReference=Parser.TimePositionList(timePositions=strTimes)
     grid=Parser.Grid()
-    dc = self.getDomainComplement()
+    #dc = self.getDomainComplement()
     ordinates= []
     i=0
@@ -118 +133 @@
         god.definesAxis=key
         straxisValues=''
+        
+        #now deal with each argument:
         if key in kwargs:
             if kwargs[key][0] < kwargs[key][1]:   
@@ -125 +142 @@
                             arraySize=arraySize+1
                             straxisValues=straxisValues+ str(val) + ', '
-            else:#this if deals with selections such as longitude (330,30)
+            else:#this if deals with selections such as longitude (330,30) where the lower limit is 'greater' than the upper limit in a mathematical sense.
                     for val in dc[key]:
                         if val >= kwargs[key][0]:

TI02-CSML/trunk/parser/apicalls.py

@@ -46 +46 @@
 spatialSubsetDictionary= {}
 spatialSubsetDictionary['latitude']=(-90,90)
-spatialSubsetDictionary['longitude']=(330,340)
+#spatialSubsetDictionary['longitude']=(330,359)
+spatialSubsetDictionary['longitude']=(-31.265,30.258)
 
 #request subsetted data from feature (can set paths here)