Compatibility with city_IO updates

CityScope · Jun 2, 2020 · b3cad93 · b3cad93
1 parent e78982d
commit b3cad93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/indicator_tools.py b/indicator_tools.py
@@ -691,7 +691,7 @@ def load_patent_data(self,pop_th=100000):
 def flatten_grid_cell_attributes(type_def, height, attribute_name, 
                                  area_per_floor, return_units='capacity'):
     if isinstance(height, list):
-        height=height[1]
+        height=height[-1]
     grid_cell_total={}
     if type_def[attribute_name] is not None:
         if 'sqm_pperson' in type_def:          

diff --git a/toolbox.py b/toolbox.py
@@ -658,6 +658,8 @@ def assign_geogrid_props(self, handler):
 		'''
 		geogrid_props = handler.geogrid_props
 		self.types_def = geogrid_props['types']
+		if 'static_types' in geogrid_props:
+			self.types_def.update(geogrid_props['static_types'])
 		self.geogrid_header = geogrid_props['header']
 
 	def restructure(self,geogrid_data):