camera-client 0.2.1__tar.gz → 0.2.3__tar.gz

{camera_client-0.2.1/camera_client.egg-info → camera_client-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camera-client
-Version: 0.2.1
+Version: 0.2.3
 Summary: Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions.
 Author-email: Alexander Abramov <extremal.ru@gmail.com>
 License: MIT
@@ -334,8 +334,17 @@ The calibration file is a NumPy `.npz` archive containing:
 - `exp_im2ray`: Image to ray direction transformation
 
 ### Metadata
-- `im_width`, `im_height`: Image dimensions in pixels
+- `format_version`: Version string of the data format
+- `camera_id`: Integer identifier for the camera
+- `plan_url`: URL or path to the ground plan image
 - `plan_scale`: Scale factor for ground plane coordinates (pixels per meter)
+- `plan_width`: Width of the ground plan in pixels
+- `plan_height`: Height of the ground plan in pixels
+- `im_src_url`: URL or path to the source (distorted) camera image
+- `im_ctd_url`: URL or path to the corrected (undistorted) camera image
+- `im_width`: Width of the camera image in pixels
+- `im_height`: Height of the camera image in pixels
+- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygons, counting_lines)
 
 ## Requirements
 

{camera_client-0.2.1 → camera_client-0.2.3}/README.md

@@ -304,8 +304,17 @@ The calibration file is a NumPy `.npz` archive containing:
 - `exp_im2ray`: Image to ray direction transformation
 
 ### Metadata
-- `im_width`, `im_height`: Image dimensions in pixels
+- `format_version`: Version string of the data format
+- `camera_id`: Integer identifier for the camera
+- `plan_url`: URL or path to the ground plan image
 - `plan_scale`: Scale factor for ground plane coordinates (pixels per meter)
+- `plan_width`: Width of the ground plan in pixels
+- `plan_height`: Height of the ground plan in pixels
+- `im_src_url`: URL or path to the source (distorted) camera image
+- `im_ctd_url`: URL or path to the corrected (undistorted) camera image
+- `im_width`: Width of the camera image in pixels
+- `im_height`: Height of the camera image in pixels
+- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygons, counting_lines)
 
 ## Requirements
 

{camera_client-0.2.1 → camera_client-0.2.3}/camera_client/client.py

@@ -29,7 +29,16 @@ class CameraProjection:
         """
         data = cam_archive_data
 
+        self.camera_id = data["camera_id"]
+        self.ctd_geometry = data["ctd_geometry"]
+
         self.plan_scale = float(data["plan_scale"])
+        self.plan_url = str(data["plan_url"])
+        self.plan_width = int(data["plan_width"])
+        self.plan_height = int(data["plan_height"])
+
+        self.im_src_url = str(data["im_src_url"])
+        self.im_ctd_url = str(data["im_ctd_url"])
         self.im_width = int(data["im_width"])
         self.im_height = int(data["im_height"])
         self.im_wh_size = (self.im_width, self.im_height)

{camera_client-0.2.1 → camera_client-0.2.3}/camera_client/loading.py

@@ -1,3 +1,4 @@
+import json
 import numpy as np
 import sympy as sp
 
@@ -11,9 +12,16 @@ def read_npz_file(filename):
 
     Returns:
         dict: Dictionary containing the following keys:
+            - format_version (str): Version string of the data format
+            - camera_id (int): Integer identifier for the camera
+            - plan_url (str): URL or path to the ground plan image
             - plan_scale (float): Scale factor for ground plane coordinates (pixels per meter)
-            - im_width (int): Width of the image in pixels
-            - im_height (int): Height of the image in pixels
+            - plan_width (int): Width of the ground plan in pixels
+            - plan_height (int): Height of the ground plan in pixels
+            - im_src_url (str): URL or path to the source (distorted) camera image
+            - im_ctd_url (str): URL or path to the corrected (undistorted) camera image
+            - im_width (int): Width of the camera image in pixels
+            - im_height (int): Height of the camera image in pixels
             - src2ctd (np.ndarray): Map of coordinates for undistorted (corrected) image.
                                    Shape: (height, width, 2) where channel 0 is X, channel 1 is Y
             - ctd2src (np.ndarray): Map of coordinates for distorted (raw) image based on undistorted.
@@ -25,10 +33,24 @@ def read_npz_file(filename):
             - exp_gnd2im (sp.Expr): Sympy expression for ground to image coordinate transformation
             - exp_key_point (sp.Expr): Sympy expression for keypoint coordinates
             - exp_im2ray (sp.Expr): Sympy expression for image to ray direction transformation
+            - ctd_geometry (dict): JSON object containing geometry data in CTD coordinate system:
+                - efov_polygons: Polygons defining effective field of view in CTD coordinates
+                - counting_lines: Polylines for counting forward/backward track intersections
     """
     data = np.load(filename)
 
+    format_version = str(data["format_version"])
+    camera_id = int(data["camera_id"])
+
+    # Plan options
+    plan_url = str(data["plan_url"])
     plan_scale = data["plan_scale"]
+    plan_width = data["plan_width"]
+    plan_height = data["plan_height"]
+
+    # Camera image options
+    im_src_url = str(data["im_src_url"])
+    im_ctd_url = str(data["im_ctd_url"])
     im_width = data["im_width"]
     im_height = data["im_height"]
 
@@ -46,20 +68,36 @@ def read_npz_file(filename):
     exp_key_point = sp.sympify(str(data["exp_key_point"]))
     exp_im2ray = sp.sympify(str(data["exp_im2ray"]))
 
+    # Ctd image geometry
+    ctd_geometry = json.loads(str(data["ctd_geometry"]))
+
     # Don't forget to close the file
     data.close()
 
     return {
+        "camera_id": camera_id,
+        # Plan options
+        "plan_url": plan_url,
         "plan_scale": plan_scale,
+        "plan_width": plan_width,
+        "plan_height": plan_height,
+        # Camera image option
+        "im_src_url": im_src_url,
+        "im_ctd_url": im_ctd_url,
         "im_width": im_width,
         "im_height": im_height,
+        # Distortion coords maps
         "src2ctd": src2ctd,
         "ctd2src": ctd2src,
-        "map_scale_h": map_scale_h,
-        "map_scale_w": map_scale_w,
-        "map_scale_vang": map_scale_vang,
+        # Perspective projection expressions
         "exp_im2gnd": exp_im2gnd,
         "exp_gnd2im": exp_gnd2im,
         "exp_key_point": exp_key_point,
         "exp_im2ray": exp_im2ray,
+        # Scale maps
+        "map_scale_h": map_scale_h,
+        "map_scale_w": map_scale_w,
+        "map_scale_vang": map_scale_vang,
+        # Ctd image geometry
+        "ctd_geometry": ctd_geometry,
     }

{camera_client-0.2.1 → camera_client-0.2.3/camera_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camera-client
-Version: 0.2.1
+Version: 0.2.3
 Summary: Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions.
 Author-email: Alexander Abramov <extremal.ru@gmail.com>
 License: MIT
@@ -334,8 +334,17 @@ The calibration file is a NumPy `.npz` archive containing:
 - `exp_im2ray`: Image to ray direction transformation
 
 ### Metadata
-- `im_width`, `im_height`: Image dimensions in pixels
+- `format_version`: Version string of the data format
+- `camera_id`: Integer identifier for the camera
+- `plan_url`: URL or path to the ground plan image
 - `plan_scale`: Scale factor for ground plane coordinates (pixels per meter)
+- `plan_width`: Width of the ground plan in pixels
+- `plan_height`: Height of the ground plan in pixels
+- `im_src_url`: URL or path to the source (distorted) camera image
+- `im_ctd_url`: URL or path to the corrected (undistorted) camera image
+- `im_width`: Width of the camera image in pixels
+- `im_height`: Height of the camera image in pixels
+- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygons, counting_lines)
 
 ## Requirements
 

{camera_client-0.2.1 → camera_client-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "camera-client"
-version = "0.2.1"
+version = "0.2.3"
 description = "Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions."
 readme = "README.md"
 requires-python = ">=3.7"