From c3c1e472e80bdd9575507937f360ab894a1589b9 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 13 Dec 2022 06:49:03 +0100 Subject: [PATCH] EGON Export fixes * replaces missing value 'None' with empty string '' --- intervention/utils/egon_export.py | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/intervention/utils/egon_export.py b/intervention/utils/egon_export.py index db17557..30d5841 100644 --- a/intervention/utils/egon_export.py +++ b/intervention/utils/egon_export.py @@ -190,14 +190,14 @@ class EgonGmlBuilder: "@gml:id": self.intervention.identifier, "oneo:azEintragungsstelle": self.intervention.responsible.conservation_file_number, "oneo:azZulassungsstelle": self.intervention.responsible.registration_file_number, - "oneo:bemerkungZulassungsstelle": None, + "oneo:bemerkungZulassungsstelle": "", "oneo:eintragungsstelle": { - "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/907/{cons_office.atom_id if cons_office else None}", - "#text": cons_office.long_name if cons_office else None + "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/907/{cons_office.atom_id if cons_office else ''}", + "#text": cons_office.long_name if cons_office else "" }, "oneo:zulassungsstelle": { - "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{reg_office.atom_id if reg_office else None}", - "#text": reg_office.long_name if reg_office else None + "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{reg_office.atom_id if reg_office else ''}", + "#text": reg_office.long_name if reg_office else "" }, "oneo:ersatzzahlung": self._float_to_localized_string(self._sum_all_payments()), "oneo:kompensationsart": { @@ -205,33 +205,33 @@ class EgonGmlBuilder: "#text": comp_type }, "oneo:verfahrensrecht": { - "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1048/{law.atom_id if law else None}", - "#text": law.short_name if law else None + "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1048/{law.atom_id if law else ''}", + "#text": law.short_name if law else "" }, "oneo:verfahrenstyp": { - "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/44382/{process_type.atom_id if process_type else None}", - "#text": process_type.long_name if process_type else None, + "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/44382/{process_type.atom_id if process_type else ''}", + "#text": process_type.long_name if process_type else "", }, "oneo:eingreifer": { "oneo:Eingreifer": { "oneo:art": { - "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{handler.type.atom_id if handler.type else None}", - "#text": handler.type.long_name if handler.type else None, + "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{handler.type.atom_id if handler.type else ''}", + "#text": handler.type.long_name if handler.type else "", }, - "oneo:bemerkung": handler.detail if handler else None, + "oneo:bemerkung": handler.detail if handler else "", } }, "oneo:erfasser": { "oneo:Erfasser": { - "oneo:name": None, - "oneo:bemerkung": None, + "oneo:name": "", + "oneo:bemerkung": "", } }, "oneo:zulassung": { "oneo:Zulassungstermin": { "oneo:bauBeginn": payment_date, - "oneo:erlass": reg_date.strftime(DEFAULT_DATE_FORMAT) if reg_date else None, - "oneo:rechtsKraft": bind_date.strftime(DEFAULT_DATE_FORMAT) if bind_date else None, + "oneo:erlass": reg_date.strftime(DEFAULT_DATE_FORMAT) if reg_date else "", + "oneo:rechtsKraft": bind_date.strftime(DEFAULT_DATE_FORMAT) if bind_date else "", } }, "oneo:geometrie": { @@ -245,8 +245,8 @@ class EgonGmlBuilder: "oneo:kennung": self.intervention.identifier, "oneo:bezeichnung": self.intervention.title, "oneo:bemerkung": self.intervention.comment, - "oneo:verantwortlicheStelle": None, - "oneo:veroffentlichtAm": None, + "oneo:verantwortlicheStelle": "", + "oneo:veroffentlichtAm": "", "oneo:raumreferenz": { "oneo:Raumreferenz": self._gen_raumreferenz(), },