From fb1904659c79b1a73a43997ff9a355dd2e6ddef9 Mon Sep 17 00:00:00 2001
From: Jouski <arnaud.champollion@linux-alpes.org>
Date: Wed, 3 Mar 2021 16:52:25 +0100
Subject: [PATCH] MAJ multipolygon.qml

---
 styles/multipolygon.qml | 1929 ++++++++++++++++++++++-----------------
 1 file changed, 1067 insertions(+), 862 deletions(-)

diff --git a/styles/multipolygon.qml b/styles/multipolygon.qml
index 0c37067..568ae40 100644
--- a/styles/multipolygon.qml
+++ b/styles/multipolygon.qml
@@ -1,17 +1,11 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis readOnly="0" labelsEnabled="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" simplifyDrawingTol="1" simplifyAlgorithm="0" version="3.16.3-Hannover" maxScale="0">
+<qgis simplifyDrawingTol="1" simplifyLocal="1" simplifyMaxScale="1" readOnly="0" maxScale="0" minScale="1e+08" simplifyAlgorithm="0" styleCategories="AllStyleCategories" simplifyDrawingHints="1" version="3.10.4-A Coruña" labelsEnabled="0" hasScaleBasedVisibilityFlag="0">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <temporal accumulate="0" endField="" mode="0" fixedDuration="0" enabled="0" startExpression="" endExpression="" startField="" durationUnit="min" durationField="">
-    <fixedRange>
-      <start></start>
-      <end></end>
-    </fixedRange>
-  </temporal>
-  <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" type="RuleRenderer">
+  <renderer-v2 forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="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)" symbol="0" label="bâtiment" key="{f69f1a82-2331-4139-9487-e27714a58a63}"/>
       <rule filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" symbol="1" label="toit,auvent,préau" key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}"/>
@@ -26,10 +20,12 @@
       <rule filter="&quot;landuse&quot;='farmland'" symbol="10" label="champ" key="{b908d622-4193-4ced-8781-7bb5b8930e60}"/>
       <rule filter="&quot;leisure&quot;='pitch'" symbol="11" label="terrain" key="{074e0ef0-f2ea-480e-88de-08dda8d27bf6}"/>
       <rule filter="&quot;surface&quot;='compacted'" symbol="12" label="sable compact" key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}"/>
+      <rule filter="&quot;leisure&quot;='garden'" symbol="13" label="jardin" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}"/>
+      <rule filter="&quot;area:highway&quot;='path'" symbol="14" label="chemin" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}"/>
     </rules>
     <symbols>
-      <symbol name="0" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="0" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
           <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"/>
@@ -43,13 +39,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="LinePatternFill" enabled="1">
+        <layer locked="0" pass="0" enabled="1" class="LinePatternFill">
           <prop v="45" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="1" k="distance"/>
@@ -65,21 +61,17 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@0@1" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-            <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-              <prop v="0" k="align_dash_pattern"/>
+          <symbol force_rhr="0" type="line" clip_to_extent="1" name="@0@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <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="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
               <prop v="0" k="draw_inside_polygon"/>
               <prop v="bevel" k="joinstyle"/>
               <prop v="0,0,0,255" k="line_color"/>
@@ -90,22 +82,21 @@
               <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="tweak_dash_pattern_on_corners"/>
               <prop v="0" k="use_custom_dash"/>
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol name="1" force_rhr="0" clip_to_extent="1" alpha="0.5" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="1" alpha="0.5">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
           <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"/>
@@ -119,13 +110,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="LinePatternFill" enabled="1">
+        <layer locked="0" pass="0" enabled="1" class="LinePatternFill">
           <prop v="45" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="3" k="distance"/>
@@ -141,21 +132,17 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@1@1" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-            <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-              <prop v="0" k="align_dash_pattern"/>
+          <symbol force_rhr="0" type="line" clip_to_extent="1" name="@1@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <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="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
               <prop v="0" k="draw_inside_polygon"/>
               <prop v="bevel" k="joinstyle"/>
               <prop v="0,0,0,255" k="line_color"/>
@@ -166,22 +153,21 @@
               <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="tweak_dash_pattern_on_corners"/>
               <prop v="0" k="use_custom_dash"/>
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol name="10" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="10" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
           <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"/>
@@ -195,13 +181,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SVGFill" enabled="1">
+        <layer locked="0" pass="0" enabled="1" class="SVGFill">
           <prop v="0" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="35,35,35,255" k="outline_color"/>
@@ -216,21 +202,17 @@
           <prop v="6" k="width"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@10@1" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-            <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-              <prop v="0" k="align_dash_pattern"/>
+          <symbol force_rhr="0" type="line" clip_to_extent="1" name="@10@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <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="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
               <prop v="0" k="draw_inside_polygon"/>
               <prop v="bevel" k="joinstyle"/>
               <prop v="35,35,35,255" k="line_color"/>
@@ -241,22 +223,21 @@
               <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="tweak_dash_pattern_on_corners"/>
               <prop v="0" k="use_custom_dash"/>
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol name="11" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="10" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="11" alpha="1">
+        <layer locked="0" pass="10" enabled="1" class="SimpleFill">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -270,15 +251,15 @@
           <prop v="no" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol name="12" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SVGFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="12" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SVGFill">
           <prop v="0" k="angle"/>
           <prop v="183,72,75,255" k="color"/>
           <prop v="35,35,35,255" k="outline_color"/>
@@ -293,21 +274,17 @@
           <prop v="20" k="width"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@12@0" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-            <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-              <prop v="0" k="align_dash_pattern"/>
+          <symbol force_rhr="0" type="line" clip_to_extent="1" name="@12@0" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
               <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="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_unit"/>
               <prop v="0" k="draw_inside_polygon"/>
               <prop v="bevel" k="joinstyle"/>
               <prop v="35,35,35,255" k="line_color"/>
@@ -318,278 +295,21 @@
               <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="tweak_dash_pattern_on_corners"/>
               <prop v="0" k="use_custom_dash"/>
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol name="2" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
-          <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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-        <layer pass="0" locked="0" class="LinePatternFill" enabled="1">
-          <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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <symbol name="@2@1" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-            <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-              <prop v="0" k="align_dash_pattern"/>
-              <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="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_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="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </layer>
-      </symbol>
-      <symbol name="3" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
-          <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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-        <layer pass="0" locked="0" class="LinePatternFill" enabled="1">
-          <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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <symbol name="@3@1" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-            <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-              <prop v="0" k="align_dash_pattern"/>
-              <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="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_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="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </layer>
-        <layer pass="0" locked="0" class="LinePatternFill" enabled="1">
-          <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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <symbol name="@3@2" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-            <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-              <prop v="0" k="align_dash_pattern"/>
-              <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="dash_pattern_offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-              <prop v="MM" k="dash_pattern_offset_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="tweak_dash_pattern_on_corners"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </layer>
-        <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-          <prop v="0" k="align_dash_pattern"/>
-          <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="dash_pattern_offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-          <prop v="MM" k="dash_pattern_offset_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="tweak_dash_pattern_on_corners"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol name="4" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
-          <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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-        <layer pass="0" locked="0" class="PointPatternFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="13" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="PointPatternFill">
           <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"/>
@@ -612,13 +332,356 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@4@1" force_rhr="0" clip_to_extent="1" alpha="1" type="marker">
-            <layer pass="0" locked="0" class="SimpleMarker" enabled="1">
+          <symbol force_rhr="0" type="marker" clip_to_extent="1" name="@13@0" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
+              <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"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+        <layer locked="0" pass="0" enabled="1" class="SimpleLine">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="14" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="2" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+        <layer locked="0" pass="0" enabled="1" class="LinePatternFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="line" clip_to_extent="1" name="@2@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
+              <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"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="3" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+        <layer locked="0" pass="0" enabled="1" class="LinePatternFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="line" clip_to_extent="1" name="@3@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
+              <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"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+        <layer locked="0" pass="0" enabled="1" class="LinePatternFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="line" clip_to_extent="1" name="@3@2" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine">
+              <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"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+        <layer locked="0" pass="0" enabled="1" class="SimpleLine">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="4" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+        <layer locked="0" pass="0" enabled="1" class="PointPatternFill">
+          <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"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="marker" clip_to_extent="1" name="@4@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -639,17 +702,17 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol name="5" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="5" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
           <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"/>
@@ -663,15 +726,15 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol name="6" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="6" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
           <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"/>
@@ -685,13 +748,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="PointPatternFill" enabled="1">
+        <layer locked="0" pass="0" enabled="1" class="PointPatternFill">
           <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"/>
@@ -714,13 +777,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@6@1" force_rhr="0" clip_to_extent="1" alpha="1" type="marker">
-            <layer pass="0" locked="0" class="SimpleMarker" enabled="1">
+          <symbol force_rhr="0" type="marker" clip_to_extent="1" name="@6@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -741,23 +804,19 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-          <prop v="0" k="align_dash_pattern"/>
+        <layer locked="0" pass="0" enabled="1" class="SimpleLine">
           <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="dash_pattern_offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-          <prop v="MM" k="dash_pattern_offset_unit"/>
           <prop v="0" k="draw_inside_polygon"/>
           <prop v="bevel" k="joinstyle"/>
           <prop v="0,0,0,255" k="line_color"/>
@@ -768,20 +827,19 @@
           <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="tweak_dash_pattern_on_corners"/>
           <prop v="0" k="use_custom_dash"/>
           <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol name="7" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="7" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
           <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"/>
@@ -795,13 +853,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="PointPatternFill" enabled="1">
+        <layer locked="0" pass="0" enabled="1" class="PointPatternFill">
           <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"/>
@@ -824,13 +882,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@7@1" force_rhr="0" clip_to_extent="1" alpha="1" type="marker">
-            <layer pass="0" locked="0" class="SimpleMarker" enabled="1">
+          <symbol force_rhr="0" type="marker" clip_to_extent="1" name="@7@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -851,17 +909,17 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol name="8" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="10" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="8" alpha="1">
+        <layer locked="0" pass="10" enabled="1" class="SimpleFill">
           <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"/>
@@ -875,13 +933,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="10" locked="0" class="PointPatternFill" enabled="1">
+        <layer locked="0" pass="10" enabled="1" class="PointPatternFill">
           <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"/>
@@ -904,13 +962,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@8@1" force_rhr="0" clip_to_extent="1" alpha="1" type="marker">
-            <layer pass="0" locked="0" class="SimpleMarker" enabled="1">
+          <symbol force_rhr="0" type="marker" clip_to_extent="1" name="@8@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -931,23 +989,19 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer pass="10" locked="0" class="SimpleLine" enabled="1">
-          <prop v="0" k="align_dash_pattern"/>
+        <layer locked="0" pass="10" enabled="1" class="SimpleLine">
           <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="dash_pattern_offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-          <prop v="MM" k="dash_pattern_offset_unit"/>
           <prop v="0" k="draw_inside_polygon"/>
           <prop v="bevel" k="joinstyle"/>
           <prop v="77,175,74,255" k="line_color"/>
@@ -958,31 +1012,28 @@
           <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="tweak_dash_pattern_on_corners"/>
           <prop v="0" k="use_custom_dash"/>
           <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="10" locked="0" class="CentroidFill" enabled="1">
-          <prop v="0" k="clip_on_current_part_only"/>
-          <prop v="0" k="clip_points"/>
+        <layer locked="0" pass="10" enabled="1" class="CentroidFill">
           <prop v="1" k="point_on_all_parts"/>
           <prop v="0" k="point_on_surface"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@8@3" force_rhr="0" clip_to_extent="1" alpha="1" type="marker">
-            <layer pass="0" locked="0" class="SvgMarker" enabled="1">
+          <symbol force_rhr="0" type="marker" clip_to_extent="1" name="@8@3" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker">
               <prop v="0" k="angle"/>
               <prop v="255,0,0,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -1002,17 +1053,17 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol name="9" force_rhr="0" clip_to_extent="1" alpha="1" type="fill">
-        <layer pass="0" locked="0" class="SimpleFill" enabled="1">
+      <symbol force_rhr="0" type="fill" clip_to_extent="1" name="9" alpha="1">
+        <layer locked="0" pass="0" enabled="1" class="SimpleFill">
           <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"/>
@@ -1026,31 +1077,28 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="CentroidFill" enabled="1">
-          <prop v="0" k="clip_on_current_part_only"/>
-          <prop v="0" k="clip_points"/>
+        <layer locked="0" pass="0" enabled="1" class="CentroidFill">
           <prop v="1" k="point_on_all_parts"/>
           <prop v="0" k="point_on_surface"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol name="@9@1" force_rhr="0" clip_to_extent="1" alpha="1" type="marker">
-            <layer pass="0" locked="0" class="FontMarker" enabled="1">
+          <symbol force_rhr="0" type="marker" clip_to_extent="1" name="@9@1" alpha="1">
+            <layer locked="0" pass="0" enabled="1" class="FontMarker">
               <prop v="0" k="angle"/>
               <prop v="P" k="chr"/>
               <prop v="7,60,255,255" k="color"/>
               <prop v="Liberation Sans" k="font"/>
-              <prop v="" k="font_style"/>
               <prop v="1" k="horizontal_anchor_point"/>
               <prop v="bevel" k="joinstyle"/>
               <prop v="0,0" k="offset"/>
@@ -1066,9 +1114,9 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1078,7 +1126,9 @@
     </symbols>
   </renderer-v2>
   <customproperties>
-    <property value="description" key="dualview/previewExpressions"/>
+    <property key="dualview/previewExpressions">
+      <value>description</value>
+    </property>
     <property value="0" key="embeddedWidgets/count"/>
     <property key="variableNames">
       <value>qgis_25d_angle</value>
@@ -1136,419 +1186,460 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory labelPlacementMethod="XHeight" rotationOffset="270" scaleBasedVisibility="0" scaleDependency="Area" backgroundAlpha="255" width="15" direction="1" penWidth="0" sizeScale="3x:0,0,0,0,0,0" opacity="1" minScaleDenominator="0" enabled="0" maxScaleDenominator="1e+8" backgroundColor="#ffffff" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" barWidth="5" sizeType="MM" minimumSize="0" height="15" showAxis="0" penAlpha="255">
-      <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-      <attribute field="" color="#000000" label=""/>
-      <axisSymbol>
-        <symbol name="" force_rhr="0" clip_to_extent="1" alpha="1" type="line">
-          <layer pass="0" locked="0" class="SimpleLine" enabled="1">
-            <prop v="0" k="align_dash_pattern"/>
-            <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="dash_pattern_offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-            <prop v="MM" k="dash_pattern_offset_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="tweak_dash_pattern_on_corners"/>
-            <prop v="0" k="use_custom_dash"/>
-            <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" value="" type="QString"/>
-                <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-      </axisSymbol>
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory rotationOffset="270" diagramOrientation="Up" minimumSize="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" opacity="1" sizeType="MM" barWidth="5" penWidth="0" backgroundColor="#ffffff" enabled="0" width="15" scaleBasedVisibility="0" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" penColor="#000000" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" backgroundAlpha="255" minScaleDenominator="0" height="15">
+      <fontProperties style="" description="Liberation Sans,10,-1,5,50,0,0,0,0,0"/>
+      <attribute color="#000000" field="" label=""/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings showAll="1" obstacle="0" priority="0" placement="1" linePlacementFlags="18" dist="0" zIndex="0">
+  <DiagramLayerSettings zIndex="0" showAll="1" placement="1" obstacle="0" priority="0" dist="0" linePlacementFlags="18">
     <properties>
       <Option type="Map">
-        <Option name="name" value="" type="QString"/>
+        <Option value="" type="QString" name="name"/>
         <Option name="properties"/>
-        <Option name="type" value="collection" type="QString"/>
+        <Option value="collection" type="QString" name="type"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
   <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
     <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 type="Map" name="QgsGeometryGapCheck">
+        <Option value="0" type="double" name="allowedGapsBuffer"/>
+        <Option value="false" type="bool" name="allowedGapsEnabled"/>
+        <Option value="" type="QString" name="allowedGapsLayer"/>
       </Option>
     </checkConfiguration>
   </geometryOptions>
-  <legend type="default-vector"/>
-  <referencedLayers/>
   <fieldConfiguration>
-    <field name="fid" configurationFlags="None">
+    <field name="fid">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_id" configurationFlags="None">
+    <field name="osm_id">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_way_id" configurationFlags="None">
+    <field name="osm_way_id">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="name" configurationFlags="None">
+    <field name="name">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="type" configurationFlags="None">
+    <field name="type">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="aeroway" configurationFlags="None">
+    <field name="aeroway">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="amenity" configurationFlags="None">
+    <field name="amenity">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="admin_level" configurationFlags="None">
+    <field name="admin_level">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="barrier" configurationFlags="None">
+    <field name="barrier">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="boundary" configurationFlags="None">
+    <field name="boundary">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="building" configurationFlags="None">
+    <field name="building">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="craft" configurationFlags="None">
+    <field name="craft">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="geological" configurationFlags="None">
+    <field name="geological">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="historic" configurationFlags="None">
+    <field name="historic">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="land_area" configurationFlags="None">
+    <field name="land_area">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="landuse" configurationFlags="None">
+    <field name="landuse">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="leisure" configurationFlags="None">
+    <field name="leisure">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="man_made" configurationFlags="None">
+    <field name="man_made">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="military" configurationFlags="None">
+    <field name="military">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="natural" configurationFlags="None">
+    <field name="natural">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="office" configurationFlags="None">
+    <field name="office">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="place" configurationFlags="None">
+    <field name="place">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="shop" configurationFlags="None">
+    <field name="shop">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="sport" configurationFlags="None">
+    <field name="sport">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="tourism" configurationFlags="None">
+    <field name="tourism">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="other_tags" configurationFlags="None">
+    <field name="other_tags">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="social_facility:for" configurationFlags="None">
+    <field name="osm_id_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="social_facility" configurationFlags="None">
+    <field name="osm_way_id_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="short_name" configurationFlags="None">
+    <field name="name_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref:FR:SIRET" configurationFlags="None">
+    <field name="type_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref:FR:FINESS" configurationFlags="None">
+    <field name="aeroway_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="phone" configurationFlags="None">
+    <field name="amenity_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="access" configurationFlags="None">
+    <field name="admin_level_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="school:FR" configurationFlags="None">
+    <field name="barrier_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref:UAI" configurationFlags="None">
+    <field name="boundary_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="operator:type" configurationFlags="None">
+    <field name="building_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="contact:phone" configurationFlags="None">
+    <field name="craft_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="addr:street" configurationFlags="None">
+    <field name="geological_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="addr:housenumber" configurationFlags="None">
+    <field name="historic_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="religion" configurationFlags="None">
+    <field name="land_area_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="denomination" configurationFlags="None">
+    <field name="landuse_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="alt_name" configurationFlags="None">
+    <field name="leisure_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wall" configurationFlags="None">
+    <field name="man_made_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wikipedia" configurationFlags="None">
+    <field name="military_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wikidata" configurationFlags="None">
+    <field name="natural_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="source:population" configurationFlags="None">
+    <field name="office_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="source:name:oc" configurationFlags="None">
+    <field name="place_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref:INSEE" configurationFlags="None">
+    <field name="shop_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="postal_code" configurationFlags="None">
+    <field name="sport_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="population" configurationFlags="None">
+    <field name="tourism_2">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="name:oc" configurationFlags="None">
+    <field name="other_tags_2">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="height">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="garden:type">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="garden:style">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="crop">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="school:FR">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="ref:UAI">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="description">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="addr:street">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="addr:postcode">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="addr:city">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="wall">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1557,295 +1648,352 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias name="" field="fid" index="0"/>
-    <alias name="" field="osm_id" index="1"/>
-    <alias name="" field="osm_way_id" index="2"/>
-    <alias name="" field="name" index="3"/>
-    <alias name="" field="type" index="4"/>
-    <alias name="" field="aeroway" index="5"/>
-    <alias name="" field="amenity" index="6"/>
-    <alias name="" field="admin_level" index="7"/>
-    <alias name="" field="barrier" index="8"/>
-    <alias name="" field="boundary" index="9"/>
-    <alias name="" field="building" index="10"/>
-    <alias name="" field="craft" index="11"/>
-    <alias name="" field="geological" index="12"/>
-    <alias name="" field="historic" index="13"/>
-    <alias name="" field="land_area" index="14"/>
-    <alias name="" field="landuse" index="15"/>
-    <alias name="" field="leisure" index="16"/>
-    <alias name="" field="man_made" index="17"/>
-    <alias name="" field="military" index="18"/>
-    <alias name="" field="natural" index="19"/>
-    <alias name="" field="office" index="20"/>
-    <alias name="" field="place" index="21"/>
-    <alias name="" field="shop" index="22"/>
-    <alias name="" field="sport" index="23"/>
-    <alias name="" field="tourism" index="24"/>
-    <alias name="" field="other_tags" index="25"/>
-    <alias name="" field="social_facility:for" index="26"/>
-    <alias name="" field="social_facility" index="27"/>
-    <alias name="" field="short_name" index="28"/>
-    <alias name="" field="ref:FR:SIRET" index="29"/>
-    <alias name="" field="ref:FR:FINESS" index="30"/>
-    <alias name="" field="phone" index="31"/>
-    <alias name="" field="access" index="32"/>
-    <alias name="" field="school:FR" index="33"/>
-    <alias name="" field="ref:UAI" index="34"/>
-    <alias name="" field="operator:type" index="35"/>
-    <alias name="" field="contact:phone" index="36"/>
-    <alias name="" field="addr:street" index="37"/>
-    <alias name="" field="addr:housenumber" index="38"/>
-    <alias name="" field="religion" index="39"/>
-    <alias name="" field="denomination" index="40"/>
-    <alias name="" field="alt_name" index="41"/>
-    <alias name="" field="wall" index="42"/>
-    <alias name="" field="wikipedia" index="43"/>
-    <alias name="" field="wikidata" index="44"/>
-    <alias name="" field="source:population" index="45"/>
-    <alias name="" field="source:name:oc" index="46"/>
-    <alias name="" field="ref:INSEE" index="47"/>
-    <alias name="" field="postal_code" index="48"/>
-    <alias name="" field="population" index="49"/>
-    <alias name="" field="name:oc" index="50"/>
+    <alias field="fid" index="0" name=""/>
+    <alias field="osm_id" index="1" name=""/>
+    <alias field="osm_way_id" index="2" name=""/>
+    <alias field="name" index="3" name=""/>
+    <alias field="type" index="4" name=""/>
+    <alias field="aeroway" index="5" name=""/>
+    <alias field="amenity" index="6" name=""/>
+    <alias field="admin_level" index="7" name=""/>
+    <alias field="barrier" index="8" name=""/>
+    <alias field="boundary" index="9" name=""/>
+    <alias field="building" index="10" name=""/>
+    <alias field="craft" index="11" name=""/>
+    <alias field="geological" index="12" name=""/>
+    <alias field="historic" index="13" name=""/>
+    <alias field="land_area" index="14" name=""/>
+    <alias field="landuse" index="15" name=""/>
+    <alias field="leisure" index="16" name=""/>
+    <alias field="man_made" index="17" name=""/>
+    <alias field="military" index="18" name=""/>
+    <alias field="natural" index="19" name=""/>
+    <alias field="office" index="20" name=""/>
+    <alias field="place" index="21" name=""/>
+    <alias field="shop" index="22" name=""/>
+    <alias field="sport" index="23" name=""/>
+    <alias field="tourism" index="24" name=""/>
+    <alias field="other_tags" index="25" name=""/>
+    <alias field="osm_id_2" index="26" name=""/>
+    <alias field="osm_way_id_2" index="27" name=""/>
+    <alias field="name_2" index="28" name=""/>
+    <alias field="type_2" index="29" name=""/>
+    <alias field="aeroway_2" index="30" name=""/>
+    <alias field="amenity_2" index="31" name=""/>
+    <alias field="admin_level_2" index="32" name=""/>
+    <alias field="barrier_2" index="33" name=""/>
+    <alias field="boundary_2" index="34" name=""/>
+    <alias field="building_2" index="35" name=""/>
+    <alias field="craft_2" index="36" name=""/>
+    <alias field="geological_2" index="37" name=""/>
+    <alias field="historic_2" index="38" name=""/>
+    <alias field="land_area_2" index="39" name=""/>
+    <alias field="landuse_2" index="40" name=""/>
+    <alias field="leisure_2" index="41" name=""/>
+    <alias field="man_made_2" index="42" name=""/>
+    <alias field="military_2" index="43" name=""/>
+    <alias field="natural_2" index="44" name=""/>
+    <alias field="office_2" index="45" name=""/>
+    <alias field="place_2" index="46" name=""/>
+    <alias field="shop_2" index="47" name=""/>
+    <alias field="sport_2" index="48" name=""/>
+    <alias field="tourism_2" index="49" name=""/>
+    <alias field="other_tags_2" index="50" name=""/>
+    <alias field="height" index="51" name=""/>
+    <alias field="garden:type" index="52" name=""/>
+    <alias field="garden:style" index="53" name=""/>
+    <alias field="crop" index="54" name=""/>
+    <alias field="school:FR" index="55" name=""/>
+    <alias field="ref:UAI" index="56" name=""/>
+    <alias field="description" index="57" name=""/>
+    <alias field="addr:street" index="58" name=""/>
+    <alias field="addr:postcode" index="59" name=""/>
+    <alias field="addr:city" index="60" name=""/>
+    <alias field="wall" index="61" name=""/>
   </aliases>
+  <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="social_facility:for" expression=""/>
-    <default applyOnUpdate="0" field="social_facility" expression=""/>
-    <default applyOnUpdate="0" field="short_name" expression=""/>
-    <default applyOnUpdate="0" field="ref:FR:SIRET" expression=""/>
-    <default applyOnUpdate="0" field="ref:FR:FINESS" expression=""/>
-    <default applyOnUpdate="0" field="phone" expression=""/>
-    <default applyOnUpdate="0" field="access" expression=""/>
-    <default applyOnUpdate="0" field="school:FR" expression=""/>
-    <default applyOnUpdate="0" field="ref:UAI" expression=""/>
-    <default applyOnUpdate="0" field="operator:type" expression=""/>
-    <default applyOnUpdate="0" field="contact:phone" expression=""/>
-    <default applyOnUpdate="0" field="addr:street" expression=""/>
-    <default applyOnUpdate="0" field="addr:housenumber" expression=""/>
-    <default applyOnUpdate="0" field="religion" expression=""/>
-    <default applyOnUpdate="0" field="denomination" expression=""/>
-    <default applyOnUpdate="0" field="alt_name" expression=""/>
-    <default applyOnUpdate="0" field="wall" expression=""/>
-    <default applyOnUpdate="0" field="wikipedia" expression=""/>
-    <default applyOnUpdate="0" field="wikidata" expression=""/>
-    <default applyOnUpdate="0" field="source:population" expression=""/>
-    <default applyOnUpdate="0" field="source:name:oc" expression=""/>
-    <default applyOnUpdate="0" field="ref:INSEE" expression=""/>
-    <default applyOnUpdate="0" field="postal_code" expression=""/>
-    <default applyOnUpdate="0" field="population" expression=""/>
-    <default applyOnUpdate="0" field="name:oc" 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="osm_id_2" expression="" applyOnUpdate="0"/>
+    <default field="osm_way_id_2" expression="" applyOnUpdate="0"/>
+    <default field="name_2" expression="" applyOnUpdate="0"/>
+    <default field="type_2" expression="" applyOnUpdate="0"/>
+    <default field="aeroway_2" expression="" applyOnUpdate="0"/>
+    <default field="amenity_2" expression="" applyOnUpdate="0"/>
+    <default field="admin_level_2" expression="" applyOnUpdate="0"/>
+    <default field="barrier_2" expression="" applyOnUpdate="0"/>
+    <default field="boundary_2" expression="" applyOnUpdate="0"/>
+    <default field="building_2" expression="" applyOnUpdate="0"/>
+    <default field="craft_2" expression="" applyOnUpdate="0"/>
+    <default field="geological_2" expression="" applyOnUpdate="0"/>
+    <default field="historic_2" expression="" applyOnUpdate="0"/>
+    <default field="land_area_2" expression="" applyOnUpdate="0"/>
+    <default field="landuse_2" expression="" applyOnUpdate="0"/>
+    <default field="leisure_2" expression="" applyOnUpdate="0"/>
+    <default field="man_made_2" expression="" applyOnUpdate="0"/>
+    <default field="military_2" expression="" applyOnUpdate="0"/>
+    <default field="natural_2" expression="" applyOnUpdate="0"/>
+    <default field="office_2" expression="" applyOnUpdate="0"/>
+    <default field="place_2" expression="" applyOnUpdate="0"/>
+    <default field="shop_2" expression="" applyOnUpdate="0"/>
+    <default field="sport_2" expression="" applyOnUpdate="0"/>
+    <default field="tourism_2" expression="" applyOnUpdate="0"/>
+    <default field="other_tags_2" expression="" applyOnUpdate="0"/>
+    <default field="height" expression="" applyOnUpdate="0"/>
+    <default field="garden:type" expression="" applyOnUpdate="0"/>
+    <default field="garden:style" expression="" applyOnUpdate="0"/>
+    <default field="crop" expression="" applyOnUpdate="0"/>
+    <default field="school:FR" expression="" applyOnUpdate="0"/>
+    <default field="ref:UAI" expression="" applyOnUpdate="0"/>
+    <default field="description" expression="" applyOnUpdate="0"/>
+    <default field="addr:street" expression="" applyOnUpdate="0"/>
+    <default field="addr:postcode" expression="" applyOnUpdate="0"/>
+    <default field="addr:city" expression="" applyOnUpdate="0"/>
+    <default field="wall" expression="" applyOnUpdate="0"/>
   </defaults>
   <constraints>
-    <constraint field="fid" exp_strength="0" notnull_strength="1" unique_strength="1" constraints="3"/>
-    <constraint field="osm_id" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="osm_way_id" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="name" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="type" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="aeroway" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="amenity" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="admin_level" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="barrier" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="boundary" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="building" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="craft" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="geological" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="historic" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="land_area" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="landuse" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="leisure" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="man_made" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="military" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="natural" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="office" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="place" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="shop" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="sport" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="tourism" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="other_tags" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="social_facility:for" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="social_facility" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="short_name" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="ref:FR:SIRET" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="ref:FR:FINESS" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="phone" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="access" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="school:FR" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="ref:UAI" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="operator:type" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="contact:phone" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="addr:street" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="addr:housenumber" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="religion" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="denomination" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="alt_name" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="wall" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="wikipedia" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="wikidata" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="source:population" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="source:name:oc" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="ref:INSEE" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="postal_code" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="population" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
-    <constraint field="name:oc" exp_strength="0" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint field="fid" unique_strength="1" exp_strength="0" constraints="3" notnull_strength="1"/>
+    <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="osm_way_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="aeroway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="amenity" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="admin_level" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="barrier" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="boundary" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="building" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="craft" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="geological" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="historic" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="land_area" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="landuse" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="leisure" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="man_made" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="military" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="natural" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="office" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="place" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="shop" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="sport" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="tourism" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="other_tags" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="osm_id_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="osm_way_id_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="name_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="type_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="aeroway_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="amenity_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="admin_level_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="barrier_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="boundary_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="building_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="craft_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="geological_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="historic_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="land_area_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="landuse_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="leisure_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="man_made_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="military_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="natural_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="office_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="place_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="shop_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="sport_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="tourism_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="other_tags_2" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="height" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="garden:type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="garden:style" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="crop" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="school:FR" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="ref:UAI" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="description" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="addr:street" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="addr:postcode" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="addr:city" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+    <constraint field="wall" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint desc="" field="fid" exp=""/>
-    <constraint desc="" field="osm_id" exp=""/>
-    <constraint desc="" field="osm_way_id" exp=""/>
-    <constraint desc="" field="name" exp=""/>
-    <constraint desc="" field="type" exp=""/>
-    <constraint desc="" field="aeroway" exp=""/>
-    <constraint desc="" field="amenity" exp=""/>
-    <constraint desc="" field="admin_level" exp=""/>
-    <constraint desc="" field="barrier" exp=""/>
-    <constraint desc="" field="boundary" exp=""/>
-    <constraint desc="" field="building" exp=""/>
-    <constraint desc="" field="craft" exp=""/>
-    <constraint desc="" field="geological" exp=""/>
-    <constraint desc="" field="historic" exp=""/>
-    <constraint desc="" field="land_area" exp=""/>
-    <constraint desc="" field="landuse" exp=""/>
-    <constraint desc="" field="leisure" exp=""/>
-    <constraint desc="" field="man_made" exp=""/>
-    <constraint desc="" field="military" exp=""/>
-    <constraint desc="" field="natural" exp=""/>
-    <constraint desc="" field="office" exp=""/>
-    <constraint desc="" field="place" exp=""/>
-    <constraint desc="" field="shop" exp=""/>
-    <constraint desc="" field="sport" exp=""/>
-    <constraint desc="" field="tourism" exp=""/>
-    <constraint desc="" field="other_tags" exp=""/>
-    <constraint desc="" field="social_facility:for" exp=""/>
-    <constraint desc="" field="social_facility" exp=""/>
-    <constraint desc="" field="short_name" exp=""/>
-    <constraint desc="" field="ref:FR:SIRET" exp=""/>
-    <constraint desc="" field="ref:FR:FINESS" exp=""/>
-    <constraint desc="" field="phone" exp=""/>
-    <constraint desc="" field="access" exp=""/>
-    <constraint desc="" field="school:FR" exp=""/>
-    <constraint desc="" field="ref:UAI" exp=""/>
-    <constraint desc="" field="operator:type" exp=""/>
-    <constraint desc="" field="contact:phone" exp=""/>
-    <constraint desc="" field="addr:street" exp=""/>
-    <constraint desc="" field="addr:housenumber" exp=""/>
-    <constraint desc="" field="religion" exp=""/>
-    <constraint desc="" field="denomination" exp=""/>
-    <constraint desc="" field="alt_name" exp=""/>
-    <constraint desc="" field="wall" exp=""/>
-    <constraint desc="" field="wikipedia" exp=""/>
-    <constraint desc="" field="wikidata" exp=""/>
-    <constraint desc="" field="source:population" exp=""/>
-    <constraint desc="" field="source:name:oc" exp=""/>
-    <constraint desc="" field="ref:INSEE" exp=""/>
-    <constraint desc="" field="postal_code" exp=""/>
-    <constraint desc="" field="population" exp=""/>
-    <constraint desc="" field="name:oc" exp=""/>
+    <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="osm_id_2" desc=""/>
+    <constraint exp="" field="osm_way_id_2" desc=""/>
+    <constraint exp="" field="name_2" desc=""/>
+    <constraint exp="" field="type_2" desc=""/>
+    <constraint exp="" field="aeroway_2" desc=""/>
+    <constraint exp="" field="amenity_2" desc=""/>
+    <constraint exp="" field="admin_level_2" desc=""/>
+    <constraint exp="" field="barrier_2" desc=""/>
+    <constraint exp="" field="boundary_2" desc=""/>
+    <constraint exp="" field="building_2" desc=""/>
+    <constraint exp="" field="craft_2" desc=""/>
+    <constraint exp="" field="geological_2" desc=""/>
+    <constraint exp="" field="historic_2" desc=""/>
+    <constraint exp="" field="land_area_2" desc=""/>
+    <constraint exp="" field="landuse_2" desc=""/>
+    <constraint exp="" field="leisure_2" desc=""/>
+    <constraint exp="" field="man_made_2" desc=""/>
+    <constraint exp="" field="military_2" desc=""/>
+    <constraint exp="" field="natural_2" desc=""/>
+    <constraint exp="" field="office_2" desc=""/>
+    <constraint exp="" field="place_2" desc=""/>
+    <constraint exp="" field="shop_2" desc=""/>
+    <constraint exp="" field="sport_2" desc=""/>
+    <constraint exp="" field="tourism_2" desc=""/>
+    <constraint exp="" field="other_tags_2" desc=""/>
+    <constraint exp="" field="height" desc=""/>
+    <constraint exp="" field="garden:type" desc=""/>
+    <constraint exp="" field="garden:style" desc=""/>
+    <constraint exp="" field="crop" desc=""/>
+    <constraint exp="" field="school:FR" desc=""/>
+    <constraint exp="" field="ref:UAI" desc=""/>
+    <constraint exp="" field="description" desc=""/>
+    <constraint exp="" field="addr:street" desc=""/>
+    <constraint exp="" field="addr:postcode" desc=""/>
+    <constraint exp="" field="addr:city" desc=""/>
+    <constraint exp="" field="wall" desc=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting name="OpenStreetMap Browser" shortTitle="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" id="{281d295d-0c0e-4730-8bbe-23050b28e9a3}" notificationMessage="" isEnabledOnlyWhenEditable="0" capture="0" icon="" type="5">
+    <actionsetting id="{2df05f54-e1bd-45ea-b0ac-830c081f0f63}" type="5" icon="" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" name="OpenStreetMap Browser" isEnabledOnlyWhenEditable="0" notificationMessage="" shortTitle="OpenStreetMap Browser" capture="0">
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
-      <actionScope id="Field"/>
     </actionsetting>
-    <actionsetting name="Mapillary" shortTitle="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" id="{eb7b267c-2344-40c7-b822-a574c9f59030}" notificationMessage="" isEnabledOnlyWhenEditable="0" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" type="1">
+    <actionsetting id="{56aa8274-625d-49d1-a85a-1c68e3e4b2d4}" type="1" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" name="Mapillary" isEnabledOnlyWhenEditable="0" notificationMessage="" shortTitle="Mapillary" capture="0">
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
-      <actionScope id="Field"/>
     </actionsetting>
-    <actionsetting name="JOSM" shortTitle="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" id="{e3419f67-c82e-4144-95e8-88613cc79146}" notificationMessage="" isEnabledOnlyWhenEditable="0" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" type="1">
+    <actionsetting id="{d8c9c713-6e0e-4d33-aab8-3eed21af28e5}" type="1" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" name="JOSM" isEnabledOnlyWhenEditable="0" notificationMessage="" shortTitle="JOSM" capture="0">
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
-      <actionScope id="Field"/>
     </actionsetting>
-    <actionsetting name="User default editor" shortTitle="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" id="{e89bb769-001d-4ba8-a171-3ac489c17297}" notificationMessage="" isEnabledOnlyWhenEditable="0" capture="0" icon="" type="5">
+    <actionsetting id="{6becfd40-620c-414e-9e13-716189b69508}" type="5" icon="" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" name="User default editor" isEnabledOnlyWhenEditable="0" notificationMessage="" shortTitle="User default editor" capture="0">
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
-      <actionScope id="Field"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+  <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
     <columns>
-      <column name="osm_id" hidden="0" type="field" width="-1"/>
-      <column name="building" hidden="0" type="field" width="-1"/>
-      <column hidden="1" type="actions" width="-1"/>
-      <column name="name" hidden="0" type="field" width="-1"/>
-      <column name="leisure" hidden="0" type="field" width="-1"/>
-      <column name="fid" hidden="0" type="field" width="-1"/>
-      <column name="landuse" hidden="0" type="field" width="-1"/>
-      <column name="natural" hidden="0" type="field" width="-1"/>
-      <column name="boundary" hidden="0" type="field" width="-1"/>
-      <column name="type" hidden="0" type="field" width="-1"/>
-      <column name="osm_way_id" hidden="0" type="field" width="-1"/>
-      <column name="aeroway" hidden="0" type="field" width="-1"/>
-      <column name="amenity" hidden="0" type="field" width="-1"/>
-      <column name="admin_level" hidden="0" type="field" width="-1"/>
-      <column name="barrier" hidden="0" type="field" width="-1"/>
-      <column name="craft" hidden="0" type="field" width="-1"/>
-      <column name="geological" hidden="0" type="field" width="-1"/>
-      <column name="historic" hidden="0" type="field" width="-1"/>
-      <column name="land_area" hidden="0" type="field" width="-1"/>
-      <column name="man_made" hidden="0" type="field" width="-1"/>
-      <column name="military" hidden="0" type="field" width="-1"/>
-      <column name="office" hidden="0" type="field" width="-1"/>
-      <column name="place" hidden="0" type="field" width="-1"/>
-      <column name="shop" hidden="0" type="field" width="-1"/>
-      <column name="sport" hidden="0" type="field" width="-1"/>
-      <column name="tourism" hidden="0" type="field" width="-1"/>
-      <column name="other_tags" hidden="0" type="field" width="-1"/>
-      <column name="social_facility:for" hidden="0" type="field" width="-1"/>
-      <column name="social_facility" hidden="0" type="field" width="-1"/>
-      <column name="short_name" hidden="0" type="field" width="-1"/>
-      <column name="ref:FR:SIRET" hidden="0" type="field" width="-1"/>
-      <column name="ref:FR:FINESS" hidden="0" type="field" width="-1"/>
-      <column name="phone" hidden="0" type="field" width="-1"/>
-      <column name="access" hidden="0" type="field" width="-1"/>
-      <column name="school:FR" hidden="0" type="field" width="-1"/>
-      <column name="ref:UAI" hidden="0" type="field" width="-1"/>
-      <column name="operator:type" hidden="0" type="field" width="-1"/>
-      <column name="contact:phone" hidden="0" type="field" width="-1"/>
-      <column name="addr:street" hidden="0" type="field" width="-1"/>
-      <column name="addr:housenumber" hidden="0" type="field" width="-1"/>
-      <column name="religion" hidden="0" type="field" width="-1"/>
-      <column name="denomination" hidden="0" type="field" width="-1"/>
-      <column name="alt_name" hidden="0" type="field" width="-1"/>
-      <column name="wall" hidden="0" type="field" width="-1"/>
-      <column name="wikipedia" hidden="0" type="field" width="-1"/>
-      <column name="wikidata" hidden="0" type="field" width="-1"/>
-      <column name="source:population" hidden="0" type="field" width="-1"/>
-      <column name="source:name:oc" hidden="0" type="field" width="-1"/>
-      <column name="ref:INSEE" hidden="0" type="field" width="-1"/>
-      <column name="postal_code" hidden="0" type="field" width="-1"/>
-      <column name="population" hidden="0" type="field" width="-1"/>
-      <column name="name:oc" hidden="0" type="field" width="-1"/>
+      <column hidden="0" width="-1" type="field" name="osm_id"/>
+      <column hidden="0" width="-1" type="field" name="building"/>
+      <column hidden="1" width="-1" type="actions"/>
+      <column hidden="0" width="-1" type="field" name="name"/>
+      <column hidden="0" width="-1" type="field" name="leisure"/>
+      <column hidden="0" width="-1" type="field" name="fid"/>
+      <column hidden="0" width="-1" type="field" name="landuse"/>
+      <column hidden="0" width="-1" type="field" name="natural"/>
+      <column hidden="0" width="-1" type="field" name="boundary"/>
+      <column hidden="0" width="-1" type="field" name="type"/>
+      <column hidden="0" width="-1" type="field" name="osm_way_id"/>
+      <column hidden="0" width="-1" type="field" name="aeroway"/>
+      <column hidden="0" width="-1" type="field" name="amenity"/>
+      <column hidden="0" width="-1" type="field" name="admin_level"/>
+      <column hidden="0" width="-1" type="field" name="barrier"/>
+      <column hidden="0" width="-1" type="field" name="craft"/>
+      <column hidden="0" width="-1" type="field" name="geological"/>
+      <column hidden="0" width="-1" type="field" name="historic"/>
+      <column hidden="0" width="-1" type="field" name="land_area"/>
+      <column hidden="0" width="-1" type="field" name="man_made"/>
+      <column hidden="0" width="-1" type="field" name="military"/>
+      <column hidden="0" width="-1" type="field" name="office"/>
+      <column hidden="0" width="-1" type="field" name="place"/>
+      <column hidden="0" width="-1" type="field" name="shop"/>
+      <column hidden="0" width="-1" type="field" name="sport"/>
+      <column hidden="0" width="-1" type="field" name="tourism"/>
+      <column hidden="0" width="-1" type="field" name="other_tags"/>
+      <column hidden="0" width="-1" type="field" name="school:FR"/>
+      <column hidden="0" width="-1" type="field" name="ref:UAI"/>
+      <column hidden="0" width="-1" type="field" name="addr:street"/>
+      <column hidden="0" width="-1" type="field" name="wall"/>
+      <column hidden="0" width="-1" type="field" name="osm_id_2"/>
+      <column hidden="0" width="-1" type="field" name="osm_way_id_2"/>
+      <column hidden="0" width="-1" type="field" name="name_2"/>
+      <column hidden="0" width="-1" type="field" name="type_2"/>
+      <column hidden="0" width="-1" type="field" name="aeroway_2"/>
+      <column hidden="0" width="-1" type="field" name="amenity_2"/>
+      <column hidden="0" width="-1" type="field" name="admin_level_2"/>
+      <column hidden="0" width="-1" type="field" name="barrier_2"/>
+      <column hidden="0" width="-1" type="field" name="boundary_2"/>
+      <column hidden="0" width="-1" type="field" name="building_2"/>
+      <column hidden="0" width="-1" type="field" name="craft_2"/>
+      <column hidden="0" width="-1" type="field" name="geological_2"/>
+      <column hidden="0" width="-1" type="field" name="historic_2"/>
+      <column hidden="0" width="-1" type="field" name="land_area_2"/>
+      <column hidden="0" width="-1" type="field" name="landuse_2"/>
+      <column hidden="0" width="-1" type="field" name="leisure_2"/>
+      <column hidden="0" width="-1" type="field" name="man_made_2"/>
+      <column hidden="0" width="-1" type="field" name="military_2"/>
+      <column hidden="0" width="-1" type="field" name="natural_2"/>
+      <column hidden="0" width="-1" type="field" name="office_2"/>
+      <column hidden="0" width="-1" type="field" name="place_2"/>
+      <column hidden="0" width="-1" type="field" name="shop_2"/>
+      <column hidden="0" width="-1" type="field" name="sport_2"/>
+      <column hidden="0" width="-1" type="field" name="tourism_2"/>
+      <column hidden="0" width="-1" type="field" name="other_tags_2"/>
+      <column hidden="0" width="-1" type="field" name="height"/>
+      <column hidden="0" width="-1" type="field" name="garden:type"/>
+      <column hidden="0" width="-1" type="field" name="garden:style"/>
+      <column hidden="0" width="-1" type="field" name="crop"/>
+      <column hidden="0" width="-1" type="field" name="description"/>
+      <column hidden="0" width="-1" type="field" name="addr:postcode"/>
+      <column hidden="0" width="-1" type="field" name="addr:city"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1876,90 +2024,119 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <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="aeroway" editable="1"/>
-    <field name="alt_name" editable="1"/>
-    <field name="amenity" editable="1"/>
-    <field name="barrier" editable="1"/>
-    <field name="blind" editable="1"/>
-    <field name="boundary" editable="1"/>
-    <field name="building" editable="1"/>
-    <field name="building:levels" editable="1"/>
-    <field name="contact:phone" editable="1"/>
-    <field name="craft" 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="geological" editable="1"/>
-    <field name="highway" editable="1"/>
-    <field name="historic" editable="1"/>
-    <field name="land_area" editable="1"/>
-    <field name="landuse" editable="1"/>
-    <field name="leaf_type" editable="1"/>
-    <field name="leisure" editable="1"/>
-    <field name="male" editable="1"/>
-    <field name="man_made" editable="1"/>
-    <field name="max_age" editable="1"/>
-    <field name="military" editable="1"/>
-    <field name="min_age" editable="1"/>
-    <field name="name" editable="1"/>
-    <field name="name:oc" editable="1"/>
-    <field name="natural" editable="1"/>
-    <field name="office" 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_type" editable="1"/>
-    <field name="osm_way_id" editable="1"/>
-    <field name="other_tags" editable="1"/>
-    <field name="parking" editable="1"/>
-    <field name="phone" editable="1"/>
-    <field name="place" 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="school:FR" editable="1"/>
-    <field name="shop" 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="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="type" 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"/>
+    <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_2"/>
+    <field editable="1" name="contact:phone"/>
+    <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="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="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="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"/>
   </editable>
   <labelOnTop>
     <field name="CLC:code" labelOnTop="0"/>
@@ -1971,16 +2148,24 @@ def my_form_open(dialog, layer, feature):
     <field name="addr:postcode" labelOnTop="0"/>
     <field name="addr:street" labelOnTop="0"/>
     <field name="admin_level" labelOnTop="0"/>
+    <field name="admin_level_2" labelOnTop="0"/>
     <field name="aeroway" labelOnTop="0"/>
+    <field name="aeroway_2" labelOnTop="0"/>
     <field name="alt_name" labelOnTop="0"/>
     <field name="amenity" labelOnTop="0"/>
+    <field name="amenity_2" labelOnTop="0"/>
     <field name="barrier" labelOnTop="0"/>
+    <field name="barrier_2" labelOnTop="0"/>
     <field name="blind" labelOnTop="0"/>
     <field name="boundary" labelOnTop="0"/>
+    <field name="boundary_2" labelOnTop="0"/>
     <field name="building" labelOnTop="0"/>
     <field name="building:levels" labelOnTop="0"/>
+    <field name="building_2" labelOnTop="0"/>
     <field name="contact:phone" labelOnTop="0"/>
     <field name="craft" labelOnTop="0"/>
+    <field name="craft_2" labelOnTop="0"/>
+    <field name="crop" labelOnTop="0"/>
     <field name="denomination" labelOnTop="0"/>
     <field name="description" labelOnTop="0"/>
     <field name="disused:amenity" labelOnTop="0"/>
@@ -1990,32 +2175,49 @@ def my_form_open(dialog, layer, feature):
     <field name="fence_type" labelOnTop="0"/>
     <field name="fid" labelOnTop="0"/>
     <field name="full_id" labelOnTop="0"/>
+    <field name="garden:style" labelOnTop="0"/>
+    <field name="garden:type" labelOnTop="0"/>
     <field name="geological" labelOnTop="0"/>
+    <field name="geological_2" labelOnTop="0"/>
+    <field name="height" labelOnTop="0"/>
     <field name="highway" labelOnTop="0"/>
     <field name="historic" labelOnTop="0"/>
+    <field name="historic_2" labelOnTop="0"/>
     <field name="land_area" labelOnTop="0"/>
+    <field name="land_area_2" labelOnTop="0"/>
     <field name="landuse" labelOnTop="0"/>
+    <field name="landuse_2" labelOnTop="0"/>
     <field name="leaf_type" labelOnTop="0"/>
     <field name="leisure" labelOnTop="0"/>
+    <field name="leisure_2" labelOnTop="0"/>
     <field name="male" labelOnTop="0"/>
     <field name="man_made" labelOnTop="0"/>
+    <field name="man_made_2" labelOnTop="0"/>
     <field name="max_age" labelOnTop="0"/>
     <field name="military" labelOnTop="0"/>
+    <field name="military_2" labelOnTop="0"/>
     <field name="min_age" labelOnTop="0"/>
     <field name="name" labelOnTop="0"/>
     <field name="name:oc" labelOnTop="0"/>
+    <field name="name_2" labelOnTop="0"/>
     <field name="natural" labelOnTop="0"/>
+    <field name="natural_2" labelOnTop="0"/>
     <field name="office" labelOnTop="0"/>
+    <field name="office_2" labelOnTop="0"/>
     <field name="operator" labelOnTop="0"/>
     <field name="operator:type" labelOnTop="0"/>
     <field name="operator_type" labelOnTop="0"/>
     <field name="osm_id" labelOnTop="0"/>
+    <field name="osm_id_2" labelOnTop="0"/>
     <field name="osm_type" labelOnTop="0"/>
     <field name="osm_way_id" labelOnTop="0"/>
+    <field name="osm_way_id_2" labelOnTop="0"/>
     <field name="other_tags" labelOnTop="0"/>
+    <field name="other_tags_2" labelOnTop="0"/>
     <field name="parking" labelOnTop="0"/>
     <field name="phone" labelOnTop="0"/>
     <field name="place" labelOnTop="0"/>
+    <field name="place_2" labelOnTop="0"/>
     <field name="political_division" labelOnTop="0"/>
     <field name="population" labelOnTop="0"/>
     <field name="postal_code" labelOnTop="0"/>
@@ -2027,6 +2229,7 @@ def my_form_open(dialog, layer, feature):
     <field name="roof:levels" labelOnTop="0"/>
     <field name="school:FR" labelOnTop="0"/>
     <field name="shop" labelOnTop="0"/>
+    <field name="shop_2" labelOnTop="0"/>
     <field name="short_name" labelOnTop="0"/>
     <field name="social_facility" labelOnTop="0"/>
     <field name="social_facility:for" labelOnTop="0"/>
@@ -2034,12 +2237,15 @@ def my_form_open(dialog, layer, feature):
     <field name="source:population" labelOnTop="0"/>
     <field name="source:url" labelOnTop="0"/>
     <field name="sport" labelOnTop="0"/>
+    <field name="sport_2" labelOnTop="0"/>
     <field name="start_date" labelOnTop="0"/>
     <field name="street_cabinet" labelOnTop="0"/>
     <field name="supervised" labelOnTop="0"/>
     <field name="surface" labelOnTop="0"/>
     <field name="tourism" labelOnTop="0"/>
+    <field name="tourism_2" labelOnTop="0"/>
     <field name="type" labelOnTop="0"/>
+    <field name="type_2" labelOnTop="0"/>
     <field name="wall" labelOnTop="0"/>
     <field name="water" labelOnTop="0"/>
     <field name="waterway" labelOnTop="0"/>
@@ -2047,7 +2253,6 @@ def my_form_open(dialog, layer, feature):
     <field name="wikidata" labelOnTop="0"/>
     <field name="wikipedia" labelOnTop="0"/>
   </labelOnTop>
-  <dataDefinedFieldProperties/>
   <widgets/>
   <previewExpression>description</previewExpression>
   <mapTip></mapTip>