ign-pdal-tools 1.7.4__tar.gz → 1.7.6__tar.gz

{ign_pdal_tools-1.7.4/ign_pdal_tools.egg-info → ign_pdal_tools-1.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ign-pdal-tools
-Version: 1.7.4
+Version: 1.7.6
 Summary: Library for common LAS files manipulation with PDAL
 Author-email: Guillaume Liegard <guillaume.liegard@ign.fr>
 Description-Content-Type: text/markdown
@@ -87,6 +87,11 @@ By default, `xcoord` and `ycoord` are given in kilometers and the shape of the t
 `readers.las: Global encoding WKT flag not set for point format 6 - 10.` which is due to TerraSolid
 malformed LAS output for LAS1.4 files with point format 6 to 10.
 
+## Add points in Las
+
+[add_points_in_las.py](pdaltools/add_points_in_las.py): add points from some vector files (ex: shp, geojson, ...) inside Las. New points will have X,Y and Z coordinates. Other attributes values given by  the initial las file are null (ex: classification at 0). These others attributes could be forced by using the '--dimensions/-d' option in the command line (ex : 'add_points_in_las.py -i myLas.las -g myPoints.json -d classification=64' - points will have their classification set to 64). The dimension should be present in the initial las ; this is not allowed to add new dimension.
+
+
 # Dev / Build
 
 ## Contribute

ign_pdal_tools-1.7.4/PKG-INFO → ign_pdal_tools-1.7.6/README.md

@@ -1,11 +1,3 @@
-Metadata-Version: 2.1
-Name: ign-pdal-tools
-Version: 1.7.4
-Summary: Library for common LAS files manipulation with PDAL
-Author-email: Guillaume Liegard <guillaume.liegard@ign.fr>
-Description-Content-Type: text/markdown
-License-File: LICENSE.md
-
 # ign-pdal-tools
 
 This repo contains various python tools based on [PDAL](https://pdal.io/) that are used to work on
@@ -87,6 +79,11 @@ By default, `xcoord` and `ycoord` are given in kilometers and the shape of the t
 `readers.las: Global encoding WKT flag not set for point format 6 - 10.` which is due to TerraSolid
 malformed LAS output for LAS1.4 files with point format 6 to 10.
 
+## Add points in Las
+
+[add_points_in_las.py](pdaltools/add_points_in_las.py): add points from some vector files (ex: shp, geojson, ...) inside Las. New points will have X,Y and Z coordinates. Other attributes values given by  the initial las file are null (ex: classification at 0). These others attributes could be forced by using the '--dimensions/-d' option in the command line (ex : 'add_points_in_las.py -i myLas.las -g myPoints.json -d classification=64' - points will have their classification set to 64). The dimension should be present in the initial las ; this is not allowed to add new dimension.
+
+
 # Dev / Build
 
 ## Contribute

ign_pdal_tools-1.7.4/README.md → ign_pdal_tools-1.7.6/ign_pdal_tools.egg-info/PKG-INFO

@@ -1,3 +1,11 @@
+Metadata-Version: 2.2
+Name: ign-pdal-tools
+Version: 1.7.6
+Summary: Library for common LAS files manipulation with PDAL
+Author-email: Guillaume Liegard <guillaume.liegard@ign.fr>
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+
 # ign-pdal-tools
 
 This repo contains various python tools based on [PDAL](https://pdal.io/) that are used to work on
@@ -79,6 +87,11 @@ By default, `xcoord` and `ycoord` are given in kilometers and the shape of the t
 `readers.las: Global encoding WKT flag not set for point format 6 - 10.` which is due to TerraSolid
 malformed LAS output for LAS1.4 files with point format 6 to 10.
 
+## Add points in Las
+
+[add_points_in_las.py](pdaltools/add_points_in_las.py): add points from some vector files (ex: shp, geojson, ...) inside Las. New points will have X,Y and Z coordinates. Other attributes values given by  the initial las file are null (ex: classification at 0). These others attributes could be forced by using the '--dimensions/-d' option in the command line (ex : 'add_points_in_las.py -i myLas.las -g myPoints.json -d classification=64' - points will have their classification set to 64). The dimension should be present in the initial las ; this is not allowed to add new dimension.
+
+
 # Dev / Build
 
 ## Contribute

{ign_pdal_tools-1.7.4 → ign_pdal_tools-1.7.6}/ign_pdal_tools.egg-info/SOURCES.txt

@@ -6,6 +6,8 @@ ign_pdal_tools.egg-info/SOURCES.txt
 ign_pdal_tools.egg-info/dependency_links.txt
 ign_pdal_tools.egg-info/top_level.txt
 pdaltools/_version.py
+pdaltools/add_points_in_las.py
+pdaltools/add_points_in_pointcloud.py
 pdaltools/color.py
 pdaltools/las_add_buffer.py
 pdaltools/las_clip.py
@@ -16,6 +18,8 @@ pdaltools/pcd_info.py
 pdaltools/replace_attribute_in_las.py
 pdaltools/standardize_format.py
 pdaltools/unlock_file.py
+test/test_add_points_in_las.py
+test/test_add_points_in_pointcloud.py
 test/test_color.py
 test/test_las_add_buffer.py
 test/test_las_clip.py

{ign_pdal_tools-1.7.4 → ign_pdal_tools-1.7.6}/pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.4"
+__version__ = "1.7.6"
 
 
 if __name__ == "__main__":

ign_pdal_tools-1.7.6/pdaltools/add_points_in_las.py

@@ -0,0 +1,104 @@
+import argparse
+
+import geopandas
+import numpy as np
+import pdal
+
+from pdaltools.las_info import get_writer_parameters_from_reader_metadata, las_info_metadata, get_bounds_from_header_info
+
+
+def extract_points_from_geo(input_geo: str):
+    file = open(input_geo)
+    df = geopandas.read_file(file)
+    return df.get_coordinates(ignore_index=True, include_z=True)
+
+def point_in_bound(bound_minx, bound_maxx, bound_miny, bound_maxy, pt_x, pt_y):
+    return pt_x >= bound_minx and  pt_x <= bound_maxx and pt_y >= bound_miny and  pt_y <= bound_maxy
+
+def add_points_in_las(input_las: str, input_geo: str, output_las: str, inside_las: bool, values_dimensions: {}):
+    points_geo = extract_points_from_geo(input_geo)
+    pipeline = pdal.Pipeline() | pdal.Reader.las(input_las)
+    pipeline.execute()
+    points_las = pipeline.arrays[0]
+    dimensions = list(points_las.dtype.fields.keys())
+
+    if inside_las:
+        mtd = las_info_metadata(input_las)
+        bound_minx, bound_maxx, bound_miny, bound_maxy = get_bounds_from_header_info(mtd)
+
+    for i in points_geo.index:
+        if inside_las :
+            if not point_in_bound(bound_minx, bound_maxx, bound_miny, bound_maxy, points_geo["x"][i], points_geo["y"][i]):
+                continue
+        pt_las = np.empty(1, dtype=points_las.dtype)
+        pt_las[0][dimensions.index("X")] = points_geo["x"][i]
+        pt_las[0][dimensions.index("Y")] = points_geo["y"][i]
+        pt_las[0][dimensions.index("Z")] = points_geo["z"][i]
+        for val in values_dimensions:
+            pt_las[0][dimensions.index(val)] = values_dimensions[val]
+        points_las = np.append(points_las, pt_las, axis=0)
+
+    params = get_writer_parameters_from_reader_metadata(pipeline.metadata)
+    pipeline_end = pdal.Pipeline(arrays=[points_las])
+    pipeline_end |= pdal.Writer.las(output_las, forward="all", **params)
+    pipeline_end.execute()
+
+
+def parse_args():
+    parser = argparse.ArgumentParser("Add points from geometry file in a las/laz file.")
+    parser.add_argument("--input_file", "-i", type=str, help="Las/Laz input file")
+    parser.add_argument("--output_file", "-o", type=str, help="Las/Laz output file.")
+    parser.add_argument("--input_geo_file", "-g", type=str, help="Geometry input file.")
+    parser.add_argument("--inside_las", "-l", type=str, help="Keep points only inside the las boundary.")
+    parser.add_argument(
+        "--dimensions",
+        "-d",
+        metavar="KEY=VALUE",
+        nargs="+",
+        help="Set a number of key-value pairs corresponding to value "
+        "needed in points added in the output las; key should be included in the input las.",
+    )
+    return parser.parse_args()
+
+
+def is_nature(value, nature):
+    if value is None:
+        return False
+    try:
+        nature(value)
+        return True
+    except:
+        return False
+
+
+def parse_var(s):
+    items = s.split("=")
+    key = items[0].strip()
+    if len(items) > 1:
+        value = "=".join(items[1:])
+        if is_nature(value, int):
+            value = int(value)
+        elif is_nature(value, float):
+            value = float(value)
+    return (key, value)
+
+
+def parse_vars(items):
+    d = {}
+    if items:
+        for item in items:
+            key, value = parse_var(item)
+            d[key] = value
+    return d
+
+
+if __name__ == "__main__":
+    args = parse_args()
+    added_dimensions = parse_vars(args.dimensions)
+    add_points_in_las(
+        input_las=args.input_file,
+        input_geo=args.input_geo_file,
+        output_las=args.input_file if args.output_file is None else args.output_file,
+        inside_las=args.inside_las,
+        values_dimensions=added_dimensions,
+    )

ign_pdal_tools-1.7.6/pdaltools/add_points_in_pointcloud.py

@@ -0,0 +1,102 @@
+import geopandas as gpd
+import laspy
+import numpy as np
+from shapely.geometry import box
+
+from pdaltools.las_info import get_tile_origin_using_header_info
+
+
+def get_tile_bbox(input_las, tile_width=1000) -> tuple:
+    """
+    Get the theoretical bounding box (xmin, ymin, xmax, ymax) of a LIDAR tile
+    using its origin and the predefined tile width.
+
+    Args:
+        input_las (str): Path to the LIDAR `.las/.laz` file.
+        tile_width (int): Width of the tile in meters (default: 1000).
+
+    Returns:
+        tuple: Bounding box as (xmin, ymin, xmax, ymax).
+    """
+    origin_x, origin_y = get_tile_origin_using_header_info(input_las)
+    bbox = (origin_x, origin_y - tile_width, origin_x + tile_width, origin_y)
+    return bbox
+
+
+def clip_3d_points_to_tile(input_points: str, input_las: str, crs: str) -> gpd.GeoDataFrame:
+    """
+    Add points from a GeoJSON file in the LIDAR's tile.
+
+    Args:
+        input_points (str): Path to the input GeoJSON file with 3D points.
+        input_las (str): Path to the LIDAR `.las/.laz` file.
+        crs (str): CRS of the data, e.g., 'EPSG:2154'.
+
+    Return:
+        gpd.GeoDataFrame: Points 2d with "Z" value
+    """
+    # Compute the bounding box of the LIDAR tile
+    tile_bbox = get_tile_bbox(input_las)
+
+    # Read the input GeoJSON with 3D points
+    points_gdf = gpd.read_file(input_points)
+
+    # Ensure the CRS matches
+    if crs:
+        points_gdf = points_gdf.to_crs(crs)
+
+    # Create a polygon from the bounding box
+    bbox_polygon = box(*tile_bbox)
+
+    # Clip the points to the bounding box
+    clipped_points = points_gdf[points_gdf.intersects(bbox_polygon)].copy()
+
+    return clipped_points
+
+
+def add_points_to_las(
+    input_points_with_z: gpd.GeoDataFrame, input_las: str, output_las: str, virtual_points_classes=66
+):
+    """Add points (3D points in LAZ format) by LIDAR tiles (tiling file)
+
+    Args:
+        input_points_with_z(gpd.GeoDataFrame): geometry columns (2D points) as encoded to WKT.
+        input_las (str): Path to the LIDAR tiles (LAZ).
+        output_las (str): Path to save the updated LIDAR file (LAS/LAZ format).
+        virtual_points_classes (int): The classification value to assign to those virtual points (default: 66).
+    """
+    # Check if input points are empty
+    if input_points_with_z.empty:
+        raise ValueError("No points to add. The input GeoDataFrame is empty.")
+
+    # Extract XYZ coordinates and additional attribute (classification)
+    x_coords = input_points_with_z.geometry.x
+    y_coords = input_points_with_z.geometry.y
+    z_coords = input_points_with_z.RecupZ
+    classes = virtual_points_classes * np.ones(len(input_points_with_z.index))
+
+    # Read the existing LIDAR file
+    with laspy.open(input_las, mode="r") as las:
+        las_data = las.read()
+        header = las.header
+
+        # Create a new header if the original header is missing or invalid
+        if header is None:
+            header = laspy.LasHeader(point_format=6, version="1.4")  # Example format and version
+
+        # Append the clipped points to the existing LIDAR data
+        new_x = np.concatenate([las_data.x, x_coords])
+        new_y = np.concatenate([las_data.y, y_coords])
+        new_z = np.concatenate([las_data.z, z_coords])
+        new_classes = np.concatenate([las_data.classification, classes])
+
+        # Create a new LAS file with updated data
+        updated_las = laspy.LasData(header)
+        updated_las.x = new_x
+        updated_las.y = new_y
+        updated_las.z = new_z
+        updated_las.classification = new_classes
+
+        # Write the updated LAS file
+        with laspy.open(output_las, mode="w", header=header, do_compress=True) as writer:
+            writer.write_points(updated_las.points)

{ign_pdal_tools-1.7.4 → ign_pdal_tools-1.7.6}/pdaltools/las_info.py

@@ -6,6 +6,8 @@ from typing import Dict, Tuple
 import osgeo.osr as osr
 import pdal
 
+from pdaltools.pcd_info import infer_tile_origin
+
 osr.UseExceptions()
 
 
@@ -17,13 +19,37 @@ def las_info_metadata(filename: str):
     return metadata
 
 
-def get_bounds_from_header_info(metadata):
+def get_bounds_from_header_info(metadata: Dict) -> Tuple[float, float, float, float]:
+    """Get bounds from metadata that has been extracted previously from the header of a las file
+
+    Args:
+        metadata (str): Dictonary containing metadata from a las file (as extracted with pipeline.quickinfo)
+
+    Returns:
+        Tuple[float, float, float, float]: minx, maxx, miny, maxy
+    """
     bounds = metadata["bounds"]
     minx, maxx, miny, maxy = bounds["minx"], bounds["maxx"], bounds["miny"], bounds["maxy"]
 
     return minx, maxx, miny, maxy
 
 
+def get_tile_origin_using_header_info(filename: str, tile_width: int = 1000) -> Tuple[int, int]:
+    """ "Get las file theoretical origin (xmin, ymax) for a data that originates from a square tesselation/tiling
+    using the tesselation tile width only, directly from its path
+    Args:
+        filename (str): path to the las file
+        tile_width (int, optional): Tesselation tile width (in meters). Defaults to 1000.
+
+    Returns:
+        Tuple[int, int]: (origin_x, origin_y) tile origin coordinates = theoretical (xmin, ymax)
+    """
+    metadata = las_info_metadata(filename)
+    minx, maxx, miny, maxy = get_bounds_from_header_info(metadata)
+
+    return infer_tile_origin(minx, maxx, miny, maxy, tile_width)
+
+
 def get_epsg_from_header_info(metadata):
     if "srs" not in metadata.keys():
         raise RuntimeError("EPSG could not be inferred from metadata: No 'srs' key in metadata.")

{ign_pdal_tools-1.7.4 → ign_pdal_tools-1.7.6}/pdaltools/las_remove_dimensions.py

@@ -1,5 +1,4 @@
 import argparse
-import os
 
 import pdal
 from pdaltools.las_info import get_writer_parameters_from_reader_metadata

ign_pdal_tools-1.7.6/pdaltools/pcd_info.py

@@ -0,0 +1,76 @@
+"""Tools to get information from a point cloud (points as a numpy array)"""
+
+from typing import Tuple
+
+import numpy as np
+
+
+def infer_tile_origin(minx: float, maxx: float, miny: float, maxy: float, tile_width: int) -> Tuple[int, int]:
+    """Get point cloud theoretical origin (xmin, ymax) for a data that originates from a square tesselation/tiling
+    using the tesselation tile width only, based on the min/max values
+
+    Edge values are supposed to be included in the tile
+
+    Args:
+        minx (float): point cloud min x value
+        maxx (float): point cloud max x value
+        miny (float): point cloud min y value
+        maxy (float): point cloud max y value
+        tile_width (int): tile width in meters
+
+    Raises:
+        ValueError: In case the min and max values do not belong to the same tile
+
+    Returns:
+        Tuple[int, int]: (origin_x, origin_y) tile origin coordinates = theoretical (xmin, ymax)
+    """
+
+    minx_tile_index = np.floor(minx / tile_width)
+    maxx_tile_index = np.floor(maxx / tile_width) if maxx % tile_width != 0 else np.floor(maxx / tile_width) - 1
+    miny_tile_index = np.ceil(miny / tile_width) if miny % tile_width != 0 else np.floor(miny / tile_width) + 1
+    maxy_tile_index = np.ceil(maxy / tile_width)
+
+    if maxx_tile_index == minx_tile_index and maxy_tile_index == miny_tile_index:
+        origin_x = minx_tile_index * tile_width
+        origin_y = maxy_tile_index * tile_width
+        return origin_x, origin_y
+    else:
+        raise ValueError(
+            f"Min values (x={minx} and y={miny}) do not belong to the same theoretical tile as"
+            f"max values (x={maxx} and y={maxy})."
+        )
+
+
+def get_pointcloud_origin_from_tile_width(
+    points: np.ndarray, tile_width: int = 1000, buffer_size: float = 0
+) -> Tuple[int, int]:
+    """Get point cloud theoretical origin (xmin, ymax) for a data that originates from a square tesselation/tiling
+    using the tesselation tile width only, based on the point cloud as a np.ndarray
+
+    Edge values are supposed to be included in the tile
+
+    In case buffer_size is provided, the origin will be calculated on an "original" tile, supposing that
+    there has been a buffer added to the input tile.
+
+    Args:
+        points (np.ndarray): numpy array with the tile points
+        tile_width (int, optional): Edge size of the square used for tiling. Defaults to 1000.
+        buffer_size (float, optional): Optional buffer around the tile. Defaults to 0.
+
+    Raises:
+        ValueError: Raise an error when the initial tile is smaller than the buffer (in this case, we cannot find the
+        origin (it can be either in the buffer or in the tile))
+
+    Returns:
+        Tuple[int, int]: (origin_x, origin_y) origin coordinates
+    """
+    # Extract coordinates xmin, xmax, ymin and ymax of the original tile without buffer
+    minx, miny = np.min(points[:, :2], axis=0) + buffer_size
+    maxx, maxy = np.max(points[:, :2], axis=0) - buffer_size
+
+    if maxx < minx or maxy < miny:
+        raise ValueError(
+            "Cannot find pointcloud origin as the pointcloud width or height is smaller than buffer width"
+        )
+
+    return infer_tile_origin(minx, maxx, miny, maxy, tile_width)

{ign_pdal_tools-1.7.4 → ign_pdal_tools-1.7.6}/pdaltools/standardize_format.py

@@ -19,6 +19,7 @@ import pdal
 
 from pdaltools.unlock_file import copy_and_hack_decorator
 
+# Standard parameters to pass to the pdal writer
 STANDARD_PARAMETERS = dict(
     major_version="1",
     minor_version="4",  # Laz format version (pdal always write in 1.x format)
@@ -33,7 +34,6 @@ STANDARD_PARAMETERS = dict(
     offset_z=0,
     dataformat_id=6,  # No color by default
     a_srs="EPSG:2154",
-    class_points_removed=[],  # remove points from class
 )
 
 

ign_pdal_tools-1.7.6/test/test_add_points_in_las.py

@@ -0,0 +1,72 @@
+import pytest
+import os
+import random as rand
+import tempfile
+import math
+
+import pdal
+
+import geopandas as gpd
+from shapely.geometry import Point
+
+from pdaltools import add_points_in_las
+
+numeric_precision = 4
+
+TEST_PATH = os.path.dirname(os.path.abspath(__file__))
+INPUT_DIR = os.path.join(TEST_PATH, "data")
+INPUT_LAS = os.path.join(INPUT_DIR, "test_data_77055_627760_LA93_IGN69.laz")
+
+Xmin = 770575
+Ymin = 6277575
+Zmin = 20
+Size = 20
+
+def distance3D(pt_geo, pt_las):
+    return round(
+        math.sqrt((pt_geo.x - pt_las['X']) ** 2 + (pt_geo.y - pt_las['Y']) ** 2 + (pt_geo.z - pt_las['Z']) ** 2),
+        numeric_precision,
+    )
+
+def add_point_in_las(pt_geo, inside_las):
+    geom = [pt_geo]
+    series = gpd.GeoSeries(geom, crs="2154")
+
+    with tempfile.NamedTemporaryFile(suffix="_geom_tmp.las") as out_las_file:
+        with tempfile.NamedTemporaryFile(suffix="_geom_tmp.geojson") as geom_file:
+            series.to_file(geom_file.name)
+
+            added_dimensions = {"Classification":64, "Intensity":1.}
+            add_points_in_las.add_points_in_las(INPUT_LAS, geom_file.name, out_las_file.name, inside_las, added_dimensions)
+
+            pipeline = pdal.Pipeline() | pdal.Reader.las(out_las_file.name)
+            pipeline.execute()
+            points_las = pipeline.arrays[0]
+            points_las = [e for e in points_las if all(e[val] == added_dimensions[val] for val in added_dimensions)]
+            return points_las
+
+def test_add_point_inside_las():
+    X = Xmin + rand.uniform(0, 1) * Size
+    Y = Ymin + rand.uniform(0, 1) * Size
+    Z = Zmin + rand.uniform(0, 1) * 10
+    pt_geo = Point(X, Y, Z)
+    points_las = add_point_in_las(pt_geo=pt_geo, inside_las=True)
+    assert len(points_las) == 1
+    assert distance3D(pt_geo, points_las[0]) < 1 / numeric_precision
+
+def test_add_point_outside_las_no_control():
+    X = Xmin + rand.uniform(2, 3) * Size
+    Y = Ymin + rand.uniform(0, 1) * Size
+    Z = Zmin + rand.uniform(0, 1) * 10
+    pt_geo = Point(X, Y, Z)
+    points_las = add_point_in_las(pt_geo=pt_geo, inside_las=False)
+    assert len(points_las) == 1
+    assert distance3D(pt_geo, points_las[0]) < 1 / numeric_precision
+
+def test_add_point_outside_las_with_control():
+    X = Xmin + rand.uniform(2, 3) * Size
+    Y = Ymin + rand.uniform(2, 3) * Size
+    Z = Zmin + rand.uniform(0, 1) * 10
+    pt_geo = Point(X, Y, Z)
+    points_las = add_point_in_las(pt_geo=pt_geo, inside_las=True)
+    assert len(points_las) == 0

ign_pdal_tools-1.7.6/test/test_add_points_in_pointcloud.py

@@ -0,0 +1,82 @@
+import os
+from pathlib import Path
+
+import pdal
+
+from pdaltools import add_points_in_pointcloud
+
+TEST_PATH = os.path.dirname(os.path.abspath(__file__))
+TMP_PATH = os.path.join(TEST_PATH, "data/output")
+DATA_LIDAR_PATH = os.path.join(TEST_PATH, "data/decimated_laz")
+DATA_POINTS_PATH = os.path.join(TEST_PATH, "data/points_3d")
+
+INPUT_FILE = os.path.join(DATA_LIDAR_PATH, "test_semis_2023_0292_6833_LA93_IGN69.laz")
+INPUT_POINTS = os.path.join(DATA_POINTS_PATH, "Points_virtuels_0292_6833.geojson")
+OUTPUT_FILE = os.path.join(TMP_PATH, "test_semis_2023_0292_6833_LA93_IGN69.laz")
+
+INPUT_FILE_SMALL = os.path.join(DATA_LIDAR_PATH, "test_semis_2021_0382_6565_LA93_IGN69.laz")
+INPUT_POINTS_SMALL = os.path.join(DATA_POINTS_PATH, "Points_virtuels_0382_6565.geojson")
+OUTPUT_FILE_SMALL = os.path.join(TMP_PATH, "test_semis_2021_0382_6565_LA93_IGN69.laz")
+
+
+def setup_module(module):
+    os.makedirs("test/data/output", exist_ok=True)
+
+
+def test_get_tile_bbox():
+    bbox = add_points_in_pointcloud.get_tile_bbox(INPUT_FILE, 1000)
+    assert bbox == (292000.0, 6832000.0, 293000.0, 6833000.0)  # check the bbox from LIDAR tile
+
+
+def test_clip_3d_points_to_tile():
+    points_clipped = add_points_in_pointcloud.clip_3d_points_to_tile(INPUT_POINTS, INPUT_FILE, "EPSG:2154")
+    assert len(points_clipped) == 678  # chech the entity's number of points
+
+
+def test_add_line_to_lidar():
+    points_clipped = add_points_in_pointcloud.clip_3d_points_to_tile(INPUT_POINTS, INPUT_FILE, "EPSG:2154")
+
+    add_points_in_pointcloud.add_points_to_las(points_clipped, INPUT_FILE, OUTPUT_FILE, 68)
+    assert Path(OUTPUT_FILE).exists()  # check output exists
+
+    # Filter pointcloud by classes
+    pipeline = (
+        pdal.Reader.las(filename=OUTPUT_FILE, nosrs=True)
+        | pdal.Filter.range(
+            limits="Classification[68:68]",
+        )
+        | pdal.Filter.stats()
+    )
+    pipeline.execute()
+    metadata = pipeline.metadata
+    # Count the pointcloud's number from classe "68"
+    point_count = metadata["metadata"]["filters.stats"]["statistic"][0]["count"]
+    assert point_count == 678
+
+
+def test_get_tile_bbox_small():
+    # Tile is not complete (NOT 1km * 1km)
+    bbox = add_points_in_pointcloud.get_tile_bbox(INPUT_FILE_SMALL, 1000)
+    assert bbox == (382000.0, 6564000.0, 383000.0, 6565000.0)  # return BBOX 1km * 1km
+
+
+def test_add_line_to_lidar_small():
+    # Tile is not complete (NOT 1km * 1km)
+    points_clipped = add_points_in_pointcloud.clip_3d_points_to_tile(INPUT_POINTS_SMALL, INPUT_FILE_SMALL, "EPSG:2154")
+
+    add_points_in_pointcloud.add_points_to_las(points_clipped, INPUT_FILE_SMALL, OUTPUT_FILE_SMALL, 68)
+    assert Path(OUTPUT_FILE).exists()  # check output exists
+
+    # Filter pointcloud by classes
+    pipeline = (
+        pdal.Reader.las(filename=OUTPUT_FILE_SMALL, nosrs=True)
+        | pdal.Filter.range(
+            limits="Classification[68:68]",
+        )
+        | pdal.Filter.stats()
+    )
+    pipeline.execute()
+    metadata = pipeline.metadata
+    # Count the pointcloud's number from classe "68"
+    point_count = metadata["metadata"]["filters.stats"]["statistic"][0]["count"]
+    assert point_count == 186

{ign_pdal_tools-1.7.4 → ign_pdal_tools-1.7.6}/test/test_las_info.py

@@ -40,6 +40,11 @@ def test_get_bounds_from_quickinfo_metadata():
     assert bounds == (INPUT_MINS[0], INPUT_MAXS[0], INPUT_MINS[1], INPUT_MAXS[1])
 
 
+def test_get_tile_origin_using_header_info():
+    origin_x, origin_y = las_info.get_tile_origin_using_header_info(INPUT_FILE, tile_width=TILE_WIDTH)
+    assert (origin_x, origin_y) == (COORD_X * TILE_COORD_SCALE, COORD_Y * TILE_COORD_SCALE)
+
+
 def test_get_epsg_from_quickinfo_metadata_ok():
     metadata = las_info.las_info_metadata(INPUT_FILE)
     assert las_info.get_epsg_from_header_info(metadata) == "2154"

ign_pdal_tools-1.7.6/test/test_pcd_info.py

@@ -0,0 +1,87 @@
+import os
+
+import laspy
+import numpy as np
+import pytest
+
+from pdaltools import pcd_info
+
+TEST_PATH = os.path.dirname(os.path.abspath(__file__))
+TMP_PATH = os.path.join(TEST_PATH, "tmp")
+DATA_PATH = os.path.join(TEST_PATH, "data")
+
+
+@pytest.mark.parametrize(
+    "minx, maxx, miny, maxy, expected_origin",
+    [
+        (501, 999, 501, 999, (0, 1000)),  # points in the second half
+        (1, 400, 1, 400, (0, 1000)),  # points in the first half
+        (500, 1000, 500, 500, (0, 1000)),  # xmax on edge and xmin in the tile
+        (0, 20, 500, 500, (0, 1000)),  # xmin on edge and xmax in the tile
+        (950, 1000, 500, 500, (0, 1000)),  # xmax on edge and xmin in the tile
+        (500, 500, 980, 1000, (0, 1000)),  # ymax on edge and ymin in the tile
+        (500, 500, 0, 20, (0, 1000)),  # ymin on edge and ymax in the tile
+        (0, 1000, 0, 1000, (0, 1000)),  # points at each corner
+    ],
+)
+def test_infer_tile_origin_edge_cases(minx, maxx, miny, maxy, expected_origin):
+    origin_x, origin_y = pcd_info.infer_tile_origin(minx, maxx, miny, maxy, tile_width=1000)
+    assert (origin_x, origin_y) == expected_origin
+
+
+@pytest.mark.parametrize(
+    "minx, maxx, miny, maxy",
+    [
+        (0, 20, -1, 20),  # ymin slightly outside the tile
+        (-1, 20, 0, 20),  # xmin slightly outside the tile
+        (280, 1000, 980, 1001),  # ymax slightly outside the tile
+        (980, 1001, 980, 1000),  # xmax slightly outside the tile
+        (-1, 1000, 0, 1000),  # xmax on edge but xmin outside the tile
+        (0, 1000, 0, 1001),  # ymin on edge but ymax outside the tile
+        (0, 1001, 0, 1000),  # xmin on edge but xmax outside the tile
+        (0, 1000, -1, 1000),  # ymax on edge but ymin outside the tile
+    ],
+)
+def test_infer_tile_origin_edge_cases_fail(minx, maxx, miny, maxy):
+    with pytest.raises(ValueError):
+        pcd_info.infer_tile_origin(minx, maxx, miny, maxy, tile_width=1000)
+
+
+@pytest.mark.parametrize(
+    "input_points",
+    [
+        (np.array([[0, -1, 0], [20, 20, 0]])),  # ymin slightly outside the tile
+        (np.array([[-1, 0, 0], [20, 20, 0]])),  # xmin slightly outside the tile
+        (np.array([[980, 980, 0], [1000, 1001, 0]])),  # ymax slightly outside the tile
+        (np.array([[980, 980, 0], [1001, 1000, 0]])),  # xmax slightly outside the tile
+        (np.array([[-1, 0, 0], [1000, 1000, 0]])),  # xmax on edge but xmin outside the tile
+        (np.array([[0, 0, 0], [1000, 1001, 0]])),  # ymin on edge but ymax outside the tile
+        (np.array([[0, 0, 0], [1001, 1000, 0]])),  # xmin on edge but xmax outside the tile
+        (np.array([[0, -1, 0], [1000, 1000, 0]])),  # ymax on edge but ymin outside the tile
+    ],
+)
+def test_get_pointcloud_origin_edge_cases_fail(input_points):
+    with pytest.raises(ValueError):
+        pcd_info.get_pointcloud_origin_from_tile_width(points=input_points, tile_width=1000)
+
+
+def test_get_pointcloud_origin_on_file():
+    input_las = os.path.join(DATA_PATH, "test_data_77055_627760_LA93_IGN69.laz")
+    expected_origin = (770550, 6277600)
+    LAS = laspy.read(input_las)
+    INPUT_POINTS = np.vstack((LAS.x, LAS.y, LAS.z)).transpose()
+
+    origin_x, origin_y = pcd_info.get_pointcloud_origin_from_tile_width(points=INPUT_POINTS, tile_width=50)
+    assert (origin_x, origin_y) == expected_origin
+    origin_x_2, origin_y_2 = pcd_info.get_pointcloud_origin_from_tile_width(
+        points=INPUT_POINTS, tile_width=10, buffer_size=20
+    )
+    assert (origin_x_2, origin_y_2) == (expected_origin[0] + 20, expected_origin[1] - 20)
+
+
+def test_get_pointcloud_origin_fail_on_buffersize():
+    with pytest.raises(ValueError):
+        # Case when buffer size is bigger than the tile extremities (case not handled)
+        points = np.array([[0, 0, 0], [20, 20, 0]])
+        buffer_size = 30
+        pcd_info.get_pointcloud_origin_from_tile_width(points=points, tile_width=1000, buffer_size=buffer_size)

ign_pdal_tools-1.7.4/pdaltools/pcd_info.py

@@ -1,46 +0,0 @@
-"""Tools to get information from a point cloud (points as a numpy array)"""
-
-from typing import Tuple
-
-import numpy as np
-
-
-def get_pointcloud_origin_from_tile_width(
-    points: np.ndarray, tile_width: int = 1000, buffer_size: float = 0
-) -> Tuple[int, int]:
-    """Get point cloud theoretical origin (xmin, ymax) for a data that originates from a square tesselation/tiling
-    using the tesselation tile width only.
-
-    Edge values are supposed to be included in the tile
-
-
-    Args:
-        points (np.ndarray): numpy array with the tile points
-        tile_width (int, optional): Edge size of the square used for tiling. Defaults to 1000.
-        buffer_size (float, optional): Optional buffer around the tile. Defaults to 0.
-
-    Raises:
-        ValueError: Raise an error when the bounding box of the tile is not included in a tile
-
-    Returns:
-        Tuple[int, int]: (origin_x, origin_y) origin coordinates
-    """
-    # Extract coordinates xmin, xmax, ymin and ymax of the original tile without buffer
-    x_min, y_min = np.min(points[:, :2], axis=0) + buffer_size
-    x_max, y_max = np.max(points[:, :2], axis=0) - buffer_size
-
-    # Calculate the tiles to which x, y bounds belong
-    tile_x_min = np.floor(x_min / tile_width)
-    tile_x_max = np.floor(x_max / tile_width) if x_max % tile_width != 0 else np.floor(x_max / tile_width) - 1
-    tile_y_min = np.ceil(y_min / tile_width) if y_min % tile_width != 0 else np.floor(y_min / tile_width) + 1
-    tile_y_max = np.ceil(y_max / tile_width)
-
-    if not (tile_x_max - tile_x_min) and not (tile_y_max - tile_y_min):
-        origin_x = tile_x_min * tile_width
-        origin_y = tile_y_max * tile_width
-        return origin_x, origin_y
-    else:
-        raise ValueError(
-            f"Min values (x={x_min} and y={y_min}) do not belong to the same theoretical tile as"
-            f"max values (x={x_max} and y={y_max})."
-        )

ign_pdal_tools-1.7.4/test/test_pcd_info.py

@@ -1,61 +0,0 @@
-import os
-
-import laspy
-import numpy as np
-import pytest
-
-from pdaltools import pcd_info
-
-TEST_PATH = os.path.dirname(os.path.abspath(__file__))
-TMP_PATH = os.path.join(TEST_PATH, "tmp")
-DATA_PATH = os.path.join(TEST_PATH, "data")
-
-
-@pytest.mark.parametrize(
-    "input_points, expected_origin",
-    [
-        (np.array([[501, 501, 0], [999, 999, 0]]), (0, 1000)),  # points in the second half
-        (np.array([[1, 1, 0], [400, 400, 0]]), (0, 1000)),  # points in the frist half
-        (np.array([[500, 500, 0], [1000, 500, 0]]), (0, 1000)),  # xmax on edge and xmin in the tile
-        (np.array([[0, 500, 0], [20, 500, 0]]), (0, 1000)),  # xmin on edge and xmax in the tile
-        (np.array([[950, 500, 0], [1000, 500, 0]]), (0, 1000)),  # xmax on edge and xmin in the tile
-        (np.array([[500, 980, 0], [500, 1000, 0]]), (0, 1000)),  # ymax on edge and ymin in the tile
-        (np.array([[500, 0, 0], [500, 20, 0]]), (0, 1000)),  # ymin on edge and ymax in the tile
-        (np.array([[0, 0, 0], [1000, 1000, 0]]), (0, 1000)),  # points at each corner
-    ],
-)
-def test_get_pointcloud_origin_edge_cases(input_points, expected_origin):
-    origin_x, origin_y = pcd_info.get_pointcloud_origin_from_tile_width(points=input_points, tile_width=1000)
-    assert (origin_x, origin_y) == expected_origin
-
-
-@pytest.mark.parametrize(
-    "input_points",
-    [
-        (np.array([[0, -1, 0], [20, 20, 0]])),  # ymin slightly outside the tile
-        (np.array([[-1, 0, 0], [20, 20, 0]])),  # xmin slightly outside the tile
-        (np.array([[980, 980, 0], [1000, 1001, 0]])),  # ymax slightly outside the tile
-        (np.array([[980, 980, 0], [1001, 1000, 0]])),  # xmax slightly outside the tile
-        (np.array([[-1, 0, 0], [1000, 1000, 0]])),  # xmax on edge but xmin outside the tile
-        (np.array([[0, 0, 0], [1000, 1001, 0]])),  # ymin on edge but ymax outside the tile
-        (np.array([[0, 0, 0], [1001, 1000, 0]])),  # xmin on edge but xmax outside the tile
-        (np.array([[0, -1, 0], [1000, 1000, 0]])),  # ymax on edge but ymin outside the tile
-    ],
-)
-def test_get_pointcloud_origin_edge_cases_fail(input_points):
-    with pytest.raises(ValueError):
-        pcd_info.get_pointcloud_origin_from_tile_width(points=input_points, tile_width=1000)
-
-
-def test_get_pointcloud_origin_on_file():
-    input_las = os.path.join(DATA_PATH, "test_data_77055_627760_LA93_IGN69.laz")
-    expected_origin = (770550, 6277600)
-    LAS = laspy.read(input_las)
-    INPUT_POINTS = np.vstack((LAS.x, LAS.y, LAS.z)).transpose()
-
-    origin_x, origin_y = pcd_info.get_pointcloud_origin_from_tile_width(points=INPUT_POINTS, tile_width=50)
-    assert (origin_x, origin_y) == expected_origin
-    origin_x_2, origin_y_2 = pcd_info.get_pointcloud_origin_from_tile_width(
-        points=INPUT_POINTS, tile_width=10, buffer_size=20
-    )
-    assert (origin_x_2, origin_y_2) == (expected_origin[0] + 20, expected_origin[1] - 20)