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

2024 08 05 fix export flushing nozzle #356

Merged
merged 4 commits into from
Aug 8, 2024
Merged

2024 08 05 fix export flushing nozzle #356

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48371e7
Add flushing_nozzle on _export_sia405_abwasser
sjib Aug 5, 2024
3c3f950
add def _export_flushing_nozzle(self):
sjib Aug 5, 2024
155b242
update backflow_prevention comments
sjib Aug 5, 2024
5e70281
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 5, 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
69 changes: 64 additions & 5 deletions ...si_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -838,7 +842,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
Expand Down Expand Up @@ -877,7 +881,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
Expand Down Expand Up @@ -916,7 +920,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
Expand Down Expand Up @@ -955,7 +959,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
Expand Down Expand Up @@ -1003,7 +1007,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
Expand All @@ -1020,6 +1024,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:
Expand Down Expand Up @@ -2360,7 +2403,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,
Expand Down
Loading