From cb8bc1c4ea78ff74ee3e7fe251822a9d37f72149 Mon Sep 17 00:00:00 2001 From: olivierdalang Date: Thu, 19 May 2022 14:39:15 +0200 Subject: [PATCH] fix #61: harmonize spelling network_element => networkelement --- qgepqwat2ili/qgep/export.py | 6 +++--- qgepqwat2ili/qgep/import_.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qgepqwat2ili/qgep/export.py b/qgepqwat2ili/qgep/export.py index e68843c2..cc55dd9e 100644 --- a/qgepqwat2ili/qgep/export.py +++ b/qgepqwat2ili/qgep/export.py @@ -135,7 +135,7 @@ def wastewater_structure_common(row): "zugaenglichkeit": get_vl(row.accessibility__REL), } - def wastewater_network_element_common(row): + def wastewater_networkelement_common(row): """ Returns common attributes for network_element """ @@ -485,7 +485,7 @@ def structure_part_common(row): # --- sia405_baseclass --- **base_common(row, "abwasserknoten"), # --- abwassernetzelement --- - **wastewater_network_element_common(row), + **wastewater_networkelement_common(row), # --- abwasserknoten --- # TODO : WARNING : fk_hydr_geometry is not mapped lage=ST_Force2D(row.situation_geometry), @@ -527,7 +527,7 @@ def structure_part_common(row): # --- sia405_baseclass --- **base_common(row, "haltung"), # --- abwassernetzelement --- - **wastewater_network_element_common(row), + **wastewater_networkelement_common(row), # --- haltung --- # NOT MAPPED : elevation_determination innenschutz=get_vl(row.inside_coating__REL), diff --git a/qgepqwat2ili/qgep/import_.py b/qgepqwat2ili/qgep/import_.py index 3aafcdb5..b8fbae79 100644 --- a/qgepqwat2ili/qgep/import_.py +++ b/qgepqwat2ili/qgep/import_.py @@ -154,7 +154,7 @@ def wastewater_structure_common(row): "year_of_replacement": row.ersatzjahr, } - def wastewater_network_element_common(row): + def wastewater_networkelement_common(row): """ Returns common attributes for network_element """ @@ -596,7 +596,7 @@ def structure_part_common(row): **base_common(row), **metaattribute_common(metaattribute), # --- wastewater_networkelement --- - **wastewater_network_element_common(row), + **wastewater_networkelement_common(row), # --- wastewater_node --- # fk_hydr_geometry=row.REPLACE_ME, # TODO : NOT MAPPED backflow_level=row.rueckstaukote, @@ -645,7 +645,7 @@ def structure_part_common(row): **base_common(row), **metaattribute_common(metaattribute), # --- wastewater_networkelement --- - **wastewater_network_element_common(row), + **wastewater_networkelement_common(row), # --- reach --- clear_height=row.lichte_hoehe, coefficient_of_friction=row.reibungsbeiwert,