diff --git a/metadata.txt b/metadata.txt index 0e5688c..228f948 100644 --- a/metadata.txt +++ b/metadata.txt @@ -2,7 +2,7 @@ name=XPlan-Umring qgisMinimumVersion=3.24 description=Create XPlanGML from polygon(s) -version=2.10.0 +version=2.11.0 author=Kreis Viersen email=open@kreis-viersen.de @@ -19,10 +19,10 @@ icon=xplan_umring_icon.png experimental=False server=False hasProcessingProvider=yes -changelog=unreleased: +changelog=v2.11.0: - neue optionale Attribute "technHerstellDatum" und "erstellungsMassstab" für BP, FP, LP v6.0 - Raster-Hilfswerkzeuge: Komprimiere erzeugte Rasterpläne mit Deflate - - Raster-Hilfswerkzeuge: Behebe Fehler für bestimmte Polygone + - alle Werkzeuge: behebe diverse Fehler für bestimmte Eingabe-Polygone v2.10.0: - Raster-Hilfswerkzeuge: Option zum Leerwert setzen v2.9.0: diff --git a/xplan_umring_algorithm_bp_5_4.py b/xplan_umring_algorithm_bp_5_4.py index 0cb0c9b..0b27ed8 100644 --- a/xplan_umring_algorithm_bp_5_4.py +++ b/xplan_umring_algorithm_bp_5_4.py @@ -96,7 +96,7 @@ def initAlgorithm(self, config=None): self.ags = settings.value("xplan-umring/ags", "") self.ortsteilname = "" if self.ags.startswith(("05114", "05154", "05158", "05166", "05170")): - self.ortsteilname = self.kommune + self.ortsteilname = self.kommune self.addParameter( QgsProcessingParameterVectorLayer( @@ -489,6 +489,20 @@ def showWarning(message): ) polygon_element.attrib["srsName"] = kbs + for linestring_element in root.iter( + "{http://www.opengis.net/gml/3.2}LineString" + ): + linestring_element.attrib["{http://www.opengis.net/gml/3.2}id"] = ( + "ID_" + str(uuid.uuid4()) + ) + linestring_element.attrib["srsName"] = kbs + + for curve_element in root.iter("{http://www.opengis.net/gml/3.2}Curve"): + curve_element.attrib["{http://www.opengis.net/gml/3.2}id"] = "ID_" + str( + uuid.uuid4() + ) + curve_element.attrib["srsName"] = kbs + for lowerCorner_element in root.iter( "{http://www.opengis.net/gml/3.2}lowerCorner" ): @@ -516,9 +530,7 @@ def showWarning(message): gemeindename_element.text = gemeindename ortsteilname_element = next( - bp_plan_element.iter( - "{http://www.xplanung.de/xplangml/5/4}ortsteilName" - ) + bp_plan_element.iter("{http://www.xplanung.de/xplangml/5/4}ortsteilName") ) if ortsteilname == "": @@ -527,7 +539,7 @@ def showWarning(message): ): xp_gemeinde_element.remove(ortsteilname_element) else: - ortsteilname_element.text = ortsteilname + ortsteilname_element.text = ortsteilname for ags_element in root.iter("{http://www.xplanung.de/xplangml/5/4}ags"): ags_element.text = ags diff --git a/xplan_umring_algorithm_bp_6_0.py b/xplan_umring_algorithm_bp_6_0.py index 461a261..5a1456e 100644 --- a/xplan_umring_algorithm_bp_6_0.py +++ b/xplan_umring_algorithm_bp_6_0.py @@ -518,6 +518,20 @@ def showWarning(message): ) polygon_element.attrib["srsName"] = kbs + for linestring_element in root.iter( + "{http://www.opengis.net/gml/3.2}LineString" + ): + linestring_element.attrib["{http://www.opengis.net/gml/3.2}id"] = ( + "ID_" + str(uuid.uuid4()) + ) + linestring_element.attrib["srsName"] = kbs + + for curve_element in root.iter("{http://www.opengis.net/gml/3.2}Curve"): + curve_element.attrib["{http://www.opengis.net/gml/3.2}id"] = "ID_" + str( + uuid.uuid4() + ) + curve_element.attrib["srsName"] = kbs + for lowerCorner_element in root.iter( "{http://www.opengis.net/gml/3.2}lowerCorner" ): diff --git a/xplan_umring_algorithm_fp_6_0.py b/xplan_umring_algorithm_fp_6_0.py index 01ea44e..4cef98c 100644 --- a/xplan_umring_algorithm_fp_6_0.py +++ b/xplan_umring_algorithm_fp_6_0.py @@ -509,6 +509,20 @@ def showWarning(message): ) polygon_element.attrib["srsName"] = kbs + for linestring_element in root.iter( + "{http://www.opengis.net/gml/3.2}LineString" + ): + linestring_element.attrib["{http://www.opengis.net/gml/3.2}id"] = ( + "ID_" + str(uuid.uuid4()) + ) + linestring_element.attrib["srsName"] = kbs + + for curve_element in root.iter("{http://www.opengis.net/gml/3.2}Curve"): + curve_element.attrib["{http://www.opengis.net/gml/3.2}id"] = "ID_" + str( + uuid.uuid4() + ) + curve_element.attrib["srsName"] = kbs + for lowerCorner_element in root.iter( "{http://www.opengis.net/gml/3.2}lowerCorner" ): diff --git a/xplan_umring_algorithm_lp_6_0.py b/xplan_umring_algorithm_lp_6_0.py index 3648aaf..d433003 100644 --- a/xplan_umring_algorithm_lp_6_0.py +++ b/xplan_umring_algorithm_lp_6_0.py @@ -556,6 +556,20 @@ def showWarning(message): ) polygon_element.attrib["srsName"] = kbs + for linestring_element in root.iter( + "{http://www.opengis.net/gml/3.2}LineString" + ): + linestring_element.attrib["{http://www.opengis.net/gml/3.2}id"] = ( + "ID_" + str(uuid.uuid4()) + ) + linestring_element.attrib["srsName"] = kbs + + for curve_element in root.iter("{http://www.opengis.net/gml/3.2}Curve"): + curve_element.attrib["{http://www.opengis.net/gml/3.2}id"] = "ID_" + str( + uuid.uuid4() + ) + curve_element.attrib["srsName"] = kbs + for lowerCorner_element in root.iter( "{http://www.opengis.net/gml/3.2}lowerCorner" ): diff --git a/xplan_umring_algorithm_replace_geometry.py b/xplan_umring_algorithm_replace_geometry.py index c5dc486..c6bb9c9 100644 --- a/xplan_umring_algorithm_replace_geometry.py +++ b/xplan_umring_algorithm_replace_geometry.py @@ -366,6 +366,22 @@ def updateBoundedBy(): ) polygon_element.attrib["srsName"] = kbs + for linestring_element in new_geltungsbereich_element.iter( + "{http://www.opengis.net/gml/3.2}LineString" + ): + linestring_element.attrib["{http://www.opengis.net/gml/3.2}id"] = ( + "ID_" + str(uuid.uuid4()) + ) + linestring_element.attrib["srsName"] = kbs + + for curve_element in new_geltungsbereich_element.iter( + "{http://www.opengis.net/gml/3.2}Curve" + ): + curve_element.attrib["{http://www.opengis.net/gml/3.2}id"] = "ID_" + str( + uuid.uuid4() + ) + curve_element.attrib["srsName"] = kbs + raeumlicherGeltungsbereich_element.getparent().replace( raeumlicherGeltungsbereich_element, new_geltungsbereich_element )