From 330e7f2ebc8f3b8d0308cd93ad67d602d4c5e2df Mon Sep 17 00:00:00 2001
From: rgerum <14153051+rgerum@users.noreply.github.com>
Date: Tue, 21 Sep 2021 14:33:12 -0400
Subject: [PATCH] fixed save/load test

---
 cameratransform/camera.py     |  2 +-
 cameratransform/projection.py |  2 +-
 tests/test_transforms.py      | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cameratransform/camera.py b/cameratransform/camera.py
index ca10138..f1437b0 100644
--- a/cameratransform/camera.py
+++ b/cameratransform/camera.py
@@ -1434,7 +1434,7 @@ def save(self, filename):
             the filename where to store the parameters.
         """
         keys = self.parameters.parameters.keys()
-        export_dict = {key: getattr(self, key) for key in keys}
+        export_dict = {key: getattr(self, key) for key in keys if key != "focallength_px"}
 
         # check projections and save
         if isinstance(self.projection, RectilinearProjection):
diff --git a/cameratransform/projection.py b/cameratransform/projection.py
index 5749de3..17eaaa8 100644
--- a/cameratransform/projection.py
+++ b/cameratransform/projection.py
@@ -178,7 +178,7 @@ def __str__(self):
 
     def save(self, filename):
         keys = self.parameters.parameters.keys()
-        export_dict = {key: getattr(self, key) for key in keys}
+        export_dict = {key: getattr(self, key) for key in keys if key != "focallength_px"}
         with open(filename, "w") as fp:
             fp.write(json.dumps(export_dict))
 
diff --git a/tests/test_transforms.py b/tests/test_transforms.py
index 9f1a848..43467b6 100644
--- a/tests/test_transforms.py
+++ b/tests/test_transforms.py
@@ -130,13 +130,15 @@ def test_saveLoad(self, cam):
             cam.save(filename)
             cam2 = ct.load_camera(filename)
             for key in cam.parameters.parameters:
-                self.assertAlmostEqual(getattr(cam, key), getattr(cam2, key), 3)
+                if key != "focallength_px":
+                    self.assertAlmostEqual(getattr(cam, key), getattr(cam2, key), 3)
 
             cam.projection.save(filename)
-            cam2.focallength = 999
+            cam2.focallength_px = 999
             cam2.projection.load(filename)
             for key in cam.parameters.parameters:
-                self.assertAlmostEqual(getattr(cam, key), getattr(cam2, key), 3)
+                if key != "focallength_px":
+                    self.assertAlmostEqual(getattr(cam, key), getattr(cam2, key), 3)
 
             cam.orientation.save(filename)
             cam2.elevation_m = 9
@@ -145,7 +147,8 @@ def test_saveLoad(self, cam):
             cam2.roll_deg = 9
             cam2.orientation.load(filename)
             for key in cam.orientation.parameters.parameters:
-                self.assertAlmostEqual(getattr(cam, key), getattr(cam2, key), 3)
+                if key != "focallength_px":
+                    self.assertAlmostEqual(getattr(cam, key), getattr(cam2, key), 3)
 
     @given(ct_st.camera())
     def test_print(self, cam):