fix: error creating SICD 1.3.0 sensor models

aws-solutions-library-samples · Jul 26, 2024 · 9272da0 · 9272da0
1 parent a579577
commit 9272da0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/aws/osml/gdal/sicd_sensor_model_builder.py b/src/aws/osml/gdal/sicd_sensor_model_builder.py
@@ -136,8 +136,8 @@ def from_dataclass(sicd: Union[sicd121.SICD, sicd130.SICD]) -> Optional[SensorMo
 
         projection_set = None
         ugpn = None
-        if sicd.grid.type_value == sicd121.ImageGridType.RGAZIM:
-            if sicd.image_formation.image_form_algo == sicd121.ImageFormAlgo.PFA:
+        if sicd.grid.type_value.value == sicd121.ImageGridType.RGAZIM.value:
+            if sicd.image_formation.image_form_algo.value == sicd121.ImageFormAlgo.PFA.value:
                 ugpn = xyztype_to_ndarray(sicd.pfa.fpn)
                 projection_set = PFAProjectionSet(
                     scp_ecf=scp_ecf,
@@ -146,22 +146,22 @@ def from_dataclass(sicd: Union[sicd121.SICD, sicd130.SICD]) -> Optional[SensorMo
                     coa_time_poly=time_coa_poly,
                     arp_poly=arp_poly,
                 )
-            elif sicd.image_formation.image_form_algo == sicd121.ImageFormAlgo.RGAZCOMP:
+            elif sicd.image_formation.image_form_algo.value == sicd121.ImageFormAlgo.RGAZCOMP.value:
                 projection_set = RGAZCOMPProjectionSet(
                     scp_ecf=scp_ecf, az_scale_factor=sicd.rg_az_comp.az_sf, coa_time_poly=time_coa_poly, arp_poly=arp_poly
                 )
-        elif sicd.grid.type_value == sicd121.ImageGridType.RGZERO:
+        elif sicd.grid.type_value.value == sicd121.ImageGridType.RGZERO.value:
             projection_set = INCAProjectionSet(
                 r_ca_scp=sicd.rma.inca.r_ca_scp,
                 inca_time_coa_poly=poly1d_to_native(sicd.rma.inca.time_capoly),
                 drate_sf_poly=poly2d_to_native(sicd.rma.inca.drate_sfpoly),
                 coa_time_poly=time_coa_poly,
                 arp_poly=arp_poly,
             )
-        elif sicd.grid.type_value in [
-            sicd121.ImageGridType.PLANE,
-            sicd121.ImageGridType.XCTYAT,
-            sicd121.ImageGridType.XRGYCR,
+        elif sicd.grid.type_value.value in [
+            sicd121.ImageGridType.PLANE.value,
+            sicd121.ImageGridType.XCTYAT.value,
+            sicd121.ImageGridType.XRGYCR.value,
         ]:
             projection_set = PlaneProjectionSet(
                 scp_ecf=scp_ecf,

diff --git a/test/aws/osml/gdal/test_sensor_model_factory.py b/test/aws/osml/gdal/test_sensor_model_factory.py
@@ -174,6 +174,8 @@ def test_sicd_sensor_models(self):
             "./test/data/sicd/capella-sicd121-chip1.ntf",
             "./test/data/sicd/capella-sicd121-chip2.ntf",
             "./test/data/sicd/umbra-sicd121-chip1.ntf",
+            "./test/data/sicd/capella-sicd130-chip1.ntf",
+            "./test/data/sicd/capella-sicd130-chip2.ntf",
         ]
         for image_path in test_examples:
             ds = gdal.Open(image_path)

diff --git a/test/data/sicd/capella-sicd130-chip1.ntf b/test/data/sicd/capella-sicd130-chip1.ntf
diff --git a/test/data/sicd/capella-sicd130-chip2.ntf b/test/data/sicd/capella-sicd130-chip2.ntf