Changeset 6224

Timestamp:

Jan 21, 2009, 4:39:27 PM (16 years ago)

Author:

ole

Message:

Added functionality for clipping buildings by a list of polygons.
This is not finished and test is only rudimentary.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (7 diffs)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -988 +988 @@
 
 
-def csv2building_polygons(file_name, floor_height=3):
+def csv2building_polygons(file_name,
+                          floor_height=3,
+                          clipping_polygons=None):
     """
     Convert CSV files of the form:
@@ -1009 +1011 @@
     
     Optional parameter floor_height is the height of each building story.
+    Optional parameter clipping_olygons is a list of polygons selecting
+    buildings. Any building not in these polygons will be omitted.
     
     See csv2polygons for more details
     """
 
-    polygons, values = csv2polygons(file_name, value_name='floors')    
+    polygons, values = csv2polygons(file_name,
+                                    value_name='floors',
+                                    clipping_polygons=None)    
 
     
@@ -1027 +1033 @@
 # @brief Convert CSV file into a dictionary of polygons and associated values.
 # @param filename The path to the file to read, value_name name for the 4th column
-def csv2polygons(file_name, value_name='value'):
+def csv2polygons(file_name,
+                 value_name='value',
+                 clipping_polygons=None):
     """
     Convert CSV files of the form:
@@ -1057 +1065 @@
     Eastings and Northings will be returned as floating point values while
     id and values will be returned as strings.
+
+    Optional argument: clipping_polygons will select only those polygons that are
+    fully within one or more of the clipping_polygons. In other words any polygon from
+    the csv file which has at least one point not inside one of the clipping polygons
+    will be excluded 
     
     See underlying function csv2dict for more details.
@@ -1086 +1099 @@
 
     # Loop through entries and compose polygons
+    excluded_polygons={}
     past_ids = {}
     last_id = None
@@ -1107 +1121 @@
         # Append this point to current polygon
         point = [float(X['easting'][i]), float(X['northing'][i])]
+
+        if clipping_polygons is not None:
+            exclude=True
+            for clipping_polygon in clipping_polygons:
+                if inside_polygon(point, clipping_polygon):
+                    exclude=False
+                    break
+                
+            if exclude is True:
+                excluded_polygons[id]=True
+
         polygons[id].append(point)    
             
@@ -1115 +1140 @@
 
         last_id = id
+
+    # Weed out polygons that were not wholly inside clipping polygons
+    for id in excluded_polygons:
+        del polygons[id]
         
     return polygons, values

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -11222 +11222 @@
 
 
+    def test_csv2polygons_with_clipping(self):
+        """test_csv2polygons with optional clipping
+        """
+        #FIXME(Ole): Not Done!!
+        
+        path = get_pathname_from_package('anuga.shallow_water')                
+        testfile = os.path.join(path, 'polygon_values_example.csv')                
+
+        polygons, values = csv2polygons(testfile, 
+                                        value_name='floors',
+                                        clipping_polygons=None)
+
+        assert len(polygons) == 7, 'Must have seven polygons'
+        assert len(values) == 7, 'Must have seven values'
+            
+        # Known floor values
+        floors = {'1': 2, '2': 0, '3': 1, '4': 2, '5': 0, '8': 1, '9': 1}
+        
+        # Known polygon values
+        known_polys = {'1': [[422681.61,871117.55],
+                             [422691.02,871117.60],
+                             [422690.87,871084.23],
+                             [422649.36,871081.85],
+                             [422649.36,871080.39],
+                             [422631.86,871079.50],
+                             [422631.72,871086.75],
+                             [422636.75,871087.20],
+                             [422636.75,871091.50],
+                             [422649.66,871092.09],
+                             [422649.83,871084.91],
+                             [422652.94,871084.90],
+                             [422652.84,871092.39],
+                             [422681.83,871093.73],
+                             [422681.61,871117.55]],
+                       '2': [[422664.22,870785.46],
+                             [422672.48,870780.14],
+                             [422668.17,870772.62],
+                             [422660.35,870777.17],
+                             [422664.22,870785.46]],
+                       '3': [[422661.30,871215.06],
+                             [422667.50,871215.70],
+                             [422668.30,871204.86],
+                             [422662.21,871204.33],
+                             [422661.30,871215.06]],
+                       '4': [[422473.44,871191.22],
+                             [422478.33,871192.26],
+                             [422479.52,871186.03],
+                             [422474.78,871185.14],
+                             [422473.44,871191.22]],
+                       '5': [[422369.69,871049.29],
+                             [422378.63,871053.58],
+                             [422383.91,871044.51],
+                             [422374.97,871040.32],
+                             [422369.69,871049.29]],
+                       '8': [[422730.56,871203.13],
+                             [422734.10,871204.90],
+                             [422735.26,871202.18],
+                             [422731.87,871200.58],
+                             [422730.56,871203.13]],
+                       '9': [[422659.85,871213.80],
+                             [422660.91,871210.97],
+                             [422655.42,871208.85],
+                             [422654.36,871211.68],
+                             [422659.85,871213.80]]
+                       }        
+        
+
+        
+                
+        for id in ['1', '2', '3', '4', '5' ,'8' ,'9']:
+            assert id in polygons.keys()
+            assert id in values.keys()            
+
+            assert int(values[id]) == int(floors[id])
+            assert len(polygons[id]) == len(known_polys[id])
+            assert num.allclose(polygons[id], known_polys[id])
+
+
+
+
     
     def test_csv2building_polygons(self):