ign-pdal-tools 1.15.7__py3-none-any.whl → 1.15.8__py3-none-any.whl

{ign_pdal_tools-1.15.7.dist-info → ign_pdal_tools-1.15.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ign-pdal-tools
-Version: 1.15.7
+Version: 1.15.8
 Summary: Library for common LAS files manipulation with PDAL
 Author-email: Guillaume Liegard <guillaume.liegard@ign.fr>
 Description-Content-Type: text/markdown

{ign_pdal_tools-1.15.7.dist-info → ign_pdal_tools-1.15.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ign_pdal_tools-1.15.7.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
-pdaltools/_version.py,sha256=kSv6LqFM8oHDPBVNwn91sQDq_5bXE71FC-ljZTU7TTA,75
+ign_pdal_tools-1.15.8.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
+pdaltools/_version.py,sha256=ka-Hq8wFue3GxbOFYtvl29usecZ_BEmqujBzCGJyZ9U,75
 pdaltools/add_points_in_pointcloud.py,sha256=lDxePBBRTKSEKC3BgrVLWUEMN8vCM4xNgsJfbIz4GRw,12988
 pdaltools/color.py,sha256=zUNN9BxpajgkisoQ_TC0wBEQqou3gKo8x1KH9EtoRnE,12495
 pdaltools/create_random_laz.py,sha256=w0P4e3-bzaiKl_osmyFdOcKODRUadU7G4ez9fLvCDrs,6028
@@ -8,7 +8,7 @@ pdaltools/las_add_buffer.py,sha256=WXUkMSRX8T-Xj5il9F_uv7uKSqwUmv5P3AUcHXQVQDE,1
 pdaltools/las_clip.py,sha256=GvEOYu8RXV68e35kU8i42GwSkbo4P9TvmS6rkrdPmFM,1034
 pdaltools/las_comparison.py,sha256=ZbWqAjDJ90r3bwzRzMY1nGbpPXMHb52AlQFn1Aoy4jA,7431
 pdaltools/las_info.py,sha256=xZlTsdLS3I9_xeqGJyOOpJNJrqF82JBhlMhtYabOuw0,9845
-pdaltools/las_merge.py,sha256=tcFVueV9X9nNEaoAl5zCduY5DETlBg63MAgP2SuKiNo,4121
+pdaltools/las_merge.py,sha256=MYv4M9WM86Vqb-icPM6hGwdSxY6YuJxhpkR1FDouzsk,5692
 pdaltools/las_remove_dimensions.py,sha256=f8imGhN6LNTuQ1GMJQRzIIV3Wab_oRPOyEnKi1CgfiM,2318
 pdaltools/las_rename_dimension.py,sha256=AWYx0Jd5YHWng-CY2yIV8iRTR_bMxhvwGz1MO5sYTWc,2889
 pdaltools/pcd_info.py,sha256=NIAH5KGikVDQLlbCcw9FuaPqe20UZvRfkHsDZd5kmZA,3210
@@ -16,7 +16,7 @@ pdaltools/replace_area_in_pointcloud.py,sha256=V8aFRSxrqJtsUufoA_5g9ysPl-Wp17_TX
 pdaltools/replace_attribute_in_las.py,sha256=MHpIizSupgWtbizteoRH8FKDE049hrAh4v_OhmRmSPU,4318
 pdaltools/standardize_format.py,sha256=-ukrz5gY0mq071fN7EXbB9ANS44IEmgpKQrrjzOnqhE,4455
 pdaltools/unlock_file.py,sha256=3BplGrcKJ7lpPj1lHTG4ODeuGDXjmeoMeSl3q2Qn2XA,1980
-ign_pdal_tools-1.15.7.dist-info/METADATA,sha256=wW1tq6XHysW_bYfWg9VXY7xo7vyHQygSrj4qyw9aSwU,6146
-ign_pdal_tools-1.15.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ign_pdal_tools-1.15.7.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
-ign_pdal_tools-1.15.7.dist-info/RECORD,,
+ign_pdal_tools-1.15.8.dist-info/METADATA,sha256=YtXPvSSqPe7WRsckKRF4hbCPaCH8TEagbz8QnMi1T8Y,6146
+ign_pdal_tools-1.15.8.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+ign_pdal_tools-1.15.8.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
+ign_pdal_tools-1.15.8.dist-info/RECORD,,

{ign_pdal_tools-1.15.7.dist-info → ign_pdal_tools-1.15.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.15.7"
+__version__ = "1.15.8"
 
 
 if __name__ == "__main__":

pdaltools/las_merge.py

@@ -6,20 +6,25 @@ import pdal
 from pdaltools.las_info import parse_filename
 
 
-def create_filenames(file: str, tile_width: int = 1000, tile_coord_scale: int = 1000):
+def create_filenames_suffixes(file: str, tile_width: int = 1000, tile_coord_scale: int = 1000):
     """Generate the name of the tiles around the input LIDAR tile
     It supposes that the file names are formatted as {prefix1}_{prefix2}_{coordx}_{coordy}_{suffix}
     with coordx and coordy having at least 4 digits
 
     For example Semis_2021_0000_1111_LA93_IGN69.las
 
+    Generates only the suffix part of the filename, for example, for file like above, it will generate:
+    _0000_1112_LA93_IGN69.las
+    _0001_1112_LA93_IGN69.las
+    ...
+
     Args:
         file(str): name of LIDAR file
         tile width (int): width of tiles in meters (usually 1000m)
         tile_coord_scale (int) : scale used in the filename to describe coordinates in meters
                 (usually 1000m)
     Returns:
-        list_input(list): List of LIDAR's name
+        list_input(list): List of LIDAR's filename suffix.
     """
 
     # Create name of LIDAR tiles who cercle the tile
@@ -27,42 +32,52 @@ def create_filenames(file: str, tile_width: int = 1000, tile_coord_scale: int =
     _prefix, coord_x, coord_y, _suffix = parse_filename(file)
     offset = int(tile_width / tile_coord_scale)
     # On left
-    _tile_hl = f"{_prefix}_{(coord_x - offset):04d}_{(coord_y + offset):04d}_{_suffix}"
-    _tile_ml = f"{_prefix}_{(coord_x - offset):04d}_{coord_y:04d}_{_suffix}"
-    _tile_bl = f"{_prefix}_{(coord_x - offset):04d}_{(coord_y - offset):04d}_{_suffix}"
+    _tile_hl = f"_{(coord_x - offset):04d}_{(coord_y + offset):04d}_{_suffix}"
+    _tile_ml = f"_{(coord_x - offset):04d}_{coord_y:04d}_{_suffix}"
+    _tile_bl = f"_{(coord_x - offset):04d}_{(coord_y - offset):04d}_{_suffix}"
     # On Right
-    _tile_hr = f"{_prefix}_{(coord_x + offset):04d}_{(coord_y + offset):04d}_{_suffix}"
-    _tile_mr = f"{_prefix}_{(coord_x + offset):04d}_{coord_y:04d}_{_suffix}"
-    _tile_br = f"{_prefix}_{(coord_x + offset):04d}_{(coord_y - offset):04d}_{_suffix}"
+    _tile_hr = f"_{(coord_x + offset):04d}_{(coord_y + offset):04d}_{_suffix}"
+    _tile_mr = f"_{(coord_x + offset):04d}_{coord_y:04d}_{_suffix}"
+    _tile_br = f"_{(coord_x + offset):04d}_{(coord_y - offset):04d}_{_suffix}"
     # Above
-    _tile_a = f"{_prefix}_{coord_x:04d}_{(coord_y + offset):04d}_{_suffix}"
+    _tile_a = f"_{coord_x:04d}_{(coord_y + offset):04d}_{_suffix}"
     # Below
-    _tile_b = f"{_prefix}_{coord_x:04d}_{(coord_y - offset):04d}_{_suffix}"
+    _tile_b = f"_{coord_x:04d}_{(coord_y - offset):04d}_{_suffix}"
     # Return the severals tile's names
     return _tile_hl, _tile_ml, _tile_bl, _tile_a, _tile_b, _tile_hr, _tile_mr, _tile_br
 
 
-def check_tiles_exist(list_las: list):
-    """Check if pointclouds exist
+def match_suffix_with_filenames(suffix_list: list, all_files: list, las_dir: str):
+    """Match suffix list with real filenames
     Args:
-        list_las (list): Filenames of the tiles around the LIDAR tile
+        suffix_list (list): List of suffix patterns to match
+        all_files (list): List of all files in las_dir
+        las_dir (str): Directory of pointclouds
 
     Returns:
-        li(List): Pruned list of filenames with only existing files
+        las_list(List): List of matched files
     """
-    li = []
-    for i in list_las:
-        if not os.path.exists(i):
-            logging.info(f"NOK : {i}")
-            pass
+    las_list = []
+    for suffix in suffix_list:
+        matches = [filename for filename in all_files if filename.endswith(suffix)]
+        if len(matches) == 0:
+            logging.info(f"NOK : {suffix}")
         else:
-            li.append(i)
-    return li
+            # in case of multiple matches, select the most recent year (ex: Semis_2021_ before Semis_2020_ )
+            matches.sort(reverse=True)
+            selected = matches[0]
+            if len(matches) > 1:
+                logging.warning(f"Multiple matches for {suffix} : {matches} ; taking {selected}")
 
+            # Append full path
+            las_list.append(os.path.join(las_dir, selected))
+    return las_list
 
-def create_list(las_dir, input_file, tile_width=1000, tile_coord_scale=1000):
+
+def create_tiles_list(all_files, las_dir, input_file, tile_width=1000, tile_coord_scale=1000):
     """Return the paths of 8 tiles around the tile + the input tile
     Args:
+        all_files (list): list of all files in las_dir
         las_dir (str): directory of pointclouds
         input_file (str): path to queried LIDAR tile
         tile_width (int): Width of a tile(in the reference unit: 1m)
@@ -70,19 +85,39 @@ def create_list(las_dir, input_file, tile_width=1000, tile_coord_scale=1000):
         1000 * 1m (with 1m being the reference)
 
     Returns:
-        list_files(li): list of tiles
+        list_files: list of tiles
     """
 
-    # Return list 8 tiles around the tile
-    list_input = create_filenames(os.path.basename(input_file), tile_width, tile_coord_scale)
-    # List pointclouds
-    li = [os.path.join(las_dir, e) for e in list_input]
-    # Keep only existing files
-    li = check_tiles_exist(li)
+    # Return list 8 tiles around the tile, but only the suffix part of the name.
+    suffix_list = create_filenames_suffixes(os.path.basename(input_file), tile_width, tile_coord_scale)
+
+    # Match suffix patterns with real files
+    list_files = match_suffix_with_filenames(suffix_list, all_files, las_dir)
+
     # Appending queried tile to list
-    li.append(input_file)
+    list_files.append(input_file)
+
+    return list_files
+
+
+def create_list(las_dir, input_file, tile_width=1000, tile_coord_scale=1000):
+    """Return the paths of 8 tiles around the tile + the input tile
+    Args:
+        las_dir (str): directory of pointclouds
+        input_file (str): path to queried LIDAR tile
+        tile_width (int): Width of a tile(in the reference unit: 1m)
+        tile_coord_scale (int): Scale used in filename to describe coordinates (usually kilometers)
+        1000 * 1m (with 1m being the reference)
+
+    Returns:
+        list_files: list of tiles
+    """
+
+    # list files on the disk
+    all_files = os.listdir(las_dir)
 
-    return li
+    # call the function with the list of files
+    return create_tiles_list(all_files, las_dir, input_file, tile_width, tile_coord_scale)
 
 
 def las_merge(las_dir, input_file, merge_file, tile_width=1000, tile_coord_scale=1000):