mirror of
https://github.com/Alex38Lyon/Synthese-PSM_LARRA.git
synced 2026-09-30 07:21:55 +00:00
Update pyThtoQgis.py
This commit is contained in:
Alex38Lyon
+159
-153
@@ -242,183 +242,188 @@ def extractVertices(input_gpkg_path, output_gpkg_path):
|
|||||||
- Ajoute un attribut 'angle' correspondant à la direction locale de la ligne (en degrés)
|
- Ajoute un attribut 'angle' correspondant à la direction locale de la ligne (en degrés)
|
||||||
- Si le fichier de sortie existe, les points sont ajoutés à la fin
|
- Si le fichier de sortie existe, les points sont ajoutés à la fin
|
||||||
"""
|
"""
|
||||||
|
try :
|
||||||
|
|
||||||
log.info(f"Extract vertices from : {Colors.ENDC}{input_gpkg_path}{Colors.INFO} to {Colors.ENDC}{output_gpkg_path}")
|
log.info(f"Extract vertices from : {Colors.ENDC}{input_gpkg_path}{Colors.INFO} to {Colors.ENDC}{output_gpkg_path}")
|
||||||
|
|
||||||
# -------------------------------------------------
|
# -------------------------------------------------
|
||||||
# OPEN INPUT
|
# OPEN INPUT
|
||||||
# -------------------------------------------------
|
# -------------------------------------------------
|
||||||
ds_in = ogr.Open(input_gpkg_path)
|
ds_in = ogr.Open(input_gpkg_path)
|
||||||
if ds_in is None:
|
if ds_in is None:
|
||||||
log.error(f"Extract vertices, cannot open file : {Colors.ENDC}{input_gpkg_path}")
|
log.error(f"Extract vertices, cannot open file : {Colors.ENDC}{input_gpkg_path}")
|
||||||
globalDat.errorCount += 1
|
|
||||||
return
|
|
||||||
|
|
||||||
layer_in = ds_in.GetLayer()
|
|
||||||
in_defn = layer_in.GetLayerDefn()
|
|
||||||
srs = layer_in.GetSpatialRef()
|
|
||||||
|
|
||||||
geom_type = layer_in.GetGeomType()
|
|
||||||
|
|
||||||
allowed_types = {
|
|
||||||
0,
|
|
||||||
ogr.wkbLineString,
|
|
||||||
ogr.wkbMultiLineString,
|
|
||||||
ogr.wkbLineString25D,
|
|
||||||
ogr.wkbMultiLineString25D,
|
|
||||||
ogr.wkbLineStringM,
|
|
||||||
ogr.wkbMultiLineStringM,
|
|
||||||
ogr.wkbLineStringZM,
|
|
||||||
ogr.wkbMultiLineStringZM,
|
|
||||||
}
|
|
||||||
|
|
||||||
if geom_type not in allowed_types:
|
|
||||||
log.error(f"Extract vertices, layer must be LineString type with M support and not : {Colors.ENDC}{geom_type}.")
|
|
||||||
globalDat.errorCount += 1
|
|
||||||
return
|
|
||||||
|
|
||||||
# -------------------------------------------------
|
|
||||||
# CREATE OR OPEN OUTPUT
|
|
||||||
# -------------------------------------------------
|
|
||||||
driver = ogr.GetDriverByName("GPKG")
|
|
||||||
|
|
||||||
if os.path.exists(output_gpkg_path):
|
|
||||||
ds_out = ogr.Open(output_gpkg_path, update=1)
|
|
||||||
if ds_out is None:
|
|
||||||
log.error(f"Extract vertices, cannot open file : {Colors.ENDC}{output_gpkg_path}{Colors.ERROR} in update mode.")
|
|
||||||
globalDat.errorCount += 1
|
globalDat.errorCount += 1
|
||||||
return
|
return
|
||||||
|
|
||||||
|
layer_in = ds_in.GetLayer()
|
||||||
|
in_defn = layer_in.GetLayerDefn()
|
||||||
|
srs = layer_in.GetSpatialRef()
|
||||||
|
|
||||||
|
geom_type = layer_in.GetGeomType()
|
||||||
|
|
||||||
|
allowed_types = {
|
||||||
|
0,
|
||||||
|
ogr.wkbLineString,
|
||||||
|
ogr.wkbMultiLineString,
|
||||||
|
ogr.wkbLineString25D,
|
||||||
|
ogr.wkbMultiLineString25D,
|
||||||
|
ogr.wkbLineStringM,
|
||||||
|
ogr.wkbMultiLineStringM,
|
||||||
|
ogr.wkbLineStringZM,
|
||||||
|
ogr.wkbMultiLineStringZM,
|
||||||
|
}
|
||||||
|
|
||||||
out_layer = ds_out.GetLayer()
|
if geom_type not in allowed_types:
|
||||||
out_defn = out_layer.GetLayerDefn()
|
log.error(f"Extract vertices, layer must be LineString type with M support and not : {Colors.ENDC}{geom_type}.")
|
||||||
|
globalDat.errorCount += 1
|
||||||
|
return
|
||||||
|
|
||||||
|
# -------------------------------------------------
|
||||||
|
# CREATE OR OPEN OUTPUT
|
||||||
|
# -------------------------------------------------
|
||||||
|
driver = ogr.GetDriverByName("GPKG")
|
||||||
|
|
||||||
|
if os.path.exists(output_gpkg_path):
|
||||||
|
ds_out = ogr.Open(output_gpkg_path, update=1)
|
||||||
|
if ds_out is None:
|
||||||
|
log.error(f"Extract vertices, cannot open file : {Colors.ENDC}{output_gpkg_path}{Colors.ERROR} in update mode.")
|
||||||
|
globalDat.errorCount += 1
|
||||||
|
return
|
||||||
|
|
||||||
|
out_layer = ds_out.GetLayer()
|
||||||
|
out_defn = out_layer.GetLayerDefn()
|
||||||
|
|
||||||
|
else:
|
||||||
|
ds_out = driver.CreateDataSource(output_gpkg_path)
|
||||||
|
|
||||||
|
out_layer = ds_out.CreateLayer(os.path.splitext(os.path.basename(output_gpkg_path))[0], srs=srs, geom_type=ogr.wkbPoint25D )
|
||||||
|
|
||||||
|
|
||||||
else:
|
# -------------------------------------------------
|
||||||
ds_out = driver.CreateDataSource(output_gpkg_path)
|
# COPY FIELDS (SAFE FOR EXISTING FILE)
|
||||||
|
# -------------------------------------------------
|
||||||
|
|
||||||
out_layer = ds_out.CreateLayer(os.path.splitext(os.path.basename(output_gpkg_path))[0], srs=srs, geom_type=ogr.wkbPoint25D )
|
existing_defn = out_layer.GetLayerDefn()
|
||||||
|
|
||||||
|
exclude_fields = {
|
||||||
# -------------------------------------------------
|
"fid",
|
||||||
# COPY FIELDS (SAFE FOR EXISTING FILE)
|
"vertex_index",
|
||||||
# -------------------------------------------------
|
"vertex_part",
|
||||||
|
"vertex_part_index",
|
||||||
|
"distance"
|
||||||
|
}
|
||||||
|
|
||||||
existing_defn = out_layer.GetLayerDefn()
|
for i in range(in_defn.GetFieldCount()):
|
||||||
|
|
||||||
exclude_fields = {
|
field_def = in_defn.GetFieldDefn(i)
|
||||||
"fid",
|
field_name = field_def.GetNameRef()
|
||||||
"vertex_index",
|
|
||||||
"vertex_part",
|
|
||||||
"vertex_part_index",
|
|
||||||
"distance"
|
|
||||||
}
|
|
||||||
|
|
||||||
for i in range(in_defn.GetFieldCount()):
|
if field_name.lower() in exclude_fields:
|
||||||
|
|
||||||
field_def = in_defn.GetFieldDefn(i)
|
|
||||||
field_name = field_def.GetNameRef()
|
|
||||||
|
|
||||||
if field_name.lower() in exclude_fields:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Si le champ existe déjà → on ne recrée pas
|
|
||||||
if existing_defn.GetFieldIndex(field_name) != -1:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Création sécurisée (sans Clone)
|
|
||||||
new_field = ogr.FieldDefn(field_name, field_def.GetType())
|
|
||||||
new_field.SetWidth(field_def.GetWidth())
|
|
||||||
new_field.SetPrecision(field_def.GetPrecision())
|
|
||||||
new_field.SetNullable(field_def.IsNullable())
|
|
||||||
|
|
||||||
out_layer.CreateField(new_field)
|
|
||||||
|
|
||||||
# Ajout du champ angle si absent
|
|
||||||
if existing_defn.GetFieldIndex("_TYPEFCR") == -1:
|
|
||||||
field_angle = ogr.FieldDefn("_TYPEFCR", ogr.OFTReal)
|
|
||||||
out_layer.CreateField(field_angle)
|
|
||||||
|
|
||||||
out_defn = out_layer.GetLayerDefn()
|
|
||||||
|
|
||||||
|
|
||||||
# -------------------------------------------------
|
|
||||||
# PROCESS
|
|
||||||
# -------------------------------------------------
|
|
||||||
layer_in.ResetReading()
|
|
||||||
|
|
||||||
with alive_bar(len(layer_in), title=f"{Colors.YELLOW}Extract vertices {Colors.ENDC}", length=20) as bar:
|
|
||||||
|
|
||||||
for feat in layer_in:
|
|
||||||
|
|
||||||
geom = feat.GetGeometryRef()
|
|
||||||
if geom is None:
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not geom.IsValid():
|
# Si le champ existe déjà → on ne recrée pas
|
||||||
geom = geom.Buffer(0)
|
if existing_defn.GetFieldIndex(field_name) != -1:
|
||||||
|
continue
|
||||||
|
|
||||||
def process_linestring(ls):
|
# Création sécurisée (sans Clone)
|
||||||
|
new_field = ogr.FieldDefn(field_name, field_def.GetType())
|
||||||
|
new_field.SetWidth(field_def.GetWidth())
|
||||||
|
new_field.SetPrecision(field_def.GetPrecision())
|
||||||
|
new_field.SetNullable(field_def.IsNullable())
|
||||||
|
|
||||||
n = ls.GetPointCount()
|
out_layer.CreateField(new_field)
|
||||||
if n < 2:
|
|
||||||
return
|
|
||||||
|
|
||||||
for i in range(n):
|
# Ajout du champ angle si absent
|
||||||
|
if existing_defn.GetFieldIndex("_TYPEFCR") == -1:
|
||||||
|
field_angle = ogr.FieldDefn("_TYPEFCR", ogr.OFTReal)
|
||||||
|
out_layer.CreateField(field_angle)
|
||||||
|
|
||||||
x, y, z, m = ls.GetPointZM(i)
|
out_defn = out_layer.GetLayerDefn()
|
||||||
|
|
||||||
|
|
||||||
|
# -------------------------------------------------
|
||||||
|
# PROCESS
|
||||||
|
# -------------------------------------------------
|
||||||
|
layer_in.ResetReading()
|
||||||
|
|
||||||
if m != 16:
|
with alive_bar(len(layer_in), title=f"{Colors.YELLOW}Extract vertices {Colors.ENDC}", length=20) as bar:
|
||||||
continue
|
|
||||||
|
|
||||||
# calcul direction locale
|
for feat in layer_in:
|
||||||
if i == 0:
|
|
||||||
x2, y2, _, _ = ls.GetPointZM(i + 1)
|
|
||||||
dx = x2 - x
|
|
||||||
dy = y2 - y
|
|
||||||
else:
|
|
||||||
x1, y1, _, _ = ls.GetPointZM(i - 1)
|
|
||||||
dx = x - x1
|
|
||||||
dy = y - y1
|
|
||||||
|
|
||||||
angle = math.degrees(math.atan2(dy, dx))
|
geom = feat.GetGeometryRef()
|
||||||
|
if geom is None:
|
||||||
|
continue
|
||||||
|
|
||||||
pt = ogr.Geometry(ogr.wkbPoint25D)
|
if not geom.IsValid():
|
||||||
pt.AddPoint(x, y, z)
|
geom = geom.Buffer(0)
|
||||||
|
|
||||||
new_feat = ogr.Feature(out_defn)
|
def process_linestring(ls):
|
||||||
new_feat.SetGeometry(pt)
|
|
||||||
|
|
||||||
# copie attributs
|
n = ls.GetPointCount()
|
||||||
for f in range(in_defn.GetFieldCount()):
|
if n < 2:
|
||||||
new_feat.SetField(in_defn.GetFieldDefn(f).GetNameRef(), feat.GetField(f) )
|
return
|
||||||
|
|
||||||
new_feat.SetField("_TYPEFCR", angle)
|
for i in range(n):
|
||||||
|
|
||||||
type_val = feat.GetField("_TYPE")
|
|
||||||
|
|
||||||
if type_val is not None:
|
|
||||||
new_feat.SetField("_TYPE", "line_" + str(type_val))
|
|
||||||
|
|
||||||
out_layer.CreateFeature(new_feat)
|
x, y, z, m = ls.GetPointZM(i)
|
||||||
new_feat = None
|
|
||||||
|
|
||||||
geom_name = geom.GetGeometryName()
|
if m != 16:
|
||||||
|
continue
|
||||||
|
|
||||||
if geom_name == "LINESTRING":
|
# calcul direction locale
|
||||||
process_linestring(geom)
|
if i == 0:
|
||||||
|
x2, y2, _, _ = ls.GetPointZM(i + 1)
|
||||||
|
dx = x2 - x
|
||||||
|
dy = y2 - y
|
||||||
|
else:
|
||||||
|
x1, y1, _, _ = ls.GetPointZM(i - 1)
|
||||||
|
dx = x - x1
|
||||||
|
dy = y - y1
|
||||||
|
|
||||||
elif geom_name == "MULTILINESTRING":
|
angle = math.degrees(math.atan2(dy, dx))
|
||||||
for part in range(geom.GetGeometryCount()):
|
|
||||||
process_linestring(geom.GetGeometryRef(part))
|
|
||||||
|
|
||||||
bar()
|
pt = ogr.Geometry(ogr.wkbPoint25D)
|
||||||
|
pt.AddPoint(x, y, z)
|
||||||
|
|
||||||
# -------------------------------------------------
|
new_feat = ogr.Feature(out_defn)
|
||||||
# CLEANUP
|
new_feat.SetGeometry(pt)
|
||||||
# -------------------------------------------------
|
|
||||||
ds_in = None
|
|
||||||
ds_out = None
|
|
||||||
|
|
||||||
return
|
# copie attributs
|
||||||
|
for f in range(in_defn.GetFieldCount()):
|
||||||
|
new_feat.SetField(in_defn.GetFieldDefn(f).GetNameRef(), feat.GetField(f) )
|
||||||
|
|
||||||
|
new_feat.SetField("_TYPEFCR", angle)
|
||||||
|
|
||||||
|
type_val = feat.GetField("_TYPE")
|
||||||
|
|
||||||
|
if type_val is not None:
|
||||||
|
new_feat.SetField("_TYPE", "line_" + str(type_val))
|
||||||
|
|
||||||
|
out_layer.CreateFeature(new_feat)
|
||||||
|
new_feat = None
|
||||||
|
|
||||||
|
geom_name = geom.GetGeometryName()
|
||||||
|
|
||||||
|
if geom_name == "LINESTRING":
|
||||||
|
process_linestring(geom)
|
||||||
|
|
||||||
|
elif geom_name == "MULTILINESTRING":
|
||||||
|
for part in range(geom.GetGeometryCount()):
|
||||||
|
process_linestring(geom.GetGeometryRef(part))
|
||||||
|
|
||||||
|
bar()
|
||||||
|
|
||||||
|
# -------------------------------------------------
|
||||||
|
# CLEANUP
|
||||||
|
# -------------------------------------------------
|
||||||
|
ds_in = None
|
||||||
|
ds_out = None
|
||||||
|
|
||||||
|
return
|
||||||
|
|
||||||
|
except RuntimeError as e:
|
||||||
|
log.error(f"extractVertices, unable to validate geometry: {e}, continuing anyway.")
|
||||||
|
globalDat.errorCount += 1
|
||||||
|
|
||||||
#################################################################################################
|
#################################################################################################
|
||||||
def diagnostic(file_path):
|
def diagnostic(file_path):
|
||||||
@@ -531,17 +536,18 @@ def diagnostic(file_path):
|
|||||||
return invalid
|
return invalid
|
||||||
|
|
||||||
except RuntimeError as e:
|
except RuntimeError as e:
|
||||||
log.warning(f"Unable to validate geometry: {e}, Continuing anyway.")
|
log.error(f"diagnostic, unable to validate geometry: {e}, continuing anyway.")
|
||||||
|
globalDat.errorCount += 1
|
||||||
|
|
||||||
|
|
||||||
#################################################################################################
|
#################################################################################################
|
||||||
def fix_geometry(geom, GetFID):
|
def fix_geometry(geom, GetFID):
|
||||||
|
|
||||||
if geom is None:
|
|
||||||
return None
|
|
||||||
|
|
||||||
geom = geom.Clone()
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
if geom is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
geom = geom.Clone()
|
||||||
|
|
||||||
geom.CloseRings() # ferme anneaux
|
geom.CloseRings() # ferme anneaux
|
||||||
|
|
||||||
# geom = geom.RemoveDuplicatePoints() # supprime points dupliqués
|
# geom = geom.RemoveDuplicatePoints() # supprime points dupliqués
|
||||||
|
|||||||
Reference in New Issue
Block a user