Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scriptmnx #17

Merged
merged 9 commits into from
Jul 9, 2024
Merged

Scriptmnx #17

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
729dc8f
update algo (SV3D)
alavenant Jul 9, 2024
3b5c8eb
update comment
alavenant Jul 9, 2024
db144a8
remove #
alavenant Jul 9, 2024
748a96c
remove coment code - on laisse le TODO
alavenant Jul 9, 2024
fd69215
add Changelog
alavenant Jul 9, 2024
006f34d
update build_condition
alavenant Jul 9, 2024
be17720
update changeLog
alavenant Jul 9, 2024
613d3f8
update changelog
alavenant Jul 9, 2024
50acbda
update changelog
alavenant Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 84 additions & 31 deletions pdal_ign_macro/mark_points_to_use_for_digital_models_with_new_dimension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@ def mark_points_to_use_for_digital_models_with_new_dimension(
pipeline = pdal.Pipeline() | pdal.Reader.las(input_las)

# 0 - ajout de dimensions temporaires et de sortie
added_dimensions = [dtm_dimension, dsm_dimension, "PT_VEG_DSM", "PT_ON_BRIDGE"]
added_dimensions = [
dtm_dimension,
dsm_dimension,
"PT_VEG_DSM",
"PT_ON_BRIDGE",
"PT_ON_BUILDING",
"PT_ON_VEGET",
]
pipeline |= pdal.Filter.ferry(dimensions="=>" + ", =>".join(added_dimensions))

# 1 - recherche des points max de végétation (4,5) sur une grille régulière, avec prise en
Expand All @@ -69,14 +76,44 @@ def mark_points_to_use_for_digital_models_with_new_dimension(
condition_ref=macro.build_condition("Classification", [4, 5]),
condition_out="PT_VEG_DSM=1",
)
pipeline = macro.add_radius_assign(
pipeline,
1,
False,
condition_src=macro.build_condition("Classification", [6, 17]),
condition_ref=macro.build_condition("Classification", [4, 5]),
condition_out="PT_ON_VEGET=1",
max2d_above=0, # ne pas prendre les points qui sont au dessus des points pont (condition_ref)
max2d_below=900, # prendre tous les points qui sont en dessous des points pont (condition_ref)
)
pipeline = macro.add_radius_assign(
pipeline,
1,
False,
condition_src="PT_VEG_DSM==1 && Classification==2",
condition_ref="Classification==2",
condition_ref="Classification==2 && PT_VEG_DSM==0",
condition_out="PT_VEG_DSM=0",
)
pipeline = macro.add_radius_assign(
pipeline,
1,
False,
condition_src="PT_ON_VEGET==1 && Classification==6",
condition_ref="Classification==6 && PT_ON_VEGET==0",
condition_out="PT_ON_VEGET=0",
max2d_above=0.5, # ne pas prendre les points qui sont au dessus des points pont (condition_ref)
max2d_below=0.5, # prendre tous les points qui sont en dessous des points pont (condition_ref)
)
pipeline = macro.add_radius_assign(
pipeline,
1,
False,
condition_src="PT_ON_VEGET==1 && Classification==17",
condition_ref="Classification==17 && PT_ON_VEGET==0",
condition_out="PT_ON_VEGET=0",
max2d_above=0.5, # ne pas prendre les points qui sont au dessus des points pont (condition_ref)
max2d_below=0.5, # prendre tous les points qui sont en dessous des points pont (condition_ref)
)

# selection des points de veget basse proche de la veget haute
pipeline = macro.add_radius_assign(
Expand All @@ -90,20 +127,14 @@ def mark_points_to_use_for_digital_models_with_new_dimension(

# max des points de veget (PT_VEG_DSM==1) sur une grille régulière :
# TODO: remplacer par GridDecimation une fois le correctif mergé dans PDAL
# pipeline |= pdal.Filter.GridDecimation(
# resolution=0.75, value=f"{dsm_dimension}=1", output_type="max", where="PT_VEG_DSM==1"
# )
pipeline |= pdal.Filter.grid_decimation_deprecated(
resolution=0.75, output_dimension=dsm_dimension, output_type="max", where="PT_VEG_DSM==1"
)

# 2 - sélection des points pour DTM et DSM
# 2 - sélection des points pour DTM et DSM#
alavenant marked this conversation as resolved.
Show resolved Hide resolved

# selection de points DTM (max) sur une grille régulière
# TODO: remplacer par GridDecimation une fois le correctif mergé dans PDAL
# pipeline |= pdal.Filter.GridDecimation(
# resolution=0.5, value=f"{dtm_dimension}=1", output_type="max", where="Classification==2"
# )
pipeline |= pdal.Filter.grid_decimation_deprecated(
resolution=0.5,
output_dimension=dtm_dimension,
Expand All @@ -113,21 +144,13 @@ def mark_points_to_use_for_digital_models_with_new_dimension(

# selection de points DSM (max) sur une grille régulière
# TODO: remplacer par GridDecimation une fois le correctif mergé dans PDAL
# pipeline |= pdal.Filter.GridDecimation(
# resolution=0.5,
# value=f"{dsm_dimension}=1",
# output_type="max",
# where="("
# + macro.build_condition("Classification", [6, 9, 17, 64])
# + f") || {dsm_dimension}==1",
# )
pipeline |= pdal.Filter.grid_decimation_deprecated(
resolution=0.5,
output_dimension=dsm_dimension,
output_type="max",
where="("
where="(PT_ON_VEGET==0 && ("
+ macro.build_condition("Classification", [6, 9, 17, 64])
+ f") || {dsm_dimension}==1",
+ f") || {dsm_dimension}==1)",
)

# assigne des points sol sélectionnés : les points proches de la végétation, des ponts, de l'eau, 64
Expand All @@ -137,35 +160,65 @@ def mark_points_to_use_for_digital_models_with_new_dimension(
False,
condition_src=f"{dtm_dimension}==1",
condition_ref=macro.build_condition("Classification", [4, 5, 6, 9, 17, 64]),
condition_out=f"{dsm_dimension}=0",
)
# Test proximité batiment
pipeline = macro.add_radius_assign(
pipeline,
1.25,
False,
condition_src="Classification==2 && PT_VEG_DSM==0",
condition_ref="Classification==6",
condition_out="PT_ON_BUILDING=1",
)
# BUFFER INVERSE Se mettre
pipeline = macro.add_radius_assign(
pipeline,
1,
False,
condition_src=f"Classification==2 && {dsm_dimension}==0 && PT_ON_BUILDING==1 && {dtm_dimension}==1",
condition_ref="Classification==2 && PT_ON_BUILDING==0 && PT_VEG_DSM==0",
condition_out=f"{dsm_dimension}=1",
)

# 3 - gestion des ponts
# bouche trou : on filtre les points (2,3,4,5,9) au milieu du pont en les mettant à PT_ON_BRIDGE=1

pipeline = macro.add_radius_assign(
pipeline,
1.5,
False,
condition_src=macro.build_condition("Classification", [2, 3, 4, 5, 9]),
condition_src=macro.build_condition("Classification", [2, 3, 4, 5, 6, 9]),
condition_ref="Classification==17",
condition_out="PT_ON_BRIDGE=1",
max2d_above=0, # ne pas prendre les points qui sont au dessus des points pont (condition_ref)
max2d_below=-1, # prendre tous les points qui sont en dessous des points pont (condition_ref)
max2d_above=0, # ne pas prendre les points qui sont au dessus des points pont (condition_ref)
max2d_below=900, # prendre tous les points qui sont en dessous des points pont (condition_ref)
)
pipeline = macro.add_radius_assign(
pipeline,
1.5,
1.25,
False,
# condition_ref=macro.build_condition("Classification", [2, 3, 4, 5]),
condition_src="PT_ON_BRIDGE==1",
condition_ref=macro.build_condition("Classification", [2, 3, 4, 5]),
condition_ref="PT_ON_BRIDGE==0 && ( "
+ macro.build_condition("Classification", [2, 3, 4, 5, 6, 9])
+ " )",
condition_out="PT_ON_BRIDGE=0",
max2d_above=0.5, # ne pas prendre les points qui sont au dessus des points pont (condition_ref)
max2d_below=0.5, # prendre tous les points qui sont en dessous des points pont (condition_ref)
)
# pipeline |= pdal.Filter.assign(value=[f"{dsm_dimension}=0 WHERE (PT_ON_BRIDGE==1 && NOT(Classification==17))"])
pipeline |= pdal.Filter.assign(
value=[f"{dsm_dimension}=0 WHERE PT_ON_BRIDGE==1"]
# value=["dsm_marker=0 WHERE (PT_ON_BRIDGE==1 AND ( " + macro.build_condition("Classification", [2,3,4,5,6,9]) + " ))"]
)
pipeline |= pdal.Filter.assign(value=[f"{dsm_dimension}=0 WHERE PT_ON_BRIDGE==1"])

# 4 - point pour DTM servent au DSM également
pipeline |= pdal.Filter.assign(value=[f"{dsm_dimension}=1 WHERE {dtm_dimension}==1"])

# HOMOGENEISER L UTILISATION DE PT_VEG_DSM POUR LES POINT SOL SOUS VEGET AVEC PT_ON_VEGET
pipeline |= pdal.Filter.assign(
value=[
f"{dsm_dimension}=1 WHERE ({dtm_dimension}==1 && PT_VEG_DSM==0 && PT_ON_BRIDGE==0 && PT_ON_BUILDING==0 )"
]
)
# ERREUR EN 4!###############################################################################################!
# 5 - export du nuage et des DSM
# TODO: n'ajouter que les dimensions de sortie utiles !

Expand All @@ -175,7 +228,7 @@ def mark_points_to_use_for_digital_models_with_new_dimension(
pipeline |= pdal.Writer.gdal(
gdaldriver="GTiff",
output_type="max",
resolution=2.0,
resolution=0.5,
filename=output_dtm,
where=f"{dtm_dimension}==1",
)
Expand All @@ -184,7 +237,7 @@ def mark_points_to_use_for_digital_models_with_new_dimension(
pipeline |= pdal.Writer.gdal(
gdaldriver="GTiff",
output_type="max",
resolution=2.0,
resolution=0.5,
filename=output_dsm,
where=f"{dsm_dimension}==1",
)
Expand Down