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-07-add-missing-identifier_short #367

Merged
merged 10 commits into from
Aug 8, 2024
Merged

2024-08-07-add-missing-identifier_short #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
73e98bc
interlis_import add identifier_short, sort attributes
sjib Aug 7, 2024
494463e
add ,
sjib Aug 7, 2024
e06c3ad
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 7, 2024
5afc185
interlis export add kurzbezeichnung
sjib Aug 7, 2024
d10fac5
Merge branch '2024-08-07-add-missing-identifier_short' of https://git…
sjib Aug 7, 2024
af5487b
corrections
sjib Aug 7, 2024
ffb4857
fix )
sjib Aug 7, 2024
30481fc
import add last_modification
sjib Aug 7, 2024
605bfc3
comment about last_modification
sjib Aug 7, 2024
86bb6e7
adapt test-dataset-organisation.xtf to include Kurzbezeichnung
sjib Aug 7, 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
1 change: 1 addition & 0 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 @@ -458,6 +458,7 @@ def _export_organisation(self):
auid=row.uid,
bemerkung=self.truncate(self.emptystr_to_null(row.remark), 255),
bezeichnung=self.null_to_emptystr(row.identifier),
kurzbezeichnung=row.identifier_short,
organisationstyp=self.get_vl(row.organisation_type__REL),
astatus=self.get_vl(row.status__REL),
)
Expand Down
7 changes: 5 additions & 2 deletions ...si_wastewater/interlis/interlis_model_mapping/interlis_importer_to_intermediate_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,17 +596,20 @@ def _import_organisation(self):
organisation = self.create_or_update(
self.model_classes_tww_od.organisation,
obj_id=row.t_ili_tid,
# manually add for organisation (instead of adding **self.base_common(row) as this would also add fk_dataowner and fk_provider, that are not in INTERLIS for class organisation (change to VSA-DSS 2015, as organisation is now a separate external class maintained by the VSA (or its successor organisation for this)
last_modification=row.letzte_aenderung,
# --- organisation ---
identifier=row.bezeichnung,
remark=row.bemerkung,
uid=row.auid,
identifier_short=row.kurzbezeichnung,
municipality_number=row.gemeindenummer,
organisation_type=self.get_vl_code(
self.model_classes_tww_vl.organisation_organisation_type, row.organisationstyp
),
remark=row.bemerkung,
status=self.get_vl_code(
self.model_classes_tww_vl.organisation_status, row.astatus
),
uid=row.auid,
)

self.session_tww.add(organisation)
Expand Down
10 changes: 6 additions & 4 deletions plugin/teksi_wastewater/tests/data/test-dataset-organisations.xtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
<TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.3">
<HEADERSECTION VERSION="2.3" SENDER="VSA">
<MODELS>
<MODEL NAME="SIA405_Base_Abwasser_1_LV95" URI="http://www.infogrips.ch" VERSION= "29.05.2020"/>
<MODEL NAME="SIA405_Base_Abwasser_1_LV95" URI="http://www.infogrips.ch" VERSION= "18.10.2023"/>
</MODELS>
<ALIAS>
<ENTRIES FOR="SIA405_Base_Abwasser_1_LV95"> </ENTRIES>
</ALIAS>
<COMMENT> dataset generated by VSA, Organisationen für Testdatensatz 2020_1 last update 20231201</COMMENT>
<COMMENT> dataset generated by VSA, Organisationen für Testdatensatz 2020_1 last update 20231201/ 20240807</COMMENT>
</HEADERSECTION>
<DATASECTION>
<SIA405_Base_Abwasser_1_LV95.Administration BID="Basket1">
<SIA405_Base_Abwasser_1_LV95.Administration.Organisation TID="ch080qwzAM001217">
<Letzte_Aenderung>20191014</Letzte_Aenderung>
<Letzte_Aenderung>20240807</Letzte_Aenderung>
<Bezeichnung>Amt für Umwelt</Bezeichnung>
<Gemeindenummer></Gemeindenummer>
<Kurzbezeichnung>AfU</Kurzbezeichnung>
<Organisationstyp>Kanton</Organisationstyp>
<Status>aktiv</Status>
<UID></UID>
Expand Down Expand Up @@ -46,9 +47,10 @@
<UID>CHE102441189</UID>
</SIA405_Base_Abwasser_1_LV95.Administration.Organisation>
<SIA405_Base_Abwasser_1_LV95.Administration.Organisation TID="ch080qwzAV000007">
<Letzte_Aenderung>20191014</Letzte_Aenderung>
<Letzte_Aenderung>20240807</Letzte_Aenderung>
<Bezeichnung>Abwasserverband Aletsch</Bezeichnung>
<Gemeindenummer></Gemeindenummer>
<Kurzbezeichnung>AV Aletsch</Kurzbezeichnung>
<Organisationstyp>Abwasserverband</Organisationstyp>
<Status>aktiv</Status>
<UID>CHE102441189</UID>
Expand Down