Changeset 2587 for TI02-CSML/trunk

Timestamp:

14/06/07 14:09:37 (13 years ago)

Author:

domlowe

Message:

fixed bug where nearest neighbour search conflicted with longitude transformation

Location:

TI02-CSML/trunk/csml/API

Files:

• csmlutils.py (modified) (1 diff)
• genSubset.py (modified) (2 diffs)
• ops_GridSeriesFeature.py (modified) (1 diff)

TI02-CSML/trunk/csml/API/csmlutils.py

@@ -26 +26 @@
                 if _anyitemlessthanzero(request[key]):
                     pass #no need to convert request if data is also -ve to +ve
-                else:
-                    for val in request[key]:
+                else:                 
+                    for val in request[key]:                       
                         if val < 0:
                             pass
-                        else:
+                        else:        
                             if kwargs[key][0] < 0:
                                 kwargs[key]=(kwargs[key][0]+360,kwargs[key][1])

TI02-CSML/trunk/csml/API/genSubset.py

@@ -7 +7 @@
 import Numeric
 
-def checkNeighbours(domain, gridnames, **kwargs):
+def checkNeighbours(domain, **kwargs):
     #for any non-range requests, get nearest neighbour
     #e.g if 'latitude': (11) requested, latitude=12 may be the nearest value
-     
     for key in kwargs:
     #need to skip time axis
@@ -242 +241 @@
     #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.
     kwargs=csmlutils.fixLongitude(domain,kwargs)
-        
+    
+    #if request doesn't match domain points find nearest neighbours
+    kwargs=csml.API.genSubset.checkNeighbours(domain, **kwargs)
+    
+    
     #get the name of the time axis in the coordinate reference system
     cat=csml.csmllibs.csmlcrs.CRSCatalogue()

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

@@ -127 +127 @@
     self.getDomain()      
     
-    #if request doesn't match domain points find nearest neighbours
-    kwargs=csml.API.genSubset.checkNeighbours(self.domain, self.gridnames, **kwargs)
     #get the CRS from a  the  catalogue
     cat=csml.csmllibs.csmlcrs.CRSCatalogue()