migrate raster size from list to dict. natcap#58

davemfish · Jan 9, 2025 · b9633b3 · b9633b3
1 parent 84d2bca
commit b9633b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/geometamaker/geometamaker.py b/src/geometamaker/geometamaker.py
@@ -273,7 +273,8 @@ def describe_raster(source_dataset_path, scheme):
     description['data_model'] = models.RasterSchema(
         bands=bands,
         pixel_size=info['pixel_size'],
-        raster_size=info['raster_size'])
+        raster_size={'width': info['raster_size'][0],
+                     'height': info['raster_size'][1]})
     # Some values of raster info are numpy types, which the
     # yaml dumper doesn't know how to represent.
     bbox = models.BoundingBox(*[float(x) for x in info['bounding_box']])

diff --git a/src/geometamaker/models.py b/src/geometamaker/models.py
@@ -102,7 +102,13 @@ class RasterSchema(Parent):
 
     bands: List[BandSchema]
     pixel_size: list
-    raster_size: list
+    raster_size: dict | list
+
+    def model_post_init(self, __context):
+        # Migrate from previous model where we stored this as a list
+        if isinstance(self.raster_size, list):
+            self.raster_size = {'width': self.raster_size[0],
+                                'height': self.raster_size[1]}
 
 
 class BaseMetadata(Parent):