[BACKPORT]Updated due to #537 and #536.

inasafe · Mar 19, 2013 · 5cf2daa · 5cf2daa
1 parent 5a8d0bb
commit 5cf2daa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/safe/common/dynamic_translations.py b/safe/common/dynamic_translations.py
@@ -163,6 +163,7 @@ def dynamic_translations():
     tr('Tolerance')
     tr('Calculate displaced people')
     tr('Evacuation percentage')
+    tr('Distances [km]')
 
     # Post-processing
     tr('Gender')

diff --git a/safe/impact_functions/volcanic/volcano_building_impact.py b/safe/impact_functions/volcanic/volcano_building_impact.py
@@ -135,7 +135,7 @@ def run(self, layers):
 
         # Generate simple impact report
         table_body = [question,
-                      TableRow([tr('Buildings'), tr('Total'),
+                      TableRow([tr('Distance [km]'), tr('Total'),
                                 tr('Cumulative')],
                                header=True),
                       TableRow([tr('All'), format_int(total_affected), ''])]
@@ -144,7 +144,8 @@ def run(self, layers):
         for name in category_names:
             count = categories[name]
             cum += count
-            table_body.append(TableRow([name, format_int(count),
+            name_km = int(name / 1000)  # convert to km
+            table_body.append(TableRow([name_km, format_int(count),
                                         format_int(cum)]))
 
         table_body.append(TableRow(tr('Map shows buildings affected in '

diff --git a/safe/impact_functions/volcanic/volcano_population_evacuation_polygon_hazard.py b/safe/impact_functions/volcanic/volcano_population_evacuation_polygon_hazard.py
@@ -29,7 +29,7 @@ class VolcanoPolygonHazardPopulation(FunctionProvider):
     title = tr('Need evacuation')
     target_field = 'population'
 
-    parameters = {'R [km]': [3, 5, 10]}
+    parameters = {'distance [km]': [3, 5, 10]}
 
     def run(self, layers):
         """Risk plugin for flood population evacuation
@@ -70,7 +70,7 @@ def run(self, layers):
 
         if H.is_point_data:
             # Use concentric circles
-            radii = self.parameters['R [km]']
+            radii = self.parameters['distance [km]']
 
             centers = H.get_geometry()
             attributes = H.get_data()