From 1475cf0c7c1c3f9a328c8d871463647f065d7eb0 Mon Sep 17 00:00:00 2001
From: Jouski <arnaud.champollion@linux-alpes.org>
Date: Wed, 10 Mar 2021 14:07:00 +0100
Subject: [PATCH] ajout surfaces de sable

---
 style_caliec/styles/multipolygon.qml | 2217 ++++++++++++++------------
 1 file changed, 1154 insertions(+), 1063 deletions(-)

diff --git a/style_caliec/styles/multipolygon.qml b/style_caliec/styles/multipolygon.qml
index 087bf1d..292e2a7 100644
--- a/style_caliec/styles/multipolygon.qml
+++ b/style_caliec/styles/multipolygon.qml
@@ -1,988 +1,1079 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.10.4-A Coruña" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" minScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1" simplifyMaxScale="1" readOnly="0" simplifyAlgorithm="0" labelsEnabled="1" maxScale="0" simplifyDrawingHints="1">
+<qgis styleCategories="AllStyleCategories" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" version="3.10.4-A Coruña" minScale="1e+08" maxScale="0" labelsEnabled="1" simplifyAlgorithm="0">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="0">
+  <renderer-v2 symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
     <rules key="{235a67ea-a656-47c2-91a1-3c94e2926f62}">
-      <rule filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment" symbol="0" key="{f69f1a82-2331-4139-9487-e27714a58a63}"/>
-      <rule filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" label="toit,auvent,préau" symbol="1" key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}"/>
-      <rule filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment scolaire" symbol="2" key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}"/>
-      <rule filter="&quot;building&quot;='shed'" label="cabanon" symbol="3" key="{bc2342be-b587-40e8-8c25-1043595b314d}"/>
-      <rule filter="&quot;leisure&quot;='pitch'" label="terrain" symbol="4" key="{37c906be-b2ec-4cc7-aefc-9eb829be9a07}"/>
-      <rule filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or &quot;surface&quot;='grass'" label="herbe" symbol="5" key="{af8ca696-fc2e-4142-945a-24b6a15acc48}"/>
-      <rule filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" label="eau" symbol="6" key="{933821c2-969e-44c3-ac11-8153737ba71a}"/>
-      <rule filter="&quot;natural&quot;='shingle'" label="lit de rivière" symbol="7" key="{e91700e9-45b0-4885-8be1-33970cf2f64c}"/>
-      <rule filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" label="zone boisée" symbol="8" key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}"/>
-      <rule filter="&quot;leisure&quot;='playground'" label="jeux" symbol="9" key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}"/>
-      <rule filter="&quot;amenity&quot;='parking'" label="parking" symbol="10" key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}"/>
-      <rule filter="&quot;landuse&quot;='farmland'" label="champ" symbol="11" key="{b908d622-4193-4ced-8781-7bb5b8930e60}"/>
-      <rule filter="&quot;surface&quot;='compacted'" label="sable compact" symbol="12" key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}"/>
-      <rule filter="&quot;leisure&quot;='garden'" label="jardin" symbol="13" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}"/>
-      <rule filter="&quot;area:highway&quot;='path'" label="chemin" symbol="14" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}"/>
+      <rule key="{f69f1a82-2331-4139-9487-e27714a58a63}" filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment" symbol="0"/>
+      <rule key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}" filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" label="toit,auvent,préau" symbol="1"/>
+      <rule key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}" filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment scolaire" symbol="2"/>
+      <rule key="{bc2342be-b587-40e8-8c25-1043595b314d}" filter="&quot;building&quot;='shed'" label="cabanon" symbol="3"/>
+      <rule key="{37c906be-b2ec-4cc7-aefc-9eb829be9a07}" filter="&quot;leisure&quot;='pitch'" label="terrain" symbol="4"/>
+      <rule key="{af8ca696-fc2e-4142-945a-24b6a15acc48}" filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or &quot;surface&quot;='grass'" label="herbe" symbol="5"/>
+      <rule key="{933821c2-969e-44c3-ac11-8153737ba71a}" filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" label="eau" symbol="6"/>
+      <rule key="{e91700e9-45b0-4885-8be1-33970cf2f64c}" filter="&quot;natural&quot;='shingle'" label="lit de rivière" symbol="7"/>
+      <rule key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}" filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" label="zone boisée" symbol="8"/>
+      <rule key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}" filter="&quot;leisure&quot;='playground'" label="jeux" symbol="9"/>
+      <rule key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}" filter="&quot;amenity&quot;='parking'" label="parking" symbol="10"/>
+      <rule key="{b908d622-4193-4ced-8781-7bb5b8930e60}" filter="&quot;landuse&quot;='farmland'" label="champ" symbol="11"/>
+      <rule key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}" filter="&quot;surface&quot;='compacted'" label="sable compact" symbol="12"/>
+      <rule key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}" filter="&quot;leisure&quot;='garden'" label="jardin" symbol="13"/>
+      <rule key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}" filter="&quot;area:highway&quot;='path'" label="chemin" symbol="14"/>
+      <rule key="{c2d5ee3a-b2f3-4d9d-beea-539050495632}" filter="&quot;surface&quot;='sand'" label="sable" symbol="15"/>
     </rules>
     <symbols>
-      <symbol alpha="1" name="0" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="0" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="20">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="209,209,209,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="209,209,209,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer enabled="1" class="LinePatternFill" locked="0" pass="20">
-          <prop v="45" k="angle"/>
-          <prop v="0,0,255,255" k="color"/>
-          <prop v="1" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="angle" v="45"/>
+          <prop k="color" v="0,0,255,255"/>
+          <prop k="distance" v="1"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@0@1" type="line" clip_to_extent="1" force_rhr="0">
+          <symbol name="@0@1" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol alpha="0.5" name="1" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="1" force_rhr="0" type="fill" alpha="0.5" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="229,229,229,128" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="229,229,229,128"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
-          <prop v="45" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="3" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.5" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="angle" v="45"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="distance" v="3"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.5"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@1@1" type="line" clip_to_extent="1" force_rhr="0">
+          <symbol name="@1@1" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol alpha="1" name="10" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="10" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="232,234,234,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="232,234,234,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="11" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="11" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="187,233,166,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="187,233,166,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer enabled="1" class="SVGFill" locked="0" pass="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,255,255" k="color"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="pattern_width_map_unit_scale"/>
-          <prop v="MM" k="pattern_width_unit"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/champ.svg" k="svgFile"/>
-          <prop v="3x:0,0,0,0,0,0" k="svg_outline_width_map_unit_scale"/>
-          <prop v="MM" k="svg_outline_width_unit"/>
-          <prop v="6" k="width"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,255,255"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="pattern_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="pattern_width_unit" v="MM"/>
+          <prop k="svgFile" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/champ.svg"/>
+          <prop k="svg_outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="svg_outline_width_unit" v="MM"/>
+          <prop k="width" v="6"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@11@1" type="line" clip_to_extent="1" force_rhr="0">
+          <symbol name="@11@1" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="35,35,35,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="35,35,35,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol alpha="1" name="12" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="12" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,255,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties"/>
+              <Option name="type" type="QString" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
         <layer enabled="1" class="SVGFill" locked="0" pass="0">
-          <prop v="0" k="angle"/>
-          <prop v="183,72,75,255" k="color"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="pattern_width_map_unit_scale"/>
-          <prop v="MM" k="pattern_width_unit"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/sable.svg" k="svgFile"/>
-          <prop v="3x:0,0,0,0,0,0" k="svg_outline_width_map_unit_scale"/>
-          <prop v="MM" k="svg_outline_width_unit"/>
-          <prop v="20" k="width"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="183,72,75,255"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="pattern_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="pattern_width_unit" v="MM"/>
+          <prop k="svgFile" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/sable.svg"/>
+          <prop k="svg_outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="svg_outline_width_unit" v="MM"/>
+          <prop k="width" v="20"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@12@0" type="line" clip_to_extent="1" force_rhr="0">
+          <symbol name="@12@1" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="35,35,35,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="35,35,35,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol alpha="1" name="13" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="13" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="2.4" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="2.4" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="2.4"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="2.4"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@13@0" type="marker" clip_to_extent="1" force_rhr="0">
+          <symbol name="@13@0" force_rhr="0" type="marker" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="77,175,74,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="77,175,74,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+              <prop k="angle" v="0"/>
+              <prop k="color" v="77,175,74,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="77,175,74,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
         <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="77,175,74,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.36" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="77,175,74,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.36"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="14" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="14" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="179,90,42,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="102,51,24,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="179,90,42,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="102,51,24,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="2" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="15" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="231,229,183,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,251,119,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
-          <prop v="45" k="angle"/>
-          <prop v="0,0,255,255" k="color"/>
-          <prop v="1" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+        <layer enabled="1" class="SVGFill" locked="0" pass="0">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="183,72,75,255"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="pattern_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="pattern_width_unit" v="MM"/>
+          <prop k="svgFile" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/sable.svg"/>
+          <prop k="svg_outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="svg_outline_width_unit" v="MM"/>
+          <prop k="width" v="20"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@2@1" type="line" clip_to_extent="1" force_rhr="0">
+          <symbol name="@15@1" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="35,35,35,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol alpha="1" name="3" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="2" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="187,169,2,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="231,229,183,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
-          <prop v="45" k="angle"/>
-          <prop v="55,126,184,255" k="color"/>
-          <prop v="2" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="angle" v="45"/>
+          <prop k="color" v="0,0,255,255"/>
+          <prop k="distance" v="1"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@3@1" type="line" clip_to_extent="1" force_rhr="0">
+          <symbol name="@2@1" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+      </symbol>
+      <symbol name="3" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="187,169,2,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties"/>
+              <Option name="type" type="QString" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+          <prop k="angle" v="45"/>
+          <prop k="color" v="55,126,184,255"/>
+          <prop k="distance" v="2"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties"/>
+              <Option name="type" type="QString" value="collection"/>
+            </Option>
+          </data_defined_properties>
+          <symbol name="@3@1" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.3"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
         <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
-          <prop v="0" k="angle"/>
-          <prop v="55,126,184,255" k="color"/>
-          <prop v="2" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="55,126,184,255"/>
+          <prop k="distance" v="2"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@3@2" type="line" clip_to_extent="1" force_rhr="0">
+          <symbol name="@3@2" force_rhr="0" type="line" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.3"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
         <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.46" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.46"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="4" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="4" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="10">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="255,255,255,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.3" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="no" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,255,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.3"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="no"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="5" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="5" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="95,255,95,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="no" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="95,255,95,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="no"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="6" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="6" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="25,140,255,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="no" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="25,140,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="no"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="7" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="7" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="255,246,205,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,246,205,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="1.7" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="1.7" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="1.7"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="1.7"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@7@1" type="marker" clip_to_extent="1" force_rhr="0">
+          <symbol name="@7@1" force_rhr="0" type="marker" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
         <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.36" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.36"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" name="8" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="8" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="0,142,54,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="0,142,54,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="2.4" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="2.4" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="2.4"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="2.4"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@8@1" type="marker" clip_to_extent="1" force_rhr="0">
+          <symbol name="@8@1" force_rhr="0" type="marker" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="77,175,74,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="77,175,74,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+              <prop k="angle" v="0"/>
+              <prop k="color" v="77,175,74,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="77,175,74,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol alpha="1" name="9" type="fill" clip_to_extent="1" force_rhr="0">
+      <symbol name="9" force_rhr="0" type="fill" alpha="1" clip_to_extent="1">
         <layer enabled="1" class="SimpleFill" locked="0" pass="10">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="127,255,211,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="127,255,211,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer enabled="1" class="PointPatternFill" locked="0" pass="10">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="2.4" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="2.4" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="2.4"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="2.4"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol alpha="1" name="@9@1" type="marker" clip_to_extent="1" force_rhr="0">
+          <symbol name="@9@1" force_rhr="0" type="marker" alpha="1" clip_to_extent="1">
             <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="77,175,74,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="77,175,74,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+              <prop k="angle" v="0"/>
+              <prop k="color" v="77,175,74,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="77,175,74,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
         <layer enabled="1" class="SimpleLine" locked="0" pass="10">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="77,175,74,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.36" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="77,175,74,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.36"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -990,82 +1081,82 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{268c98db-f83d-4643-a9ef-e4bd467f6b2f}">
-      <rule description="parking" filter="&quot;amenity&quot;='parking'" key="{9392b38f-1d27-4d17-9225-6ed63382eb50}">
+    <rules key="{b0e51544-bd28-4de0-ab0b-b5a2f2835e69}">
+      <rule description="parking" key="{ffcf04d2-762f-4c47-a068-e45da110fe93}" filter="&quot;amenity&quot;='parking'">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontLetterSpacing="0" fontFamily="Liberation Sans" fieldName="'P'" fontKerning="1" fontSize="10" fontUnderline="0" fontWeight="75" fontWordSpacing="0" previewBkgrdColor="255,255,255,255" fontItalic="0" useSubstitutions="0" namedStyle="Bold" fontSizeUnit="MapUnit" fontStrikeout="0" multilineHeight="1" textOpacity="1" fontCapitals="0" isExpression="1" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,149,255,255">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferJoinStyle="128"/>
-            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeDraw="0" shapeType="0" shapeSizeUnit="MM" shapeRotationType="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeRadiiY="0" shapeJoinStyle="64" shapeOffsetX="0">
-              <symbol alpha="1" name="markerSymbol" type="marker" clip_to_extent="1" force_rhr="0">
+          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontStrikeout="0" multilineHeight="1" textOpacity="1" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontItalic="0" namedStyle="Bold" fontWeight="75" useSubstitutions="0" textOrientation="horizontal" isExpression="1" previewBkgrdColor="255,255,255,255" fieldName="'P'" textColor="0,149,255,255" fontFamily="Liberation Sans" fontUnderline="0" blendMode="0" fontKerning="1" fontSizeUnit="MapUnit">
+            <text-buffer bufferDraw="0" bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSizeType="0" shapeRotationType="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeJoinStyle="64" shapeRotation="0" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeSVGFile="">
+              <symbol name="markerSymbol" force_rhr="0" type="marker" alpha="1" clip_to_extent="1">
                 <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="164,113,88,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="164,113,88,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowScale="100" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetGlobal="1"/>
+            <shadow shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOpacity="0.7" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" placeDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" reverseDirectionSymbol="0" autoWrapLength="0" multilineAlign="0" plussign="0" wrapChar=""/>
-          <placement repeatDistanceUnits="MM" centroidInside="0" dist="0" maxCurvedCharAngleOut="-25" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" geometryGeneratorType="PointGeometry" placement="0" yOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorEnabled="0" offsetUnits="MM" centroidWhole="0" priority="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" preserveRotation="1" distUnits="MM" layerType="PolygonGeometry" repeatDistance="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" overrunDistance="0"/>
-          <rendering scaleMax="0" zIndex="0" scaleVisibility="0" labelPerPart="0" drawLabels="1" upsidedownLabels="0" obstacleType="0" fontMinPixelSize="3" scaleMin="0" obstacle="1" limitNumLabels="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" obstacleFactor="1" mergeLines="0" displayAll="0"/>
+          <text-format reverseDirectionSymbol="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" decimals="3" leftDirectionSymbol="&lt;" autoWrapLength="0" addDirectionSymbol="0" rightDirectionSymbol=">" multilineAlign="0" plussign="0" wrapChar="" formatNumbers="0"/>
+          <placement maxCurvedCharAngleOut="-25" placementFlags="10" priority="5" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" overrunDistance="0" placement="0" rotationAngle="0" centroidWhole="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" offsetType="0" preserveRotation="1" overrunDistanceUnit="MM" xOffset="0" layerType="PolygonGeometry" fitInPolygonOnly="0" distUnits="MM" dist="0" repeatDistanceUnits="MM" geometryGenerator="" offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" quadOffset="4" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering upsidedownLabels="0" scaleMax="0" scaleMin="0" minFeatureSize="0" fontMaxPixelSize="10000" limitNumLabels="0" obstacle="1" obstacleType="0" fontMinPixelSize="3" maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" mergeLines="0" obstacleFactor="1" displayAll="0" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
               <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot;>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -1073,8 +1164,8 @@
     </rules>
   </labeling>
   <customproperties>
-    <property value="description" key="dualview/previewExpressions"/>
-    <property value="0" key="embeddedWidgets/count"/>
+    <property key="dualview/previewExpressions" value="description"/>
+    <property key="embeddedWidgets/count" value="0"/>
     <property key="variableNames">
       <value>qgis_25d_angle</value>
       <value>qgis_25d_height</value>
@@ -1131,18 +1222,18 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory backgroundColor="#ffffff" penAlpha="255" minScaleDenominator="0" scaleDependency="Area" minimumSize="0" rotationOffset="270" penWidth="0" height="15" lineSizeType="MM" width="15" opacity="1" enabled="0" sizeType="MM" maxScaleDenominator="1e+08" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" penColor="#000000" barWidth="5" backgroundAlpha="255">
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory penWidth="0" minimumSize="0" height="15" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" barWidth="5" minScaleDenominator="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" opacity="1" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" scaleDependency="Area" backgroundAlpha="255" penAlpha="255" width="15" enabled="0" scaleBasedVisibility="0" penColor="#000000" lineSizeType="MM" diagramOrientation="Up">
       <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-      <attribute field="" label="" color="#000000"/>
+      <attribute label="" field="" color="#000000"/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18" dist="0" obstacle="0">
+  <DiagramLayerSettings showAll="1" priority="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" dist="0">
     <properties>
       <Option type="Map">
-        <Option name="name" value="" type="QString"/>
+        <Option name="name" type="QString" value=""/>
         <Option name="properties"/>
-        <Option name="type" value="collection" type="QString"/>
+        <Option name="type" type="QString" value="collection"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
@@ -1150,9 +1241,9 @@
     <activeChecks/>
     <checkConfiguration type="Map">
       <Option name="QgsGeometryGapCheck" type="Map">
-        <Option name="allowedGapsBuffer" value="0" type="double"/>
-        <Option name="allowedGapsEnabled" value="false" type="bool"/>
-        <Option name="allowedGapsLayer" value="" type="QString"/>
+        <Option name="allowedGapsBuffer" type="double" value="0"/>
+        <Option name="allowedGapsEnabled" type="bool" value="false"/>
+        <Option name="allowedGapsLayer" type="QString" value=""/>
       </Option>
     </checkConfiguration>
   </geometryOptions>
@@ -1539,226 +1630,226 @@
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
   <defaults>
-    <default applyOnUpdate="0" field="fid" expression=""/>
-    <default applyOnUpdate="0" field="osm_id" expression=""/>
-    <default applyOnUpdate="0" field="osm_way_id" expression=""/>
-    <default applyOnUpdate="0" field="name" expression=""/>
-    <default applyOnUpdate="0" field="type" expression=""/>
-    <default applyOnUpdate="0" field="aeroway" expression=""/>
-    <default applyOnUpdate="0" field="amenity" expression=""/>
-    <default applyOnUpdate="0" field="admin_level" expression=""/>
-    <default applyOnUpdate="0" field="barrier" expression=""/>
-    <default applyOnUpdate="0" field="boundary" expression=""/>
-    <default applyOnUpdate="0" field="building" expression=""/>
-    <default applyOnUpdate="0" field="craft" expression=""/>
-    <default applyOnUpdate="0" field="geological" expression=""/>
-    <default applyOnUpdate="0" field="historic" expression=""/>
-    <default applyOnUpdate="0" field="land_area" expression=""/>
-    <default applyOnUpdate="0" field="landuse" expression=""/>
-    <default applyOnUpdate="0" field="leisure" expression=""/>
-    <default applyOnUpdate="0" field="man_made" expression=""/>
-    <default applyOnUpdate="0" field="military" expression=""/>
-    <default applyOnUpdate="0" field="natural" expression=""/>
-    <default applyOnUpdate="0" field="office" expression=""/>
-    <default applyOnUpdate="0" field="place" expression=""/>
-    <default applyOnUpdate="0" field="shop" expression=""/>
-    <default applyOnUpdate="0" field="sport" expression=""/>
-    <default applyOnUpdate="0" field="tourism" expression=""/>
-    <default applyOnUpdate="0" field="other_tags" expression=""/>
-    <default applyOnUpdate="0" field="material" expression=""/>
-    <default applyOnUpdate="0" field="emergency" expression=""/>
-    <default applyOnUpdate="0" field="CLC:year" expression=""/>
-    <default applyOnUpdate="0" field="CLC:id" expression=""/>
-    <default applyOnUpdate="0" field="CLC:code" expression=""/>
-    <default applyOnUpdate="0" field="capacity" expression=""/>
-    <default applyOnUpdate="0" field="parking" expression=""/>
-    <default applyOnUpdate="0" field="highway" expression=""/>
-    <default applyOnUpdate="0" field="surface" expression=""/>
-    <default applyOnUpdate="0" field="leaf_type" expression=""/>
-    <default applyOnUpdate="0" field="wheelchair" expression=""/>
-    <default applyOnUpdate="0" field="wall" expression=""/>
-    <default applyOnUpdate="0" field="building:min_level" expression=""/>
-    <default applyOnUpdate="0" field="building:levels" expression=""/>
-    <default applyOnUpdate="0" field="roof:shape" expression=""/>
-    <default applyOnUpdate="0" field="roof:material" expression=""/>
-    <default applyOnUpdate="0" field="water" expression=""/>
-    <default applyOnUpdate="0" field="supervised" expression=""/>
-    <default applyOnUpdate="0" field="fee" expression=""/>
-    <default applyOnUpdate="0" field="description" expression=""/>
-    <default applyOnUpdate="0" field="access" expression=""/>
+    <default field="fid" expression="" applyOnUpdate="0"/>
+    <default field="osm_id" expression="" applyOnUpdate="0"/>
+    <default field="osm_way_id" expression="" applyOnUpdate="0"/>
+    <default field="name" expression="" applyOnUpdate="0"/>
+    <default field="type" expression="" applyOnUpdate="0"/>
+    <default field="aeroway" expression="" applyOnUpdate="0"/>
+    <default field="amenity" expression="" applyOnUpdate="0"/>
+    <default field="admin_level" expression="" applyOnUpdate="0"/>
+    <default field="barrier" expression="" applyOnUpdate="0"/>
+    <default field="boundary" expression="" applyOnUpdate="0"/>
+    <default field="building" expression="" applyOnUpdate="0"/>
+    <default field="craft" expression="" applyOnUpdate="0"/>
+    <default field="geological" expression="" applyOnUpdate="0"/>
+    <default field="historic" expression="" applyOnUpdate="0"/>
+    <default field="land_area" expression="" applyOnUpdate="0"/>
+    <default field="landuse" expression="" applyOnUpdate="0"/>
+    <default field="leisure" expression="" applyOnUpdate="0"/>
+    <default field="man_made" expression="" applyOnUpdate="0"/>
+    <default field="military" expression="" applyOnUpdate="0"/>
+    <default field="natural" expression="" applyOnUpdate="0"/>
+    <default field="office" expression="" applyOnUpdate="0"/>
+    <default field="place" expression="" applyOnUpdate="0"/>
+    <default field="shop" expression="" applyOnUpdate="0"/>
+    <default field="sport" expression="" applyOnUpdate="0"/>
+    <default field="tourism" expression="" applyOnUpdate="0"/>
+    <default field="other_tags" expression="" applyOnUpdate="0"/>
+    <default field="material" expression="" applyOnUpdate="0"/>
+    <default field="emergency" expression="" applyOnUpdate="0"/>
+    <default field="CLC:year" expression="" applyOnUpdate="0"/>
+    <default field="CLC:id" expression="" applyOnUpdate="0"/>
+    <default field="CLC:code" expression="" applyOnUpdate="0"/>
+    <default field="capacity" expression="" applyOnUpdate="0"/>
+    <default field="parking" expression="" applyOnUpdate="0"/>
+    <default field="highway" expression="" applyOnUpdate="0"/>
+    <default field="surface" expression="" applyOnUpdate="0"/>
+    <default field="leaf_type" expression="" applyOnUpdate="0"/>
+    <default field="wheelchair" expression="" applyOnUpdate="0"/>
+    <default field="wall" expression="" applyOnUpdate="0"/>
+    <default field="building:min_level" expression="" applyOnUpdate="0"/>
+    <default field="building:levels" expression="" applyOnUpdate="0"/>
+    <default field="roof:shape" expression="" applyOnUpdate="0"/>
+    <default field="roof:material" expression="" applyOnUpdate="0"/>
+    <default field="water" expression="" applyOnUpdate="0"/>
+    <default field="supervised" expression="" applyOnUpdate="0"/>
+    <default field="fee" expression="" applyOnUpdate="0"/>
+    <default field="description" expression="" applyOnUpdate="0"/>
+    <default field="access" expression="" applyOnUpdate="0"/>
   </defaults>
   <constraints>
-    <constraint unique_strength="1" notnull_strength="1" constraints="3" field="fid" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_way_id" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="aeroway" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="amenity" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="admin_level" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="barrier" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="boundary" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="craft" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="geological" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="historic" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="land_area" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="landuse" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="leisure" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="man_made" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="military" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="natural" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="office" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="place" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="shop" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="sport" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="tourism" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="other_tags" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="material" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="emergency" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="CLC:year" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="CLC:id" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="CLC:code" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="capacity" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="parking" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="highway" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="surface" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="leaf_type" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="wheelchair" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="wall" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building:min_level" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building:levels" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="roof:shape" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="roof:material" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="water" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="supervised" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fee" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="description" exp_strength="0"/>
-    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="access" exp_strength="0"/>
+    <constraint notnull_strength="1" constraints="3" field="fid" unique_strength="1" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="osm_id" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="osm_way_id" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="name" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="type" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="aeroway" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="amenity" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="admin_level" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="barrier" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="boundary" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="building" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="craft" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="geological" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="historic" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="land_area" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="landuse" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="leisure" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="man_made" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="military" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="natural" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="office" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="place" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="shop" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="sport" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="tourism" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="other_tags" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="material" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="emergency" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="CLC:year" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="CLC:id" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="CLC:code" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="capacity" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="parking" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="highway" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="surface" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="leaf_type" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="wheelchair" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="wall" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="building:min_level" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="building:levels" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="roof:shape" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="roof:material" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="water" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="supervised" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="fee" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="description" unique_strength="0" exp_strength="0"/>
+    <constraint notnull_strength="0" constraints="0" field="access" unique_strength="0" exp_strength="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint exp="" desc="" field="fid"/>
-    <constraint exp="" desc="" field="osm_id"/>
-    <constraint exp="" desc="" field="osm_way_id"/>
-    <constraint exp="" desc="" field="name"/>
-    <constraint exp="" desc="" field="type"/>
-    <constraint exp="" desc="" field="aeroway"/>
-    <constraint exp="" desc="" field="amenity"/>
-    <constraint exp="" desc="" field="admin_level"/>
-    <constraint exp="" desc="" field="barrier"/>
-    <constraint exp="" desc="" field="boundary"/>
-    <constraint exp="" desc="" field="building"/>
-    <constraint exp="" desc="" field="craft"/>
-    <constraint exp="" desc="" field="geological"/>
-    <constraint exp="" desc="" field="historic"/>
-    <constraint exp="" desc="" field="land_area"/>
-    <constraint exp="" desc="" field="landuse"/>
-    <constraint exp="" desc="" field="leisure"/>
-    <constraint exp="" desc="" field="man_made"/>
-    <constraint exp="" desc="" field="military"/>
-    <constraint exp="" desc="" field="natural"/>
-    <constraint exp="" desc="" field="office"/>
-    <constraint exp="" desc="" field="place"/>
-    <constraint exp="" desc="" field="shop"/>
-    <constraint exp="" desc="" field="sport"/>
-    <constraint exp="" desc="" field="tourism"/>
-    <constraint exp="" desc="" field="other_tags"/>
-    <constraint exp="" desc="" field="material"/>
-    <constraint exp="" desc="" field="emergency"/>
-    <constraint exp="" desc="" field="CLC:year"/>
-    <constraint exp="" desc="" field="CLC:id"/>
-    <constraint exp="" desc="" field="CLC:code"/>
-    <constraint exp="" desc="" field="capacity"/>
-    <constraint exp="" desc="" field="parking"/>
-    <constraint exp="" desc="" field="highway"/>
-    <constraint exp="" desc="" field="surface"/>
-    <constraint exp="" desc="" field="leaf_type"/>
-    <constraint exp="" desc="" field="wheelchair"/>
-    <constraint exp="" desc="" field="wall"/>
-    <constraint exp="" desc="" field="building:min_level"/>
-    <constraint exp="" desc="" field="building:levels"/>
-    <constraint exp="" desc="" field="roof:shape"/>
-    <constraint exp="" desc="" field="roof:material"/>
-    <constraint exp="" desc="" field="water"/>
-    <constraint exp="" desc="" field="supervised"/>
-    <constraint exp="" desc="" field="fee"/>
-    <constraint exp="" desc="" field="description"/>
-    <constraint exp="" desc="" field="access"/>
+    <constraint exp="" field="fid" desc=""/>
+    <constraint exp="" field="osm_id" desc=""/>
+    <constraint exp="" field="osm_way_id" desc=""/>
+    <constraint exp="" field="name" desc=""/>
+    <constraint exp="" field="type" desc=""/>
+    <constraint exp="" field="aeroway" desc=""/>
+    <constraint exp="" field="amenity" desc=""/>
+    <constraint exp="" field="admin_level" desc=""/>
+    <constraint exp="" field="barrier" desc=""/>
+    <constraint exp="" field="boundary" desc=""/>
+    <constraint exp="" field="building" desc=""/>
+    <constraint exp="" field="craft" desc=""/>
+    <constraint exp="" field="geological" desc=""/>
+    <constraint exp="" field="historic" desc=""/>
+    <constraint exp="" field="land_area" desc=""/>
+    <constraint exp="" field="landuse" desc=""/>
+    <constraint exp="" field="leisure" desc=""/>
+    <constraint exp="" field="man_made" desc=""/>
+    <constraint exp="" field="military" desc=""/>
+    <constraint exp="" field="natural" desc=""/>
+    <constraint exp="" field="office" desc=""/>
+    <constraint exp="" field="place" desc=""/>
+    <constraint exp="" field="shop" desc=""/>
+    <constraint exp="" field="sport" desc=""/>
+    <constraint exp="" field="tourism" desc=""/>
+    <constraint exp="" field="other_tags" desc=""/>
+    <constraint exp="" field="material" desc=""/>
+    <constraint exp="" field="emergency" desc=""/>
+    <constraint exp="" field="CLC:year" desc=""/>
+    <constraint exp="" field="CLC:id" desc=""/>
+    <constraint exp="" field="CLC:code" desc=""/>
+    <constraint exp="" field="capacity" desc=""/>
+    <constraint exp="" field="parking" desc=""/>
+    <constraint exp="" field="highway" desc=""/>
+    <constraint exp="" field="surface" desc=""/>
+    <constraint exp="" field="leaf_type" desc=""/>
+    <constraint exp="" field="wheelchair" desc=""/>
+    <constraint exp="" field="wall" desc=""/>
+    <constraint exp="" field="building:min_level" desc=""/>
+    <constraint exp="" field="building:levels" desc=""/>
+    <constraint exp="" field="roof:shape" desc=""/>
+    <constraint exp="" field="roof:material" desc=""/>
+    <constraint exp="" field="water" desc=""/>
+    <constraint exp="" field="supervised" desc=""/>
+    <constraint exp="" field="fee" desc=""/>
+    <constraint exp="" field="description" desc=""/>
+    <constraint exp="" field="access" desc=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting name="OpenStreetMap Browser" notificationMessage="" shortTitle="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" capture="0" icon="" type="5" id="{c1826141-af65-4158-9d0c-0f99a31810aa}" isEnabledOnlyWhenEditable="0">
-      <actionScope id="Canvas"/>
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+    <actionsetting name="OpenStreetMap Browser" icon="" id="{eeae89b0-cc81-409f-a078-37c2252ea1f2}" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" type="5" notificationMessage="" isEnabledOnlyWhenEditable="0" shortTitle="OpenStreetMap Browser" capture="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting name="Mapillary" notificationMessage="" shortTitle="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" type="1" id="{79012363-ee5d-4f7d-826b-3ef89370b129}" isEnabledOnlyWhenEditable="0">
-      <actionScope id="Canvas"/>
+    <actionsetting name="Mapillary" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" id="{9c9dfac5-b9b9-4701-a76d-537fcbbea06a}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" type="1" notificationMessage="" isEnabledOnlyWhenEditable="0" shortTitle="Mapillary" capture="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting name="JOSM" notificationMessage="" shortTitle="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" type="1" id="{5b0314d7-d914-4fa3-b7bd-feb8d0edf010}" isEnabledOnlyWhenEditable="0">
-      <actionScope id="Canvas"/>
+    <actionsetting name="JOSM" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" id="{eb5ffa5f-6912-4e4c-b899-fe0570fd5b52}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" type="1" notificationMessage="" isEnabledOnlyWhenEditable="0" shortTitle="JOSM" capture="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting name="User default editor" notificationMessage="" shortTitle="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" capture="0" icon="" type="5" id="{e0be7a76-e295-4b26-85a3-8c08e2b24abc}" isEnabledOnlyWhenEditable="0">
-      <actionScope id="Canvas"/>
+    <actionsetting name="User default editor" icon="" id="{038a02aa-45ea-4ebf-bdb8-ec3f894efd46}" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" type="5" notificationMessage="" isEnabledOnlyWhenEditable="0" shortTitle="User default editor" capture="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+  <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
     <columns>
-      <column name="osm_id" hidden="0" width="-1" type="field"/>
-      <column name="building" hidden="0" width="-1" type="field"/>
-      <column hidden="1" width="-1" type="actions"/>
-      <column name="name" hidden="0" width="-1" type="field"/>
-      <column name="leisure" hidden="0" width="-1" type="field"/>
-      <column name="fid" hidden="0" width="-1" type="field"/>
-      <column name="landuse" hidden="0" width="-1" type="field"/>
-      <column name="natural" hidden="0" width="-1" type="field"/>
-      <column name="boundary" hidden="0" width="-1" type="field"/>
-      <column name="type" hidden="0" width="-1" type="field"/>
-      <column name="osm_way_id" hidden="0" width="-1" type="field"/>
-      <column name="aeroway" hidden="0" width="-1" type="field"/>
-      <column name="amenity" hidden="0" width="-1" type="field"/>
-      <column name="admin_level" hidden="0" width="-1" type="field"/>
-      <column name="barrier" hidden="0" width="-1" type="field"/>
-      <column name="craft" hidden="0" width="-1" type="field"/>
-      <column name="geological" hidden="0" width="-1" type="field"/>
-      <column name="historic" hidden="0" width="-1" type="field"/>
-      <column name="land_area" hidden="0" width="-1" type="field"/>
-      <column name="man_made" hidden="0" width="-1" type="field"/>
-      <column name="military" hidden="0" width="-1" type="field"/>
-      <column name="office" hidden="0" width="-1" type="field"/>
-      <column name="place" hidden="0" width="-1" type="field"/>
-      <column name="shop" hidden="0" width="-1" type="field"/>
-      <column name="sport" hidden="0" width="-1" type="field"/>
-      <column name="tourism" hidden="0" width="-1" type="field"/>
-      <column name="other_tags" hidden="0" width="-1" type="field"/>
-      <column name="wall" hidden="0" width="-1" type="field"/>
-      <column name="description" hidden="0" width="-1" type="field"/>
-      <column name="fee" hidden="0" width="-1" type="field"/>
-      <column name="access" hidden="0" width="-1" type="field"/>
-      <column name="surface" hidden="0" width="-1" type="field"/>
-      <column name="highway" hidden="0" width="-1" type="field"/>
-      <column name="roof:shape" hidden="0" width="-1" type="field"/>
-      <column name="building:levels" hidden="0" width="-1" type="field"/>
-      <column name="leaf_type" hidden="0" width="-1" type="field"/>
-      <column name="CLC:year" hidden="0" width="-1" type="field"/>
-      <column name="CLC:id" hidden="0" width="-1" type="field"/>
-      <column name="CLC:code" hidden="0" width="-1" type="field"/>
-      <column name="material" hidden="0" width="-1" type="field"/>
-      <column name="emergency" hidden="0" width="-1" type="field"/>
-      <column name="capacity" hidden="0" width="-1" type="field"/>
-      <column name="parking" hidden="0" width="-1" type="field"/>
-      <column name="wheelchair" hidden="0" width="-1" type="field"/>
-      <column name="building:min_level" hidden="0" width="-1" type="field"/>
-      <column name="roof:material" hidden="0" width="-1" type="field"/>
-      <column name="water" hidden="0" width="-1" type="field"/>
-      <column name="supervised" hidden="0" width="-1" type="field"/>
+      <column name="osm_id" type="field" hidden="0" width="-1"/>
+      <column name="building" type="field" hidden="0" width="-1"/>
+      <column type="actions" hidden="1" width="-1"/>
+      <column name="name" type="field" hidden="0" width="-1"/>
+      <column name="leisure" type="field" hidden="0" width="-1"/>
+      <column name="fid" type="field" hidden="0" width="-1"/>
+      <column name="landuse" type="field" hidden="0" width="-1"/>
+      <column name="natural" type="field" hidden="0" width="-1"/>
+      <column name="boundary" type="field" hidden="0" width="-1"/>
+      <column name="type" type="field" hidden="0" width="-1"/>
+      <column name="osm_way_id" type="field" hidden="0" width="-1"/>
+      <column name="aeroway" type="field" hidden="0" width="-1"/>
+      <column name="amenity" type="field" hidden="0" width="-1"/>
+      <column name="admin_level" type="field" hidden="0" width="-1"/>
+      <column name="barrier" type="field" hidden="0" width="-1"/>
+      <column name="craft" type="field" hidden="0" width="-1"/>
+      <column name="geological" type="field" hidden="0" width="-1"/>
+      <column name="historic" type="field" hidden="0" width="-1"/>
+      <column name="land_area" type="field" hidden="0" width="-1"/>
+      <column name="man_made" type="field" hidden="0" width="-1"/>
+      <column name="military" type="field" hidden="0" width="-1"/>
+      <column name="office" type="field" hidden="0" width="-1"/>
+      <column name="place" type="field" hidden="0" width="-1"/>
+      <column name="shop" type="field" hidden="0" width="-1"/>
+      <column name="sport" type="field" hidden="0" width="-1"/>
+      <column name="tourism" type="field" hidden="0" width="-1"/>
+      <column name="other_tags" type="field" hidden="0" width="-1"/>
+      <column name="wall" type="field" hidden="0" width="-1"/>
+      <column name="description" type="field" hidden="0" width="-1"/>
+      <column name="fee" type="field" hidden="0" width="-1"/>
+      <column name="access" type="field" hidden="0" width="-1"/>
+      <column name="surface" type="field" hidden="0" width="-1"/>
+      <column name="highway" type="field" hidden="0" width="-1"/>
+      <column name="roof:shape" type="field" hidden="0" width="-1"/>
+      <column name="building:levels" type="field" hidden="0" width="-1"/>
+      <column name="leaf_type" type="field" hidden="0" width="-1"/>
+      <column name="CLC:year" type="field" hidden="0" width="-1"/>
+      <column name="CLC:id" type="field" hidden="0" width="-1"/>
+      <column name="CLC:code" type="field" hidden="0" width="-1"/>
+      <column name="material" type="field" hidden="0" width="-1"/>
+      <column name="emergency" type="field" hidden="0" width="-1"/>
+      <column name="capacity" type="field" hidden="0" width="-1"/>
+      <column name="parking" type="field" hidden="0" width="-1"/>
+      <column name="wheelchair" type="field" hidden="0" width="-1"/>
+      <column name="building:min_level" type="field" hidden="0" width="-1"/>
+      <column name="roof:material" type="field" hidden="0" width="-1"/>
+      <column name="water" type="field" hidden="0" width="-1"/>
+      <column name="supervised" type="field" hidden="0" width="-1"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1789,128 +1880,128 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field editable="1" name="CLC:code"/>
-    <field editable="1" name="CLC:id"/>
-    <field editable="1" name="CLC:year"/>
-    <field editable="1" name="access"/>
-    <field editable="1" name="addr:city"/>
-    <field editable="1" name="addr:housenumber"/>
-    <field editable="1" name="addr:postcode"/>
-    <field editable="1" name="addr:street"/>
-    <field editable="1" name="admin_level"/>
-    <field editable="1" name="admin_level_2"/>
-    <field editable="1" name="aeroway"/>
-    <field editable="1" name="aeroway_2"/>
-    <field editable="1" name="alt_name"/>
-    <field editable="1" name="amenity"/>
-    <field editable="1" name="amenity_2"/>
-    <field editable="1" name="barrier"/>
-    <field editable="1" name="barrier_2"/>
-    <field editable="1" name="blind"/>
-    <field editable="1" name="boundary"/>
-    <field editable="1" name="boundary_2"/>
-    <field editable="1" name="building"/>
-    <field editable="1" name="building:levels"/>
-    <field editable="1" name="building:min_level"/>
-    <field editable="1" name="building_2"/>
-    <field editable="1" name="capacity"/>
-    <field editable="1" name="check_date:opening_hours"/>
-    <field editable="1" name="contact:housenumber"/>
-    <field editable="1" name="contact:phone"/>
-    <field editable="1" name="contact:street"/>
-    <field editable="1" name="craft"/>
-    <field editable="1" name="craft_2"/>
-    <field editable="1" name="crop"/>
-    <field editable="1" name="denomination"/>
-    <field editable="1" name="description"/>
-    <field editable="1" name="disused:amenity"/>
-    <field editable="1" name="emergency"/>
-    <field editable="1" name="fee"/>
-    <field editable="1" name="female"/>
-    <field editable="1" name="fence_type"/>
-    <field editable="1" name="fid"/>
-    <field editable="1" name="full_id"/>
-    <field editable="1" name="garden:style"/>
-    <field editable="1" name="garden:type"/>
-    <field editable="1" name="geological"/>
-    <field editable="1" name="geological_2"/>
-    <field editable="1" name="height"/>
-    <field editable="1" name="highway"/>
-    <field editable="1" name="historic"/>
-    <field editable="1" name="historic_2"/>
-    <field editable="1" name="land_area"/>
-    <field editable="1" name="land_area_2"/>
-    <field editable="1" name="landuse"/>
-    <field editable="1" name="landuse_2"/>
-    <field editable="1" name="leaf_type"/>
-    <field editable="1" name="leisure"/>
-    <field editable="1" name="leisure_2"/>
-    <field editable="1" name="male"/>
-    <field editable="1" name="man_made"/>
-    <field editable="1" name="man_made_2"/>
-    <field editable="1" name="material"/>
-    <field editable="1" name="max_age"/>
-    <field editable="1" name="military"/>
-    <field editable="1" name="military_2"/>
-    <field editable="1" name="min_age"/>
-    <field editable="1" name="name"/>
-    <field editable="1" name="name:oc"/>
-    <field editable="1" name="name_2"/>
-    <field editable="1" name="natural"/>
-    <field editable="1" name="natural_2"/>
-    <field editable="1" name="office"/>
-    <field editable="1" name="office_2"/>
-    <field editable="1" name="opening_hours"/>
-    <field editable="1" name="operator"/>
-    <field editable="1" name="operator:type"/>
-    <field editable="1" name="operator_type"/>
-    <field editable="1" name="osm_id"/>
-    <field editable="1" name="osm_id_2"/>
-    <field editable="1" name="osm_type"/>
-    <field editable="1" name="osm_way_id"/>
-    <field editable="1" name="osm_way_id_2"/>
-    <field editable="1" name="other_tags"/>
-    <field editable="1" name="other_tags_2"/>
-    <field editable="1" name="parking"/>
-    <field editable="1" name="phone"/>
-    <field editable="1" name="place"/>
-    <field editable="1" name="place_2"/>
-    <field editable="1" name="political_division"/>
-    <field editable="1" name="population"/>
-    <field editable="1" name="postal_code"/>
-    <field editable="1" name="ref:FR:FINESS"/>
-    <field editable="1" name="ref:FR:SIRET"/>
-    <field editable="1" name="ref:INSEE"/>
-    <field editable="1" name="ref:UAI"/>
-    <field editable="1" name="religion"/>
-    <field editable="1" name="roof:levels"/>
-    <field editable="1" name="roof:material"/>
-    <field editable="1" name="roof:shape"/>
-    <field editable="1" name="school:FR"/>
-    <field editable="1" name="shop"/>
-    <field editable="1" name="shop_2"/>
-    <field editable="1" name="short_name"/>
-    <field editable="1" name="social_facility"/>
-    <field editable="1" name="social_facility:for"/>
-    <field editable="1" name="source:name:oc"/>
-    <field editable="1" name="source:population"/>
-    <field editable="1" name="source:url"/>
-    <field editable="1" name="sport"/>
-    <field editable="1" name="sport_2"/>
-    <field editable="1" name="start_date"/>
-    <field editable="1" name="street_cabinet"/>
-    <field editable="1" name="supervised"/>
-    <field editable="1" name="surface"/>
-    <field editable="1" name="tourism"/>
-    <field editable="1" name="tourism_2"/>
-    <field editable="1" name="type"/>
-    <field editable="1" name="type_2"/>
-    <field editable="1" name="wall"/>
-    <field editable="1" name="water"/>
-    <field editable="1" name="waterway"/>
-    <field editable="1" name="wheelchair"/>
-    <field editable="1" name="wikidata"/>
-    <field editable="1" name="wikipedia"/>
+    <field name="CLC:code" editable="1"/>
+    <field name="CLC:id" editable="1"/>
+    <field name="CLC:year" editable="1"/>
+    <field name="access" editable="1"/>
+    <field name="addr:city" editable="1"/>
+    <field name="addr:housenumber" editable="1"/>
+    <field name="addr:postcode" editable="1"/>
+    <field name="addr:street" editable="1"/>
+    <field name="admin_level" editable="1"/>
+    <field name="admin_level_2" editable="1"/>
+    <field name="aeroway" editable="1"/>
+    <field name="aeroway_2" editable="1"/>
+    <field name="alt_name" editable="1"/>
+    <field name="amenity" editable="1"/>
+    <field name="amenity_2" editable="1"/>
+    <field name="barrier" editable="1"/>
+    <field name="barrier_2" editable="1"/>
+    <field name="blind" editable="1"/>
+    <field name="boundary" editable="1"/>
+    <field name="boundary_2" editable="1"/>
+    <field name="building" editable="1"/>
+    <field name="building:levels" editable="1"/>
+    <field name="building:min_level" editable="1"/>
+    <field name="building_2" editable="1"/>
+    <field name="capacity" editable="1"/>
+    <field name="check_date:opening_hours" editable="1"/>
+    <field name="contact:housenumber" editable="1"/>
+    <field name="contact:phone" editable="1"/>
+    <field name="contact:street" editable="1"/>
+    <field name="craft" editable="1"/>
+    <field name="craft_2" editable="1"/>
+    <field name="crop" editable="1"/>
+    <field name="denomination" editable="1"/>
+    <field name="description" editable="1"/>
+    <field name="disused:amenity" editable="1"/>
+    <field name="emergency" editable="1"/>
+    <field name="fee" editable="1"/>
+    <field name="female" editable="1"/>
+    <field name="fence_type" editable="1"/>
+    <field name="fid" editable="1"/>
+    <field name="full_id" editable="1"/>
+    <field name="garden:style" editable="1"/>
+    <field name="garden:type" editable="1"/>
+    <field name="geological" editable="1"/>
+    <field name="geological_2" editable="1"/>
+    <field name="height" editable="1"/>
+    <field name="highway" editable="1"/>
+    <field name="historic" editable="1"/>
+    <field name="historic_2" editable="1"/>
+    <field name="land_area" editable="1"/>
+    <field name="land_area_2" editable="1"/>
+    <field name="landuse" editable="1"/>
+    <field name="landuse_2" editable="1"/>
+    <field name="leaf_type" editable="1"/>
+    <field name="leisure" editable="1"/>
+    <field name="leisure_2" editable="1"/>
+    <field name="male" editable="1"/>
+    <field name="man_made" editable="1"/>
+    <field name="man_made_2" editable="1"/>
+    <field name="material" editable="1"/>
+    <field name="max_age" editable="1"/>
+    <field name="military" editable="1"/>
+    <field name="military_2" editable="1"/>
+    <field name="min_age" editable="1"/>
+    <field name="name" editable="1"/>
+    <field name="name:oc" editable="1"/>
+    <field name="name_2" editable="1"/>
+    <field name="natural" editable="1"/>
+    <field name="natural_2" editable="1"/>
+    <field name="office" editable="1"/>
+    <field name="office_2" editable="1"/>
+    <field name="opening_hours" editable="1"/>
+    <field name="operator" editable="1"/>
+    <field name="operator:type" editable="1"/>
+    <field name="operator_type" editable="1"/>
+    <field name="osm_id" editable="1"/>
+    <field name="osm_id_2" editable="1"/>
+    <field name="osm_type" editable="1"/>
+    <field name="osm_way_id" editable="1"/>
+    <field name="osm_way_id_2" editable="1"/>
+    <field name="other_tags" editable="1"/>
+    <field name="other_tags_2" editable="1"/>
+    <field name="parking" editable="1"/>
+    <field name="phone" editable="1"/>
+    <field name="place" editable="1"/>
+    <field name="place_2" editable="1"/>
+    <field name="political_division" editable="1"/>
+    <field name="population" editable="1"/>
+    <field name="postal_code" editable="1"/>
+    <field name="ref:FR:FINESS" editable="1"/>
+    <field name="ref:FR:SIRET" editable="1"/>
+    <field name="ref:INSEE" editable="1"/>
+    <field name="ref:UAI" editable="1"/>
+    <field name="religion" editable="1"/>
+    <field name="roof:levels" editable="1"/>
+    <field name="roof:material" editable="1"/>
+    <field name="roof:shape" editable="1"/>
+    <field name="school:FR" editable="1"/>
+    <field name="shop" editable="1"/>
+    <field name="shop_2" editable="1"/>
+    <field name="short_name" editable="1"/>
+    <field name="social_facility" editable="1"/>
+    <field name="social_facility:for" editable="1"/>
+    <field name="source:name:oc" editable="1"/>
+    <field name="source:population" editable="1"/>
+    <field name="source:url" editable="1"/>
+    <field name="sport" editable="1"/>
+    <field name="sport_2" editable="1"/>
+    <field name="start_date" editable="1"/>
+    <field name="street_cabinet" editable="1"/>
+    <field name="supervised" editable="1"/>
+    <field name="surface" editable="1"/>
+    <field name="tourism" editable="1"/>
+    <field name="tourism_2" editable="1"/>
+    <field name="type" editable="1"/>
+    <field name="type_2" editable="1"/>
+    <field name="wall" editable="1"/>
+    <field name="water" editable="1"/>
+    <field name="waterway" editable="1"/>
+    <field name="wheelchair" editable="1"/>
+    <field name="wikidata" editable="1"/>
+    <field name="wikipedia" editable="1"/>
   </editable>
   <labelOnTop>
     <field name="CLC:code" labelOnTop="0"/>