3737)
3838
3939
40- class CameraModels (Enum ):
40+ class CameraModels (str , Enum ):
4141 BROWN_CONRADY = "brown_conrady"
4242 FISHEYE = "fisheye"
4343
@@ -122,7 +122,7 @@ class CameraParams:
122122
123123 def __post_init__ (self ):
124124 if self .camera_model is not None :
125- if self .camera_model not in CameraModels :
125+ if self .camera_model not in ( k for k in CameraModels ) :
126126 raise ValueError (
127127 f'Invalid Camera Model, the supported options are "{ CameraModels .BROWN_CONRADY } " and "{ CameraModels .FISHEYE } "'
128128 )
@@ -137,13 +137,13 @@ def from_json(cls, payload: Dict[str, Any]):
137137 payload [FY_KEY ],
138138 payload [CX_KEY ],
139139 payload [CY_KEY ],
140+ payload .get (CAMERA_MODEL_KEY , None ),
140141 payload .get (K1_KEY , None ),
141142 payload .get (K2_KEY , None ),
142143 payload .get (K3_KEY , None ),
143144 payload .get (K4_KEY , None ),
144145 payload .get (P1_KEY , None ),
145146 payload .get (P2_KEY , None ),
146- payload .get (CAMERA_MODEL_KEY , None ),
147147 )
148148
149149 def to_payload (self ) -> dict :
0 commit comments