Make value take offsets (#335)

* Added a simple test to compare x-coordinates between pyntcloud and laspy

* Add Y and Z

* Correction of error

* Since the offset and scale of las data are double (float64), correct the default values.

* Add test data(las).

* Add test case for new data.

* Adding offsets to coordinates.

* Add test to check dtype of las data (there must be a better way...)

* Add offsets for pylas.

* Remove superfluous imports.

* Lowercase properties are used to obtain the dimensions of the LAS data.

Author: nokonoko1203

pyntcloud/io/las.py

@@ -1,3 +1,5 @@
+import numpy as np
+
 try:
     import laspy
 except ImportError:
@@ -50,9 +52,12 @@ def read_las_with_laspy(filename):
     with laspy.open(filename) as las_file:
         las = las_file.read()
         data["points"] = pd.DataFrame(las.points.array)
-        data["points"].columns = (x.lower() for x in data["points"].columns)
-        # because laspy do something strange with scale
-        data["points"].loc[:, ["x", "y", "z"]] *= las.header.scales
+        data["points"].columns = (name.lower() for name in data["points"].columns)
+
+        data["points"]["x"] = pd.Series(np.array(las.x))
+        data["points"]["y"] = pd.Series(np.array(las.y))
+        data["points"]["z"] = pd.Series(np.array(las.z))
+
         data["las_header"] = las.header
     return data
 
@@ -64,9 +69,12 @@ def read_las_with_pylas(filename):
     with pylas.open(filename) as las_file:
         las = las_file.read()
         data["points"] = pd.DataFrame(las.points)
-        data["points"].columns = (x.lower() for x in data["points"].columns)
-        # because pylas do something strange with scale
-        data["points"].loc[:, ["x", "y", "z"]] *= las.header.scales
+        data["points"].columns = (name.lower() for name in data["points"].columns)
+
+        data["points"]["x"] = pd.Series(np.array(las.x))
+        data["points"]["y"] = pd.Series(np.array(las.y))
+        data["points"]["z"] = pd.Series(np.array(las.z))
+
         data["las_header"] = las.header
     return data
 

tests/data/has_offsets.las

@@ -3,6 +3,7 @@
 import numpy as np
 
 from pyntcloud import PyntCloud
+import laspy
 
 
 def assert_points_xyz(data):
@@ -51,7 +52,9 @@ def test_from_file(data_path, extension, color, mesh, comments):
     if extension == ".laz":
         pytest.xfail("TODO: Review laz decompression error")
     cloud = PyntCloud.from_file(str(data_path / "diamond{}".format(extension)))
+
     assert_points_xyz(cloud)
+
     if color:
         assert_points_color(cloud)
     if mesh:
@@ -76,6 +79,7 @@ def test_obj_issue_226(data_path):
 
     assert "w" in cloud.points.columns
 
+
 def test_obj_issue_vn(data_path):
     """
     Fix type issue in pyntcloud/io/obj.py.
@@ -99,3 +103,51 @@ def test_ply_with_bool(data_path):
     cloud = PyntCloud.from_file(filename=TEST_PLY, allow_bool=True)
     assert "is_green" in cloud.points.columns, "Failed to find expected Boolean column: 'is_green'"
     assert cloud.points.is_green.dtype == bool, "Boolean column no loaded as bool dtype"
+
+
+def test_simple_las_issue_333(data_path):
+    """ Regression test https://github.com/daavoo/pyntcloud/issues/333
+    """
+    las_file_name = (str(data_path / "simple.las"))
+    cloud = PyntCloud.from_file(las_file_name)
+    points = cloud.points
+
+    x_point_pyntcloud = points["x"][0]
+    y_point_pyntcloud = points["y"][0]
+    z_point_pyntcloud = points["z"][0]
+
+    with laspy.open(las_file_name) as las_file:
+        las = las_file.read()
+        header = las.header
+
+        x_point_laspy = (las.X[0] * header.x_scale) + header.x_offset
+        y_point_laspy = (las.Y[0] * header.y_scale) + header.y_offset
+        z_point_laspy = (las.Z[0] * header.z_scale) + header.z_offset
+
+    assert x_point_pyntcloud == x_point_laspy.astype("float32")
+    assert y_point_pyntcloud == y_point_laspy.astype("float32")
+    assert z_point_pyntcloud == z_point_laspy.astype("float32")
+
+
+def test_has_offsets_las_issue_333(data_path):
+    """ Regression test https://github.com/daavoo/pyntcloud/issues/333
+    """
+    las_file_name = (str(data_path / "has_offsets.las"))
+    cloud = PyntCloud.from_file(las_file_name)
+    points = cloud.points
+
+    x_point_pyntcloud = points["x"][0]
+    y_point_pyntcloud = points["y"][0]
+    z_point_pyntcloud = points["z"][0]
+
+    with laspy.open(las_file_name) as las_file:
+        las = las_file.read()
+        header = las.header
+
+        x_point_laspy = (las.X[0] * header.x_scale) + header.x_offset
+        y_point_laspy = (las.Y[0] * header.y_scale) + header.y_offset
+        z_point_laspy = (las.Z[0] * header.z_scale) + header.z_offset
+
+    assert x_point_pyntcloud == x_point_laspy.astype("float32")
+    assert y_point_pyntcloud == y_point_laspy.astype("float32")
+    assert z_point_pyntcloud == z_point_laspy.astype("float32")