gis: Pass model to RasterLayer.from_file (projectmesa#186)

Fixes the population and rainfall models by passing model to RasterLayer.from_file(). > The RasterLayer creates Cells, Cells inherit from Agents, Agents need model input, but RasterLayer doesn't have access to model.
EwoutH · Sep 20, 2024 · 1e864f3 · 1e864f3
1 parent 8aea8fc
commit 1e864f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/gis/population/population/space.py b/gis/population/population/space.py
@@ -38,6 +38,7 @@ def load_data(self, population_gzip_file, lake_zip_file, world_zip_file, model):
         world_size = gpd.GeoDataFrame.from_file(world_zip_file)
         raster_layer = RasterLayer.from_file(
             population_gzip_file,
+            model=model,
             cell_cls=UgandaCell,
             attr_name="population",
             rio_opener=gzip.open,

diff --git a/gis/rainfall/rainfall/space.py b/gis/rainfall/rainfall/space.py
@@ -37,6 +37,7 @@ def __init__(self, crs, water_height, model):
     def set_elevation_layer(self, elevation_gzip_file, crs):
         raster_layer = mg.RasterLayer.from_file(
             elevation_gzip_file,
+            model=self.model,
             cell_cls=LakeCell,
             attr_name="elevation",
             rio_opener=gzip.open,