Changeset 2863

Timestamp:

31/08/07 14:24:41 (12 years ago)

Author:

domlowe

Message:

adding bounding box class which represents spatial, temporal bbox + crs

Location:

TI02-CSML/trunk/csml

Files:

• API/csmlbbox.py (added)
• API/ops_AbstractFeature.py (modified) (2 diffs)
• API/ops_Dataset.py (modified) (1 diff)
• API/ops_GridSeriesFeature.py (modified) (1 diff)
• testfiles/gridseries/subset.py (modified) (2 diffs)

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

@@ -12 +12 @@
 def getAllowedSubsettings(self):
     return ['none']
-
 
 def getDomainUnits(self):
@@ -29 +28 @@
     return None
 
+def getBoundingBox(self):
+    return None
 
 def getSliceIndices(self, selection):

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

@@ -89 +89 @@
                 return extract 
 
+def getCSMLBoundingBox(self):
+    #returns a complete boundingBox object including temporal domain and crs
+    if hasattr(self.featureCollection, 'boundedBy'):
+        return csml.API.csmlbbox.CSMLBoundingBox(self.featureCollection.boundedBy)
+    else:
+        return None
+
+
 def getBoundingBox(self):
     ''' get boundingBox, returns the boundingBox of the CSMLFeatureCollection (assumes there is only one...)'''

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

@@ -20 +20 @@
     return ['subsetToGridSeries', 'subsetToProfileSeries']  #other operations
 
-
-
-
+def getCSMLBoundingBox(self):
+    #returns a complete boundingBox object including temporal domain and crs
+    if hasattr(self.value.gridSeriesDomain, 'boundedBy'):
+        return csml.API.csmlbbox.CSMLBoundingBox(self.featureCollection.boundedBy)
+    else:
+        return None
+
+def getBoundingBox(self):
+    bbox=self.value.gridSeriesDomain
+    try:
+        lower1=eval(bbox.boundedBy.lowerCorner.CONTENT.split()[0])
+        lower2=eval(bbox.boundedBy.lowerCorner.CONTENT.split()[1])
+        upper1=eval(bbox.boundedBy.upperCorner.CONTENT.split()[0])
+        upper2=eval(bbox.boundedBy.upperCorner.CONTENT.split()[1])
+        return [lower1,lower2,upper1,upper2]
+    except:
+        return None
+    
+    
 def getDomain(self):
     #returns domain as a dictionary of ordinates {name: [values], ...}

TI02-CSML/trunk/csml/testfiles/gridseries/subset.py

@@ -42 +42 @@
 
 #define a selection (based on the domain)
-subsetDictionary={}
-#subsetDictionary['time']=('2794-12-1T0:0:0.0', '2804-12-1T0:0:0.0')
-subsetDictionary['time']='2704-12-01T00:00:00.0'
-#subsetDictionary['latitude']=(-90,60)
+#subsetDictionary={}
+##subsetDictionary['time']=('2794-12-1T0:0:0.0', '2804-12-1T0:0:0.0')
+#subsetDictionary['time']='2704-12-01T00:00:00.0'
+##subsetDictionary['latitude']=(-90,60)
+##subsetDictionary['longitude']=(-31.1265,30.258)
+#subsetDictionary['latitude']=(-5,5)
 #subsetDictionary['longitude']=(-31.1265,30.258)
-subsetDictionary['latitude']=(-5,5)
-subsetDictionary['longitude']=(-31.1265,30.258)
 #request subsetted data from features (can set paths here) and add to container
 #subset a feature
@@ -55 +55 @@
 
     #csmlContainer.add(feature.subsetToGridSeries(outputdir,ncname='mygridseries.nc',**subsetDictionary))
-csmlContainer.add(feature.subsetToGridSeries(outputdir,ncname='mygridseries.nc',latitude=(-90,90), longitude=(-180,180),time='2704-12-01T00:00:00.0'))
+csmlContainer.add(feature.subsetToGridSeries(outputdir,ncname='mygridseries.nc',latitude=(-90,90), longitude=(-180,180),time=('2804-12-01T00:00:00.0','2904-12-01T00:00:00.0')))
 
 ##subset another feature (in fact it's the same feature again, but this time subsetting to a profileseries)