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.

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 12 11 fix ara bauwerk export 2nd attempt #184

Merged
merged 305 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
305 commits
Select commit Hold shift + click to select a range
a2aa4e8
import get_ws_ids
sjib Dec 12, 2024
feca9f9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
988c2c1
correct query
sjib Dec 12, 2024
a8bacad
check on None for add_ids
sjib Dec 12, 2024
829e1c4
add subset_wws_ids=subset_wws_ids,
sjib Dec 12, 2024
9ce7d63
functions check on None variables
sjib Dec 12, 2024
eab0fd7
correct else intend
sjib Dec 12, 2024
0caa7d3
add new selection code to dss export
sjib Dec 12, 2024
698d256
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
a12a723
add selection code to export kek
sjib Dec 12, 2024
0bfe46c
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
b2d448a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
4767d96
adapt imports export kek
sjib Dec 12, 2024
620b6cc
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
4736971
clean up
sjib Dec 12, 2024
d73bbc0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
9be15e6
adapt import export dss
sjib Dec 12, 2024
fe68d16
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
44028f6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
ca1b3ed
correct intent of return statement
sjib Dec 12, 2024
fd8de58
add : and comment
sjib Dec 12, 2024
8eb5752
def get_selection_text_for_in_statement check if list is empty
sjib Dec 12, 2024
2d71f2b
check for empty list added
sjib Dec 12, 2024
00852a1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
47255ba
adapt case None
sjib Dec 12, 2024
42a86f3
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
20cbde0
check for empty adapted_subset_ids_reaches
sjib Dec 12, 2024
aacaad2
check for None
sjib Dec 12, 2024
e56fa8b
add debug.logger
sjib Dec 12, 2024
20e0278
check none
sjib Dec 12, 2024
e4809e4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
c047de2
initialize extra_reaches_ids
sjib Dec 12, 2024
062ba9b
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
462b60d
if no selection subset will be None
sjib Dec 12, 2024
2cdb4c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
faa5a95
update qgep export dss and kek
sjib Dec 12, 2024
762b520
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
9f9f9ef
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
d9244c1
only if filtered
sjib Dec 12, 2024
560d0d3
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
14cc560
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
dad4518
add wwtp_structure case also to not filtered
sjib Dec 12, 2024
3b9c654
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
32be05d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2024
09d25c3
add logger infos
sjib Dec 12, 2024
e8fabb9
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 12, 2024
a455fd6
#if self.filtered:
sjib Dec 13, 2024
4f03d77
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
749bafc
change to info and adapt message
sjib Dec 13, 2024
b8b2264
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
2e16853
adapt logger levels
sjib Dec 13, 2024
34c24b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
c853a49
update export kek with latest changes from sia405
sjib Dec 13, 2024
564fd6e
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
00cae22
update export dss with changes from sia405 abwasser
sjib Dec 13, 2024
c021f20
take out old approach - keep only approach_urs - no if needed anymore
sjib Dec 13, 2024
2bf1406
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
af931c1
take out old approache kek export
sjib Dec 13, 2024
db4495d
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
c53a8cb
readd get_ws_wn_ids,
sjib Dec 13, 2024
c1698b2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
296176f
add comment
sjib Dec 13, 2024
7fc3064
adapt filter throttle_shut_off_unit
sjib Dec 13, 2024
77e0df1
correct
sjib Dec 13, 2024
ed3d5cc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
d114496
logger.info(f"Selection query: {query.statement}")
sjib Dec 13, 2024
a208725
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
67bdfcf
correct query control_center
sjib Dec 13, 2024
7edddc1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
46cc998
always export all profile_geometry
sjib Dec 13, 2024
9a7c9ec
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
a93919c
always export all hydr_geom_relation
sjib Dec 13, 2024
be57c3b
correct filter mechanical_pretreatment
sjib Dec 13, 2024
51ad7df
change relation
sjib Dec 13, 2024
2a21bce
take out )
sjib Dec 13, 2024
31e3413
correct
sjib Dec 13, 2024
0d6bc67
formatting
sjib Dec 13, 2024
88fb0e0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
744e794
correct filter retention_body
sjib Dec 13, 2024
241afc7
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
f04da84
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
cf3b23b
wrong fk
sjib Dec 13, 2024
fa8867d
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
dd051bf
correct filter electric_equipment
sjib Dec 13, 2024
313793d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
777efa7
correct filter hazard_source
sjib Dec 13, 2024
c9a07ea
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
9da3fe7
correct filter accident
sjib Dec 13, 2024
4cbf74f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
2ff3aee
correct filter substance
sjib Dec 13, 2024
67461c6
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
a1543e0
intend
sjib Dec 13, 2024
bc7bdc9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
d52a771
correct filter measuring point
sjib Dec 13, 2024
d99e7f4
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
a332fa9
correct filter measuring_device
sjib Dec 13, 2024
392936f
correct measurment_series
sjib Dec 13, 2024
b76f611
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
2a8254b
correct filter measurment_result
sjib Dec 13, 2024
e935024
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
735dca9
correction
sjib Dec 13, 2024
5210706
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
9efce07
correction
sjib Dec 13, 2024
ec10889
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
80acbbf
correct filter backflow_prevention
sjib Dec 13, 2024
346d53a
correct
sjib Dec 13, 2024
468260d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
4c50d61
correct filter solids_retention
sjib Dec 13, 2024
e193d62
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
aeb0341
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
f0af16f
correct filter tank_cleaning
sjib Dec 13, 2024
5050116
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
7e62c6e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
08aa9bf
correct filter tank_emptying
sjib Dec 13, 2024
7be0907
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
fd96905
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
d01a78f
correct filter maintenance_event
sjib Dec 13, 2024
4f4d7d2
correct filter hydr_geom_relation
sjib Dec 13, 2024
4711d96
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
4a09df7
correction
sjib Dec 13, 2024
ddedea2
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
6bc2748
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
946d2d9
correct filter re_maintenance_event_wastewater_structure
sjib Dec 13, 2024
7568051
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 13, 2024
ea28689
correct )
sjib Dec 13, 2024
741c93a
correct ==
sjib Dec 13, 2024
e38153a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
230e130
correct query
sjib Dec 13, 2024
f21c26e
correct query.join
sjib Dec 13, 2024
12fe804
logger.debug added with query statement
sjib Dec 13, 2024
f488955
correct )
sjib Dec 13, 2024
f9fa0e3
more )
sjib Dec 13, 2024
e7c44c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2024
1b78ab5
filter pipe_profile - always all
sjib Dec 14, 2024
a3bb975
correct filter - filtered not available
sjib Dec 14, 2024
8cb6ce9
add check_fk_in_subsetid to structure_part_common
sjib Dec 14, 2024
a8f0b16
revert
sjib Dec 14, 2024
0d316f3
adapt filter of subclasses of structure_part
sjib Dec 14, 2024
71dc520
continued
sjib Dec 14, 2024
f62b82c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 14, 2024
1b44c8e
missing if filtered
sjib Dec 14, 2024
c19a151
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 14, 2024
4ef7d80
correction
sjib Dec 14, 2024
f594e68
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 14, 2024
17ec942
correct self.
sjib Dec 14, 2024
4880c69
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 14, 2024
e0bf951
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 14, 2024
d921128
remove self.
sjib Dec 14, 2024
c6adb37
set flag ws_off_sia405abwasse
sjib Dec 16, 2024
9e5aaf4
missing attribut in call
sjib Dec 16, 2024
d700779
correct
sjib Dec 16, 2024
598f1b1
add export_dryweather_downspout_ws_off_sia405abwasser and export_dryw…
sjib Dec 16, 2024
fc20fc0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 16, 2024
f5370b6
add also for cover, benching and access_aid
sjib Dec 16, 2024
c7f01ac
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 16, 2024
500e902
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 16, 2024
5f39ed0
adapt call with ws_off_sia405abwasser
sjib Dec 16, 2024
e250082
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 16, 2024
4c985f9
define ws_off_sia405abwasser
sjib Dec 16, 2024
5716316
adapt logger messages
sjib Dec 16, 2024
1d2df79
correct f"
sjib Dec 16, 2024
c06434e
initialize
sjib Dec 16, 2024
7f9c39d
dito sia405
sjib Dec 16, 2024
700687b
correct remove_from_selection and add_to_selection
sjib Dec 16, 2024
4a6a45a
update export dss
sjib Dec 16, 2024
5d0d342
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 16, 2024
ccb1b04
update export kek
sjib Dec 16, 2024
acdd8fa
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 16, 2024
044ea98
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 16, 2024
9bd2764
always false
sjib Dec 16, 2024
4b429ea
export_reach_check_fk_in_subset added
sjib Dec 17, 2024
2366f10
move qgep_model.wastewater_node also to qgep_export_utils
sjib Dec 17, 2024
c505305
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
4969df6
correct self.
sjib Dec 17, 2024
a49656e
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
fd67661
add export_wastewater_node_check_fk_in_subset
sjib Dec 17, 2024
9537251
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
7035a40
dssexport distinguish if filtered or not - check_fk_in_subset or not …
sjib Dec 17, 2024
d1df42d
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
2736e67
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
dd52931
correct intend
sjib Dec 17, 2024
76ded1a
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
e998d8f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
cdce83f
remove qgep_export_utils
sjib Dec 17, 2024
9b3769c
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
a0d5767
create def export_reach_point_check_fk_in_subset
sjib Dec 17, 2024
f19f2af
adapt dss export include export_reach_point with / without check_fk_i…
sjib Dec 17, 2024
e5e639c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
d674936
delete qgep_export_utils
sjib Dec 17, 2024
60e88eb
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
23ee6ce
adapt export sia405
sjib Dec 17, 2024
daa9a48
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
8395262
add query.statement
sjib Dec 17, 2024
933dfe9
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
51dcb08
more
sjib Dec 17, 2024
56422b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
f5c433f
add if filtered for messstelle
sjib Dec 17, 2024
96e5eb6
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
5dde205
correct call - add qgep_export_utils
sjib Dec 17, 2024
8861ece
correction
sjib Dec 17, 2024
834b387
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
7c83a41
Specify fk_relation between cover and wws
sjib Dec 17, 2024
f66f76f
correct ==
sjib Dec 17, 2024
f4f0f9b
same
sjib Dec 17, 2024
0ebb817
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
f317ed5
add self.qgep_model.
sjib Dec 17, 2024
04e0a47
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
656894d
move back export_wastewater_node_* to export, as difference in dss an…
sjib Dec 17, 2024
0834e5b
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
c5ca3ef
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
29a765a
missing (row),
sjib Dec 17, 2024
61a06c1
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
4b43d8f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
069a6b3
read from geoalchemy2.functions import ST_Force2D
sjib Dec 17, 2024
c260c77
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 17, 2024
86c2954
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2024
c140f28
export sia450 - if filtered and ws_off_sia405abwasser -> do check_fk_…
sjib Dec 18, 2024
3fb3bdb
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 18, 2024
236970f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
d2d54cc
criteria or instead of and
sjib Dec 18, 2024
ad1d24e
adapt export dss catchment_area
sjib Dec 18, 2024
0412c60
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
156f25c
export dss common_object_check_fk_in_subset added
sjib Dec 18, 2024
afd3a87
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 18, 2024
ba67f9e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
d0eda8d
export dss wrong fk name
sjib Dec 18, 2024
7c1191a
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 18, 2024
2e30705
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
a31c949
add logger.debug
sjib Dec 18, 2024
0fb6093
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
4e31b69
turn off automatic extend to neighbouring wwn of reaches
sjib Dec 18, 2024
2e85bb5
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 18, 2024
5cd4530
correction
sjib Dec 18, 2024
863f733
missing )
sjib Dec 18, 2024
9083924
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
cf0b7eb
correct True
sjib Dec 18, 2024
e808daa
adapt selected_ids / improve qgep_export_utils
sjib Dec 18, 2024
966ab60
backup subset_ids
sjib Dec 18, 2024
589cf1f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
79040df
subset_ids_original testing
sjib Dec 18, 2024
0e0c4a7
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 18, 2024
cdba854
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 18, 2024
3638cde
set variables back to selection_extend = True, as current solution
sjib Dec 19, 2024
da232d4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 19, 2024
05a8e52
update export kek
sjib Dec 19, 2024
a00ce7a
Merge branch '2024-12-11-fix-ara-bauwerk-export-2nd-attempt' of https…
sjib Dec 19, 2024
1e42ed4
Merge branch 'master' into 2024-12-11-fix-ara-bauwerk-export-2nd-attempt
sjib Dec 20, 2024
91d551e
Merge branch 'master' into 2024-12-11-fix-ara-bauwerk-export-2nd-attempt
sjib Dec 20, 2024
6f57ae0
adapt cases export_reach_point and export_reach_point_check_fk_in_subset
sjib Dec 20, 2024
59d05a1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 20, 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
4 changes: 4 additions & 0 deletions qgepqwat2ili/gui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,11 @@ def action_do_export():
# try:

# add logger info to check what selection is used
# 18.12.2024
logger.info(f"Start Exporting with selection {str(export_dialog.selected_ids)}")
# logger.info(
# f"Start Exporting with selection {str(export_dialog.selected_ids)} - without automatic extension of neigbouring wwn elements"
# )

if emodel == "VSA_KEK_2019_LV95":
logger.info("Start Exporting VSA_KEK_2019_LV95")
Expand Down
8 changes: 6 additions & 2 deletions qgepqwat2ili/gui/gui_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,18 @@ def logs_next_to_file(self):

@property
def selected_ids(self):
# Variable to choose if automatic selection_extend or not
selection_extend = True

if self.limit_checkbox.isChecked():
ids = []
for struct in self.structures:
ids.append(str(struct["wn_obj_id"]))
for reach in self.reaches:
ids.append(str(reach["obj_id"]))
ids.append(str(reach["rp_from_fk_wastewater_networkelement"]))
ids.append(str(reach["rp_to_fk_wastewater_networkelement"]))
if selection_extend:
ids.append(str(reach["rp_from_fk_wastewater_networkelement"]))
ids.append(str(reach["rp_to_fk_wastewater_networkelement"]))
return ids
else:
return None
Expand Down
Loading