Merge pull request #356 from teksi/2024-08-05-fix-export-flushing-nozzle

2024 08 05 fix export flushing nozzle
teksi · Aug 8, 2024 · e0159e9 · e0159e9
2 parents d3c0aca + 5e70281
commit e0159e9
Showing 1 changed file with 64 additions and 5 deletions.
diff --git a/...si_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py b/...si_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py
@@ -225,6 +225,10 @@ def _export_sia405_abwasser(self):
         self._export_benching()
         self._check_for_stop()
 
+        logger.info("Exporting TWW.flushing_nozzle -> ABWASSER.spuelstutzen")
+        self._export_flushing_nozzle()
+        self._check_for_stop()
+
     def _export_dss(self):
         logger.info(
             "Exporting TWW.waste_water_treatment_plant -> ABWASSER.abwasserreinigungsanlage"
@@ -839,7 +843,7 @@ def _export_dryweather_downspout(self):
             # diameter, obj_id
 
             # --- _bwrel_ ---
-            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
+            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, flushing_nozzle__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
 
             # --- _rel_ ---
             # fk_dataowner__REL, fk_provider__REL, fk_wastewater_structure__REL, renovation_demand__REL
@@ -878,7 +882,7 @@ def _export_access_aid(self):
             # kind, obj_id
 
             # --- _bwrel_ ---
-            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
+            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, flushing_nozzle__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
 
             # --- _rel_ ---
             # fk_dataowner__REL, fk_provider__REL, fk_wastewater_structure__REL, kind__REL, renovation_demand__REL
@@ -917,7 +921,7 @@ def _export_dryweather_flume(self):
             # material, obj_id
 
             # --- _bwrel_ ---
-            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
+            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, flushing_nozzle__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
 
             # --- _rel_ ---
             # fk_dataowner__REL, fk_provider__REL, fk_wastewater_structure__REL, material__REL, renovation_demand__REL
@@ -956,7 +960,7 @@ def _export_cover(self):
             # brand, cover_shape, diameter, fastening, level, material, obj_id, positional_accuracy, situation3d_geometry, sludge_bucket, venting
 
             # --- _bwrel_ ---
-            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id, wastewater_structure__BWREL_fk_main_cover
+            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, flushing_nozzle__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id, wastewater_structure__BWREL_fk_main_cover
 
             # --- _rel_ ---
             # cover_shape__REL, fastening__REL, fk_dataowner__REL, fk_provider__REL, fk_wastewater_structure__REL, material__REL, positional_accuracy__REL, renovation_demand__REL, sludge_bucket__REL, venting__REL
@@ -1004,7 +1008,7 @@ def _export_benching(self):
             # kind, obj_id
 
             # --- _bwrel_ ---
-            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
+            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, flushing_nozzle__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
 
             # --- _rel_ ---
             # fk_dataowner__REL, fk_provider__REL, fk_wastewater_structure__REL, kind__REL, renovation_demand__REL
@@ -1021,6 +1025,45 @@ def _export_benching(self):
         logger.info("done")
         self.abwasser_session.flush()
 
+    def _export_flushing_nozzle(self):
+        query = self.tww_session.query(self.model_classes_tww_od.flushing_nozzle)
+        if self.filtered:
+            query = query.join(
+                self.model_classes_tww_od.wastewater_structure,
+                self.model_classes_tww_od.wastewater_networkelement,
+            ).filter(
+                self.model_classes_tww_od.wastewater_networkelement.obj_id.in_(self.subset_ids)
+            )
+            # add sql statement to logger
+            statement = query.statement
+            logger.info(f" selection query = {statement}")
+        for row in query:
+            # AVAILABLE FIELDS IN TWW.flushing_nozzle
+
+            # --- structure_part ---
+            # fk_dataowner, fk_provider, fk_wastewater_structure, identifier, last_modification, remark, renovation_demand
+
+            # --- flushing_nozzle ---
+            # situation3d_geometry, obj_id
+
+            # --- _bwrel_ ---
+            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, flushing_nozzle__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
+
+            # --- _rel_ ---
+            # fk_dataowner__REL, fk_provider__REL, fk_wastewater_structure__REL, kind__REL, renovation_demand__REL
+
+            spuelstutzen = self.model_classes_interlis.spuelstutzen(
+                # FIELDS TO MAP TO ABWASSER.spuelstutzen
+                # --- bauwerksteil ---
+                **self.structure_part_common(row, "spuelstutzen"),
+                # --- spuelstutzen ---
+                lage=ST_Force2D(row.situation3d_geometry),
+            )
+            self.abwasser_session.add(spuelstutzen)
+            print(".", end="")
+        logger.info("done")
+        self.abwasser_session.flush()
+
     def _export_waste_water_treatment_plant(self):
         query = self.tww_session.query(self.model_classes_tww_od.waste_water_treatment_plant)
         if self.filtered:
@@ -2361,7 +2404,23 @@ def _export_backflow_prevention(self):
             statement = query.statement
             logger.info(f" selection query = {statement}")
         for row in query:
+            # AVAILABLE FIELDS IN TWW.backflow_prevention
+
+            # --- structure_part ---
+            # fk_dataowner, fk_provider, fk_wastewater_structure, identifier, last_modification, remark, renovation_demand
+
+            # --- backflow_prevention ---
+            # gross_costs, kind, obj_id, year_of_replacement
+
+            # --- _bwrel_ ---
+            # access_aid_kind__BWREL_obj_id, backflow_prevention__BWREL_obj_id, benching_kind__BWREL_obj_id, dryweather_flume_material__BWREL_obj_id, electric_equipment__BWREL_obj_id, electromechanical_equipment__BWREL_obj_id, solids_retention__BWREL_obj_id, flushing_nozzle__BWREL_obj_id, tank_cleaning__BWREL_obj_id, tank_emptying__BWREL_obj_id
+
+            # --- _rel_ ---
+            # fk_dataowner__REL, fk_provider__REL, fk_wastewater_structure__REL, renovation_demand__REL, fk_throttle_shut_off_unit__REL, fk_pump__REL
+
             rueckstausicherung = self.model_classes_interlis.rueckstausicherung(
+                # FIELDS TO MAP TO ABWASSER.rueckstausicherung
+                # --- bauwerksteil ---
                 **self.structure_part_common(row, "rueckstausicherung"),
                 # --- backflow_prevention ---
                 bruttokosten=row.gross_costs,