Changeset 4352 for cows

Timestamp:

22/10/08 10:52:13 (12 years ago)

Author:

domlowe

Message:

Removing old bbox aggregator code

Location:

cows/trunk/cows

Files:

• bbox_util.py (modified) (2 diffs)
• model/filterencoding.py (modified) (1 diff)
• service/imps/csmlbackend/csmlcommon.py (modified) (1 diff)
• service/imps/csmlbackend/wfs_csmllayer.py (modified) (3 diffs)

cows/trunk/cows/bbox_util.py

@@ -4 +4 @@
 @note: This has no connection with the cows data model.  This module
     will probably move eventually.
-
+    
 """
 
@@ -20 +20 @@
 
     return llx, lly, urx, ury
+
+def union(bbox1, bbox2):
+    """
+    @ivar bbox1: bounding box tuple (llx, lly, urx, ury).
+    @ivar bbox2: bounding box tuple (llx, lly, urx, ury) to aggregate with bbox1 
+    @return: union of bbox1 and bbox2 as tuple, (llx, lly, urx, ury)
+    """
+    llx = min(bbox1[0], bbox2[0])
+    lly = min(bbox1[1], bbox2[1])
+    urx = max(bbox1[2], bbox2[2])
+    ury = max(bbox1[3], bbox2[3])
+    return llx, lly, urx, ury    
 
 def relativeSize(bbox1, bbox2):

cows/trunk/cows/model/filterencoding.py

@@ -73 +73 @@
         resultset=set(featureset.getFeaturesByBBox(bbtuple, srsname))                              
         return resultset        
-
+    
+class PropertyIsBetween(Filter):
+    def evaluate(self, featureset):
+        #TODO for time ranges
+        resultset=set(featureset.featuresByPropertyBetween(propertyname, lowerbound, upperbound))
+        
+                      
 class FEQueryProcessor(object):
     def __init__(self):

cows/trunk/cows/service/imps/csmlbackend/csmlcommon.py

@@ -86 +86 @@
         return d
     
-class BboxAggregator(object):
-    """ class to handle aggregations of bounding boxes (in the same crs) and store state for further comparisons"""
-    def __init__(self, initialbbox):
-        """ 
-        @ivar wgs84bbox: bounding box tuple (llx, lly, urx, ury) """
-        self.bbox=initialbbox
-        
-    def aggregate(self, newbbox):
-        """
-        @ivar newbbox: bounding box tuple (llx, lly, urx, ury) to compare against current bbox. 
-        @return: aggregated bbox tuple, (llx, lly, urx, ury)
-        """
-#        log.debug('Comparing new bbox %s with old bbox %s'%(newbbox, self.bbox))
-        #compare new box with old.
-        return union(self.bbox, newbbox)

cows/trunk/cows/service/imps/csmlbackend/wfs_csmllayer.py

@@ -4 +4 @@
 """
 
-from cows.service.imps.csmlbackend.csmlcommon import CSMLLayerMapper, CSMLConnector, BboxAggregator
+from cows.service.imps.csmlbackend.csmlcommon import CSMLLayerMapper, CSMLConnector
 from cows.service.wfs_iface import *
 import csml
 from xml.etree import ElementTree as etree
 from shapely.geometry import Polygon
+from cows.bbox_util import union
 
 import logging
@@ -50 +51 @@
         featureset=CSMLFeatureSet() #holds feature instances                
         layermap={} #feature types       
-        bboxAggregators={}#for aggregations of bounding boxes.
+        aggregatedBBoxes={}#for aggregations of bounding boxes.
+        
 
         for feature in csml.csmllibs.csmlextra.listify(ds.featureCollection.featureMembers):
@@ -60 +62 @@
                 layermap[ftype]=CSMLwfsLayer(ftype, instance.wgs84BBox)
                 #instantiate an aggregator to compare future bounding boxes with.
-                bboxAggregators[ftype]= BboxAggregator(instance.wgs84BBox)               
+                aggregatedBBoxes[ftype]= instance.wgs84BBox               
             else:
                 #the featuretype has already been stored in the dictionary.
                 #but, the bounding box may need changing to accommodate this new feature instance.
 #                log.debug('Checking bbox for feature id: %s and title: %s'%(instance._feature.id, instance.title))
-                aggregator=bboxAggregators[ftype]
-                aggregator.aggregate(instance.wgs84BBox)
-                layermap[ftype]=CSMLwfsLayer(ftype, aggregator.bbox)
+                currentbbox=aggregatedBBoxes[ftype]
+                newbbox=union(currentbbox, instance.wgs84BBox)
+                aggregatedBBoxes[ftype]= newbbox
+                layermap[ftype]=CSMLwfsLayer(ftype, newbbox)