Merge pull request #854 from openoereb/xml-move-LengthShare_NrOfPoints

Move LengthShare and NrOfPoints to correct place
openoereb · May 20, 2019 · 549a006 · 549a006
2 parents 65d9a94 + 87a3c7d
commit 549a006
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/pyramid_oereb/lib/renderer/extract/templates/xml/public_law_restriction.xml b/pyramid_oereb/lib/renderer/extract/templates/xml/public_law_restriction.xml
@@ -38,6 +38,12 @@
     %if public_law_restriction.area_share:
     <data:AreaShare>${public_law_restriction.area_share}</data:AreaShare>
     %endif
+    %if public_law_restriction.length_share:
+    <LengthShare>${public_law_restriction.length_share}</LengthShare>
+    %endif
+    %if public_law_restriction.nr_of_points:
+    <NrOfPoints>${public_law_restriction.nr_of_points}</NrOfPoints>
+    %endif
     %if public_law_restriction.part_in_percent:
     <data:PartInPercent>${public_law_restriction.part_in_percent}</data:PartInPercent>
     %endif
@@ -61,15 +67,11 @@
         <%include file="office.xml" args="office=public_law_restriction.responsible_office"/>
     </data:ResponsibleOffice>
     <data:extensions>
-%if public_law_restriction.area_share:
+%if public_law_restriction.area_share and public_law_restriction.area_unit:
         <AreaUnit>${public_law_restriction.area_unit}</AreaUnit>
 %endif
-%if public_law_restriction.length_share:
-        <LengthShare>${public_law_restriction.length_share}</LengthShare>
+%if public_law_restriction.length_share and public_law_restriction.length_unit:
         <LengthUnit>${public_law_restriction.length_unit}</LengthUnit>
-%endif
-%if public_law_restriction.nr_of_points:
-        <NrOfPoints>${public_law_restriction.nr_of_points}</NrOfPoints>
 %endif
     </data:extensions>
 </data:RestrictionOnLandownership>