updated to laspy 2.0.0 (with optional laszip)

.github/workflows/tests.yml

@@ -49,7 +49,7 @@ jobs:
 
       - name: Install detectree
         run: |
-          python setup.py install
+          pip install .[laszip]
           conda list
           conda info --all
 

detectree/lidar.py

@@ -1,9 +1,9 @@
 """Utilities to get canopy information from LiDAR data."""
 
+import laspy
 import numpy as np
 import pandas as pd
 import rasterio as rio
-from laspy import file as lp_file
 from rasterio import enums, features
 from shapely import geometry
 
@@ -36,10 +36,10 @@ def rasterize_lidar(lidar_filepath, lidar_tree_values, ref_img_filepath):
     lidar_arr : numpy ndarray
         Array with the rasterized lidar
     """
-    with lp_file.File(lidar_filepath, mode="r") as src:
-        c = src.get_classification()
-        x = src.x
-        y = src.y
+    las = laspy.read(lidar_filepath)
+    c = np.array(las.classification)
+    x = np.array(las.x)
+    y = np.array(las.y)
 
     cond = np.isin(c, lidar_tree_values)
     lidar_df = pd.DataFrame({"class_val": c[cond], "x": x[cond], "y": y[cond]})

environment-dev.yml

@@ -7,7 +7,7 @@ dependencies:
   - dask
   - distributed
   - joblib
-  - laspy
+  - laspy>=2.0.0
   - lastools
   - laszip
   - numpy>=1.15

requirements.txt

@@ -1,5 +1,6 @@
 dask[delayed,distributed]
 joblib
+laspy >= 2.0.0
 pymaxflow >= 1.0.0
 numpy >= 1.15
 pandas >= 0.23

setup.py

@@ -48,6 +48,7 @@
     packages=find_packages(exclude=["docs", "tests*"]),
     include_package_data=True,
     install_requires=install_requires,
+    extras_require={"laszip": ["laspy[laszip] >= 2.0.0"]},
     dependency_links=dependency_links,
     entry_points="""
     [console_scripts]