fix #61: harmonize spelling network_element => networkelement

QGEP · May 19, 2022 · cb8bc1c · cb8bc1c
1 parent 57955b3
commit cb8bc1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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,