Skip to content

Commit

Permalink
Merge pull request #67 from QGEP/bug_fixing_qgepqwat2ili
Browse files Browse the repository at this point in the history
 Wrong matching reliner_art / reliner_bautechnik #62
  • Loading branch information
olivierdalang authored Aug 25, 2022
2 parents 2a4d1d9 + 857ee22 commit 49b419f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions qgepqwat2ili/qgep/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@ def structure_part_common(row):
nachhaltungspunktref=get_tid(row.fk_reach_point_to__REL),
plangefaelle=row.slope_building_plan, # TODO : check, does this need conversion ?
reibungsbeiwert=row.coefficient_of_friction,
reliner_art=row.relining_kind,
reliner_bautechnik=row.relining_construction,
reliner_art=get_vl(row.relining_kind__REL),
reliner_bautechnik=get_vl(row.relining_construction__REL),
reliner_material=get_vl(row.reliner_material__REL),
reliner_nennweite=row.reliner_nominal_size,
ringsteifigkeit=row.ring_stiffness,
Expand Down
4 changes: 2 additions & 2 deletions qgepqwat2ili/qgep/import_.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def wastewater_structure_common(row):
"""
return {
"accessibility__REL": get_vl_instance(QGEP.wastewater_structure_accessibility, row.zugaenglichkeit),
# "contract_section": row.REPLACE_ME, # TODO : not sure, is it akten or baulos ?
"contract_section": row.baulos,
"detail_geometry_geometry": ST_Force3D(row.detailgeometrie),
"financing__REL": get_vl_instance(QGEP.wastewater_structure_financing, row.finanzierung),
# "fk_main_cover": row.REPLACE_ME, # TODO : NOT MAPPED, but I think this is not standard SIA405 ?
Expand All @@ -135,7 +135,7 @@ def wastewater_structure_common(row):
"identifier": row.bezeichnung,
"inspection_interval": row.inspektionsintervall,
"location_name": row.standortname,
# "records": row.REPLACE_ME, # TODO : not sure, is it akten or baulos ?
"records": row.akten,
"remark": row.bemerkung,
"renovation_necessity__REL": get_vl_instance(
QGEP.wastewater_structure_renovation_necessity, row.sanierungsbedarf
Expand Down

0 comments on commit 49b419f

Please sign in to comment.