From e2288b1a0adb3eb8f4338d57fdf2803fe185fcb3 Mon Sep 17 00:00:00 2001
From: Jouski <arnaud.champollion@linux-alpes.org>
Date: Wed, 10 Mar 2021 09:05:51 +0100
Subject: [PATCH] MAJ style surfaces

---
 styles/multipolygon.qml | 836 ++++++++++++++++++++++++----------------
 1 file changed, 494 insertions(+), 342 deletions(-)

diff --git a/styles/multipolygon.qml b/styles/multipolygon.qml
index d01f09b..d6270c4 100644
--- a/styles/multipolygon.qml
+++ b/styles/multipolygon.qml
@@ -1,31 +1,31 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis simplifyLocal="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" simplifyDrawingTol="1" labelsEnabled="1" version="3.10.4-A Coruña" readOnly="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" simplifyAlgorithm="0" maxScale="0" simplifyMaxScale="1">
+<qgis simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" version="3.10.4-A Coruña" styleCategories="AllStyleCategories" labelsEnabled="1" simplifyLocal="1" simplifyMaxScale="1" readOnly="0" minScale="1e+08" simplifyDrawingTol="1" maxScale="0">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
+  <renderer-v2 forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="0">
     <rules key="{235a67ea-a656-47c2-91a1-3c94e2926f62}">
-      <rule key="{f69f1a82-2331-4139-9487-e27714a58a63}" filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment" symbol="0"/>
-      <rule key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}" filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" label="toit,auvent,préau" symbol="1"/>
-      <rule key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}" filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment scolaire" symbol="2"/>
-      <rule key="{bc2342be-b587-40e8-8c25-1043595b314d}" filter="&quot;building&quot;='shed'" label="cabanon" symbol="3"/>
-      <rule key="{af8ca696-fc2e-4142-945a-24b6a15acc48}" filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or &quot;surface&quot;='grass'" label="herbe" symbol="4"/>
-      <rule key="{933821c2-969e-44c3-ac11-8153737ba71a}" filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" label="eau" symbol="5"/>
-      <rule key="{e91700e9-45b0-4885-8be1-33970cf2f64c}" filter="&quot;natural&quot;='shingle'" label="lit de rivière" symbol="6"/>
-      <rule key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}" filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" label="zone boisée" symbol="7"/>
-      <rule key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}" filter="&quot;leisure&quot;='playground'" label="jeux" symbol="8"/>
-      <rule key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}" filter="&quot;amenity&quot;='parking'" label="parking" symbol="9"/>
-      <rule key="{b908d622-4193-4ced-8781-7bb5b8930e60}" filter="&quot;landuse&quot;='farmland'" label="champ" symbol="10"/>
-      <rule key="{074e0ef0-f2ea-480e-88de-08dda8d27bf6}" filter="&quot;leisure&quot;='pitch'" label="terrain" symbol="11"/>
-      <rule key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}" filter="&quot;surface&quot;='compacted'" label="sable compact" symbol="12"/>
-      <rule key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}" filter="&quot;leisure&quot;='garden'" label="jardin" symbol="13"/>
-      <rule key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}" filter="&quot;area:highway&quot;='path'" label="chemin" symbol="14"/>
+      <rule symbol="0" key="{f69f1a82-2331-4139-9487-e27714a58a63}" filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment"/>
+      <rule symbol="1" key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}" filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" label="toit,auvent,préau"/>
+      <rule symbol="2" key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}" filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment scolaire"/>
+      <rule symbol="3" key="{bc2342be-b587-40e8-8c25-1043595b314d}" filter="&quot;building&quot;='shed'" label="cabanon"/>
+      <rule symbol="4" key="{af8ca696-fc2e-4142-945a-24b6a15acc48}" filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or &quot;surface&quot;='grass'" label="herbe"/>
+      <rule symbol="5" key="{933821c2-969e-44c3-ac11-8153737ba71a}" filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" label="eau"/>
+      <rule symbol="6" key="{e91700e9-45b0-4885-8be1-33970cf2f64c}" filter="&quot;natural&quot;='shingle'" label="lit de rivière"/>
+      <rule symbol="7" key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}" filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" label="zone boisée"/>
+      <rule symbol="8" key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}" filter="&quot;leisure&quot;='playground'" label="jeux"/>
+      <rule symbol="9" key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}" filter="&quot;amenity&quot;='parking'" label="parking"/>
+      <rule symbol="10" key="{b908d622-4193-4ced-8781-7bb5b8930e60}" filter="&quot;landuse&quot;='farmland'" label="champ"/>
+      <rule symbol="11" key="{074e0ef0-f2ea-480e-88de-08dda8d27bf6}" filter="&quot;leisure&quot;='pitch'" label="terrain"/>
+      <rule symbol="12" key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}" filter="&quot;surface&quot;='compacted'" label="sable compact"/>
+      <rule symbol="13" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}" filter="&quot;leisure&quot;='garden'" label="jardin"/>
+      <rule symbol="14" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}" filter="&quot;area:highway&quot;='path'" label="chemin"/>
     </rules>
     <symbols>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="0" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="0">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <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"/>
@@ -45,7 +45,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+        <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
           <prop v="45" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="1" k="distance"/>
@@ -66,8 +66,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="line" force_rhr="0" name="@0@1" alpha="1">
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="line" name="@0@1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -95,8 +95,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="1" alpha="0.5">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="0.5" force_rhr="0" clip_to_extent="1" type="fill" name="1">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="229,229,229,128" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -116,7 +116,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+        <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
           <prop v="45" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="3" k="distance"/>
@@ -137,8 +137,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="line" force_rhr="0" name="@1@1" alpha="1">
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="line" name="@1@1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -166,8 +166,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="10" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="10">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="187,233,166,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -187,7 +187,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="SVGFill" locked="0" pass="0">
+        <layer class="SVGFill" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="35,35,35,255" k="outline_color"/>
@@ -207,8 +207,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="line" force_rhr="0" name="@10@1" alpha="1">
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="line" name="@10@1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -236,8 +236,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="11" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="10">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="11">
+        <layer class="SimpleFill" enabled="1" pass="10" locked="0">
           <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"/>
@@ -258,8 +258,8 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="12" alpha="1">
-        <layer enabled="1" class="SVGFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="12">
+        <layer class="SVGFill" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="183,72,75,255" k="color"/>
           <prop v="35,35,35,255" k="outline_color"/>
@@ -279,8 +279,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="line" force_rhr="0" name="@12@0" alpha="1">
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="line" name="@12@0">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -308,8 +308,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="13" alpha="1">
-        <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="13">
+        <layer class="PointPatternFill" enabled="1" pass="0" locked="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -337,8 +337,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="marker" force_rhr="0" name="@13@0" alpha="1">
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="marker" name="@13@0">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -367,7 +367,7 @@
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+        <layer class="SimpleLine" enabled="1" pass="0" locked="0">
           <prop v="square" k="capstyle"/>
           <prop v="5;2" k="customdash"/>
           <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -393,8 +393,8 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="14" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="14">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="179,90,42,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -415,8 +415,8 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="2" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="2">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="231,229,183,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -436,7 +436,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+        <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
           <prop v="45" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="1" k="distance"/>
@@ -457,8 +457,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="line" force_rhr="0" name="@2@1" alpha="1">
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="line" name="@2@1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -486,8 +486,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="3" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="3">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="187,169,2,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -507,7 +507,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+        <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
           <prop v="45" k="angle"/>
           <prop v="55,126,184,255" k="color"/>
           <prop v="2" k="distance"/>
@@ -528,8 +528,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="line" force_rhr="0" name="@3@1" alpha="1">
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="line" name="@3@1">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -556,7 +556,7 @@
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+        <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="55,126,184,255" k="color"/>
           <prop v="2" k="distance"/>
@@ -577,8 +577,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="line" force_rhr="0" name="@3@2" alpha="1">
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="line" name="@3@2">
+            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
               <prop v="square" k="capstyle"/>
               <prop v="5;2" k="customdash"/>
               <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -605,7 +605,7 @@
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+        <layer class="SimpleLine" enabled="1" pass="0" locked="0">
           <prop v="square" k="capstyle"/>
           <prop v="5;2" k="customdash"/>
           <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -631,8 +631,8 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="4" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="4">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="95,255,95,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -652,7 +652,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
+        <layer class="PointPatternFill" enabled="1" pass="0" locked="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -680,8 +680,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="marker" force_rhr="0" name="@4@1" alpha="1">
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="marker" name="@4@1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -711,8 +711,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="5" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="5">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="25,140,255,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -733,8 +733,8 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="6" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="6">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="255,246,205,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -754,7 +754,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
+        <layer class="PointPatternFill" enabled="1" pass="0" locked="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -782,8 +782,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="marker" force_rhr="0" name="@6@1" alpha="1">
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="marker" name="@6@1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -812,7 +812,7 @@
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+        <layer class="SimpleLine" enabled="1" pass="0" locked="0">
           <prop v="square" k="capstyle"/>
           <prop v="5;2" k="customdash"/>
           <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -838,8 +838,8 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="7" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="7">
+        <layer class="SimpleFill" enabled="1" pass="0" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="0,142,54,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -859,7 +859,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
+        <layer class="PointPatternFill" enabled="1" pass="0" locked="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -887,8 +887,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="marker" force_rhr="0" name="@7@1" alpha="1">
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="marker" name="@7@1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -918,8 +918,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="8" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="10">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="8">
+        <layer class="SimpleFill" enabled="1" pass="10" locked="0">
           <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"/>
@@ -939,7 +939,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="PointPatternFill" locked="0" pass="10">
+        <layer class="PointPatternFill" enabled="1" pass="10" locked="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -967,8 +967,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="marker" force_rhr="0" name="@8@1" alpha="1">
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="marker" name="@8@1">
+            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -997,7 +997,7 @@
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" class="SimpleLine" locked="0" pass="10">
+        <layer class="SimpleLine" enabled="1" pass="10" locked="0">
           <prop v="square" k="capstyle"/>
           <prop v="5;2" k="customdash"/>
           <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -1022,7 +1022,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" class="CentroidFill" locked="0" pass="10">
+        <layer class="CentroidFill" enabled="1" pass="10" locked="0">
           <prop v="1" k="point_on_all_parts"/>
           <prop v="0" k="point_on_surface"/>
           <data_defined_properties>
@@ -1032,8 +1032,8 @@
               <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" type="marker" force_rhr="0" name="@8@3" alpha="1">
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+          <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="marker" name="@8@3">
+            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
               <prop v="0" k="angle"/>
               <prop v="255,0,0,255" k="color"/>
               <prop v="0" k="fixedAspectRatio"/>
@@ -1062,8 +1062,8 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="fill" force_rhr="0" name="9" alpha="1">
-        <layer enabled="1" class="SimpleFill" locked="0" pass="2">
+      <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="fill" name="9">
+        <layer class="SimpleFill" enabled="1" pass="2" locked="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="232,234,234,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -1087,14 +1087,14 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{d164d541-3f98-4eca-a96d-2be02d52a856}">
-      <rule key="{6f2c4981-e0a4-4812-954d-99d35cdef565}" filter="&quot;amenity&quot;='parking'" description="parking">
+    <rules key="{3d0163b5-f9b8-41c9-8b13-202c1e262d3a}">
+      <rule key="{79c0fcbd-6625-4916-9282-b3ea4e9353b2}" filter="&quot;amenity&quot;='parking'" description="parking">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" fontWeight="50" textColor="0,0,0,255" fontKerning="1" fontSizeUnit="Point" multilineHeight="1" fontWordSpacing="0" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontFamily="Liberation Sans" namedStyle="Regular" textOpacity="1" fieldName="fid" fontSize="10" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" isExpression="0" fontCapitals="0" fontItalic="0" previewBkgrdColor="255,255,255,255">
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferOpacity="1" bufferJoinStyle="128"/>
-            <background shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSizeY="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeX="0" shapeRadiiY="0" shapeType="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeDraw="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeOpacity="1" shapeBorderWidth="0">
-              <symbol clip_to_extent="1" type="marker" force_rhr="0" name="markerSymbol" alpha="1">
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+          <text-style multilineHeight="1" fontSizeUnit="MM" fontStrikeout="0" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontCapitals="0" fontWordSpacing="0" textOrientation="horizontal" useSubstitutions="0" fontItalic="0" namedStyle="Regular" fontFamily="Liberation Sans" textColor="0,0,255,255" isExpression="1" textOpacity="1" fieldName="'P'" fontSize="8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontKerning="1" blendMode="0">
+            <text-buffer bufferSizeUnits="MM" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferOpacity="1" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <background shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeSVGFile="" shapeOpacity="1" shapeRotation="0" shapeRadiiY="0" shapeSizeX="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBlendMode="0" shapeRadiiX="0" shapeRotationType="0" shapeType="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeType="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
+              <symbol alpha="1" force_rhr="0" clip_to_extent="1" type="marker" name="markerSymbol">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="125,139,143,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1123,7 +1123,7 @@
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowUnder="0" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowRadius="1.5"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowScale="100" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowDraw="0" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" type="QString" name="name"/>
@@ -1133,9 +1133,9 @@
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" wrapChar="" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" autoWrapLength="0" plussign="0" multilineAlign="0" formatNumbers="0" decimals="3" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" layerType="PolygonGeometry" fitInPolygonOnly="0" rotationAngle="0" dist="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" priority="5" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" geometryGenerator="" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" preserveRotation="1" distUnits="MM" offsetUnits="MM" overrunDistanceUnit="MM" placementFlags="10" centroidInside="0" xOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering displayAll="0" fontMaxPixelSize="10000" scaleMax="0" drawLabels="1" obstacleFactor="1" limitNumLabels="0" upsidedownLabels="0" zIndex="0" mergeLines="0" fontMinPixelSize="3" labelPerPart="0" minFeatureSize="0" obstacleType="0" fontLimitPixelSize="0" scaleMin="0" scaleVisibility="0" maxNumLabels="2000" obstacle="1"/>
+          <text-format decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" reverseDirectionSymbol="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
+          <placement layerType="PolygonGeometry" distUnits="MM" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" placement="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" preserveRotation="1" repeatDistanceUnits="MM" rotationAngle="0" fitInPolygonOnly="0" overrunDistance="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" geometryGeneratorType="PointGeometry" offsetUnits="MM" offsetType="0" dist="0" xOffset="0" maxCurvedCharAngleOut="-25" repeatDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" quadOffset="4" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleFactor="1" labelPerPart="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" scaleVisibility="0" scaleMax="0" fontMinPixelSize="3" obstacleType="0" scaleMin="0" maxNumLabels="2000" drawLabels="1" mergeLines="0" displayAll="0" fontMaxPixelSize="10000" zIndex="0" upsidedownLabels="0" minFeatureSize="0"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" type="QString" name="name"/>
@@ -1153,7 +1153,7 @@
               </Option>
               <Option value="false" type="bool" name="drawToAllParts"/>
               <Option value="0" type="QString" name="enabled"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; alpha=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&quot;0&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
               <Option value="0" type="double" name="minLength"/>
               <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
               <Option value="MM" type="QString" name="minLengthUnit"/>
@@ -1228,13 +1228,13 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory penColor="#000000" maxScaleDenominator="1e+08" barWidth="5" lineSizeType="MM" width="15" backgroundAlpha="255" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" penWidth="0" penAlpha="255" scaleDependency="Area" rotationOffset="270" diagramOrientation="Up" height="15" enabled="0" sizeType="MM" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" opacity="1" backgroundColor="#ffffff" minScaleDenominator="0">
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" sizeType="MM" penColor="#000000" diagramOrientation="Up" labelPlacementMethod="XHeight" scaleDependency="Area" height="15" backgroundAlpha="255" minimumSize="0" lineSizeType="MM" backgroundColor="#ffffff" scaleBasedVisibility="0" width="15" maxScaleDenominator="1e+08" rotationOffset="270" enabled="0" opacity="1" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0">
       <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
       <attribute field="" label="" color="#000000"/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings showAll="1" zIndex="0" obstacle="0" placement="1" linePlacementFlags="18" dist="0" priority="0">
+  <DiagramLayerSettings linePlacementFlags="18" dist="0" showAll="1" placement="1" priority="0" zIndex="0" obstacle="0">
     <properties>
       <Option type="Map">
         <Option value="" type="QString" name="name"/>
@@ -1436,14 +1436,84 @@
         </config>
       </editWidget>
     </field>
-    <field name="highway">
+    <field name="school:FR">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="parking">
+    <field name="ref:UAI">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="phone">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="operator:type">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="opening_hours">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="contact:street">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="contact:housenumber">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="check_date:opening_hours">
+      <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:housenumber">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="addr:city">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1464,6 +1534,48 @@
         </config>
       </editWidget>
     </field>
+    <field name="surface">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="highway">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="roof:shape">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="roof:levels">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="description">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="building:levels">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
     <field name="wall">
       <editWidget type="TextEdit">
         <config>
@@ -1471,7 +1583,7 @@
         </config>
       </editWidget>
     </field>
-    <field name="operator">
+    <field name="leaf_type">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1499,34 +1611,6 @@
         </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="operator:type">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="opening_hours">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
     <field name="wikipedia">
       <editWidget type="TextEdit">
         <config>
@@ -1597,241 +1681,301 @@
     <alias field="sport" index="23" name=""/>
     <alias field="tourism" index="24" name=""/>
     <alias field="other_tags" index="25" name=""/>
-    <alias field="highway" index="26" name=""/>
-    <alias field="parking" index="27" name=""/>
-    <alias field="fee" index="28" name=""/>
-    <alias field="access" index="29" name=""/>
-    <alias field="wall" index="30" name=""/>
-    <alias field="operator" index="31" name=""/>
-    <alias field="CLC:year" index="32" name=""/>
-    <alias field="CLC:id" index="33" name=""/>
-    <alias field="CLC:code" index="34" name=""/>
-    <alias field="school:FR" index="35" name=""/>
-    <alias field="ref:UAI" index="36" name=""/>
-    <alias field="operator:type" index="37" name=""/>
-    <alias field="opening_hours" index="38" name=""/>
-    <alias field="wikipedia" index="39" name=""/>
-    <alias field="wikidata" index="40" name=""/>
-    <alias field="start_date" index="41" name=""/>
-    <alias field="source:url" index="42" name=""/>
-    <alias field="ref:INSEE" index="43" name=""/>
-    <alias field="political_division" index="44" name=""/>
+    <alias field="school:FR" index="26" name=""/>
+    <alias field="ref:UAI" index="27" name=""/>
+    <alias field="phone" index="28" name=""/>
+    <alias field="operator:type" index="29" name=""/>
+    <alias field="opening_hours" index="30" name=""/>
+    <alias field="contact:street" index="31" name=""/>
+    <alias field="contact:housenumber" index="32" name=""/>
+    <alias field="check_date:opening_hours" index="33" name=""/>
+    <alias field="addr:street" index="34" name=""/>
+    <alias field="addr:postcode" index="35" name=""/>
+    <alias field="addr:housenumber" index="36" name=""/>
+    <alias field="addr:city" index="37" name=""/>
+    <alias field="fee" index="38" name=""/>
+    <alias field="access" index="39" name=""/>
+    <alias field="surface" index="40" name=""/>
+    <alias field="highway" index="41" name=""/>
+    <alias field="roof:shape" index="42" name=""/>
+    <alias field="roof:levels" index="43" name=""/>
+    <alias field="description" index="44" name=""/>
+    <alias field="building:levels" index="45" name=""/>
+    <alias field="wall" index="46" name=""/>
+    <alias field="leaf_type" index="47" name=""/>
+    <alias field="CLC:year" index="48" name=""/>
+    <alias field="CLC:id" index="49" name=""/>
+    <alias field="CLC:code" index="50" name=""/>
+    <alias field="wikipedia" index="51" name=""/>
+    <alias field="wikidata" index="52" name=""/>
+    <alias field="start_date" index="53" name=""/>
+    <alias field="source:url" index="54" name=""/>
+    <alias field="ref:INSEE" index="55" name=""/>
+    <alias field="political_division" index="56" 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="highway" expression=""/>
-    <default applyOnUpdate="0" field="parking" expression=""/>
-    <default applyOnUpdate="0" field="fee" expression=""/>
-    <default applyOnUpdate="0" field="access" expression=""/>
-    <default applyOnUpdate="0" field="wall" expression=""/>
-    <default applyOnUpdate="0" field="operator" expression=""/>
-    <default applyOnUpdate="0" field="CLC:year" expression=""/>
-    <default applyOnUpdate="0" field="CLC:id" expression=""/>
-    <default applyOnUpdate="0" field="CLC:code" expression=""/>
-    <default applyOnUpdate="0" field="school:FR" expression=""/>
-    <default applyOnUpdate="0" field="ref:UAI" expression=""/>
-    <default applyOnUpdate="0" field="operator:type" expression=""/>
-    <default applyOnUpdate="0" field="opening_hours" expression=""/>
-    <default applyOnUpdate="0" field="wikipedia" expression=""/>
-    <default applyOnUpdate="0" field="wikidata" expression=""/>
-    <default applyOnUpdate="0" field="start_date" expression=""/>
-    <default applyOnUpdate="0" field="source:url" expression=""/>
-    <default applyOnUpdate="0" field="ref:INSEE" expression=""/>
-    <default applyOnUpdate="0" field="political_division" expression=""/>
+    <default expression="" field="fid" applyOnUpdate="0"/>
+    <default expression="" field="osm_id" applyOnUpdate="0"/>
+    <default expression="" field="osm_way_id" applyOnUpdate="0"/>
+    <default expression="" field="name" applyOnUpdate="0"/>
+    <default expression="" field="type" applyOnUpdate="0"/>
+    <default expression="" field="aeroway" applyOnUpdate="0"/>
+    <default expression="" field="amenity" applyOnUpdate="0"/>
+    <default expression="" field="admin_level" applyOnUpdate="0"/>
+    <default expression="" field="barrier" applyOnUpdate="0"/>
+    <default expression="" field="boundary" applyOnUpdate="0"/>
+    <default expression="" field="building" applyOnUpdate="0"/>
+    <default expression="" field="craft" applyOnUpdate="0"/>
+    <default expression="" field="geological" applyOnUpdate="0"/>
+    <default expression="" field="historic" applyOnUpdate="0"/>
+    <default expression="" field="land_area" applyOnUpdate="0"/>
+    <default expression="" field="landuse" applyOnUpdate="0"/>
+    <default expression="" field="leisure" applyOnUpdate="0"/>
+    <default expression="" field="man_made" applyOnUpdate="0"/>
+    <default expression="" field="military" applyOnUpdate="0"/>
+    <default expression="" field="natural" applyOnUpdate="0"/>
+    <default expression="" field="office" applyOnUpdate="0"/>
+    <default expression="" field="place" applyOnUpdate="0"/>
+    <default expression="" field="shop" applyOnUpdate="0"/>
+    <default expression="" field="sport" applyOnUpdate="0"/>
+    <default expression="" field="tourism" applyOnUpdate="0"/>
+    <default expression="" field="other_tags" applyOnUpdate="0"/>
+    <default expression="" field="school:FR" applyOnUpdate="0"/>
+    <default expression="" field="ref:UAI" applyOnUpdate="0"/>
+    <default expression="" field="phone" applyOnUpdate="0"/>
+    <default expression="" field="operator:type" applyOnUpdate="0"/>
+    <default expression="" field="opening_hours" applyOnUpdate="0"/>
+    <default expression="" field="contact:street" applyOnUpdate="0"/>
+    <default expression="" field="contact:housenumber" applyOnUpdate="0"/>
+    <default expression="" field="check_date:opening_hours" applyOnUpdate="0"/>
+    <default expression="" field="addr:street" applyOnUpdate="0"/>
+    <default expression="" field="addr:postcode" applyOnUpdate="0"/>
+    <default expression="" field="addr:housenumber" applyOnUpdate="0"/>
+    <default expression="" field="addr:city" applyOnUpdate="0"/>
+    <default expression="" field="fee" applyOnUpdate="0"/>
+    <default expression="" field="access" applyOnUpdate="0"/>
+    <default expression="" field="surface" applyOnUpdate="0"/>
+    <default expression="" field="highway" applyOnUpdate="0"/>
+    <default expression="" field="roof:shape" applyOnUpdate="0"/>
+    <default expression="" field="roof:levels" applyOnUpdate="0"/>
+    <default expression="" field="description" applyOnUpdate="0"/>
+    <default expression="" field="building:levels" applyOnUpdate="0"/>
+    <default expression="" field="wall" applyOnUpdate="0"/>
+    <default expression="" field="leaf_type" applyOnUpdate="0"/>
+    <default expression="" field="CLC:year" applyOnUpdate="0"/>
+    <default expression="" field="CLC:id" applyOnUpdate="0"/>
+    <default expression="" field="CLC:code" applyOnUpdate="0"/>
+    <default expression="" field="wikipedia" applyOnUpdate="0"/>
+    <default expression="" field="wikidata" applyOnUpdate="0"/>
+    <default expression="" field="start_date" applyOnUpdate="0"/>
+    <default expression="" field="source:url" applyOnUpdate="0"/>
+    <default expression="" field="ref:INSEE" applyOnUpdate="0"/>
+    <default expression="" field="political_division" applyOnUpdate="0"/>
   </defaults>
   <constraints>
-    <constraint constraints="3" field="fid" exp_strength="0" notnull_strength="1" unique_strength="1"/>
-    <constraint constraints="0" field="osm_id" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="osm_way_id" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="name" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="type" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="aeroway" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="amenity" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="admin_level" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="barrier" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="boundary" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="building" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="craft" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="geological" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="historic" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="land_area" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="landuse" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="leisure" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="man_made" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="military" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="natural" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="office" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="place" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="shop" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="sport" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="tourism" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="other_tags" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="highway" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="parking" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="fee" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="access" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="wall" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="operator" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="CLC:year" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="CLC:id" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="CLC:code" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="school:FR" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="ref:UAI" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="operator:type" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="opening_hours" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="wikipedia" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="wikidata" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="start_date" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="source:url" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="ref:INSEE" exp_strength="0" notnull_strength="0" unique_strength="0"/>
-    <constraint constraints="0" field="political_division" exp_strength="0" notnull_strength="0" unique_strength="0"/>
+    <constraint exp_strength="0" field="fid" notnull_strength="1" unique_strength="1" constraints="3"/>
+    <constraint exp_strength="0" field="osm_id" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="osm_way_id" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="aeroway" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="amenity" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="admin_level" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="barrier" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="boundary" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="building" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="craft" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="geological" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="historic" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="land_area" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="landuse" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="leisure" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="man_made" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="military" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="natural" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="office" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="place" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="shop" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="sport" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="tourism" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="other_tags" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="school:FR" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="ref:UAI" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="phone" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="operator:type" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="opening_hours" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="contact:street" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="contact:housenumber" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="check_date:opening_hours" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="addr:street" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="addr:postcode" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="addr:housenumber" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="addr:city" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="fee" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="access" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="surface" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="highway" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="roof:shape" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="roof:levels" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="description" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="building:levels" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="wall" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="leaf_type" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="CLC:year" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="CLC:id" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="CLC:code" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="wikipedia" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="wikidata" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="start_date" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="source:url" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="ref:INSEE" notnull_strength="0" unique_strength="0" constraints="0"/>
+    <constraint exp_strength="0" field="political_division" notnull_strength="0" unique_strength="0" constraints="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint field="fid" exp="" desc=""/>
-    <constraint field="osm_id" exp="" desc=""/>
-    <constraint field="osm_way_id" exp="" desc=""/>
-    <constraint field="name" exp="" desc=""/>
-    <constraint field="type" exp="" desc=""/>
-    <constraint field="aeroway" exp="" desc=""/>
-    <constraint field="amenity" exp="" desc=""/>
-    <constraint field="admin_level" exp="" desc=""/>
-    <constraint field="barrier" exp="" desc=""/>
-    <constraint field="boundary" exp="" desc=""/>
-    <constraint field="building" exp="" desc=""/>
-    <constraint field="craft" exp="" desc=""/>
-    <constraint field="geological" exp="" desc=""/>
-    <constraint field="historic" exp="" desc=""/>
-    <constraint field="land_area" exp="" desc=""/>
-    <constraint field="landuse" exp="" desc=""/>
-    <constraint field="leisure" exp="" desc=""/>
-    <constraint field="man_made" exp="" desc=""/>
-    <constraint field="military" exp="" desc=""/>
-    <constraint field="natural" exp="" desc=""/>
-    <constraint field="office" exp="" desc=""/>
-    <constraint field="place" exp="" desc=""/>
-    <constraint field="shop" exp="" desc=""/>
-    <constraint field="sport" exp="" desc=""/>
-    <constraint field="tourism" exp="" desc=""/>
-    <constraint field="other_tags" exp="" desc=""/>
-    <constraint field="highway" exp="" desc=""/>
-    <constraint field="parking" exp="" desc=""/>
-    <constraint field="fee" exp="" desc=""/>
-    <constraint field="access" exp="" desc=""/>
-    <constraint field="wall" exp="" desc=""/>
-    <constraint field="operator" exp="" desc=""/>
-    <constraint field="CLC:year" exp="" desc=""/>
-    <constraint field="CLC:id" exp="" desc=""/>
-    <constraint field="CLC:code" exp="" desc=""/>
-    <constraint field="school:FR" exp="" desc=""/>
-    <constraint field="ref:UAI" exp="" desc=""/>
-    <constraint field="operator:type" exp="" desc=""/>
-    <constraint field="opening_hours" exp="" desc=""/>
-    <constraint field="wikipedia" exp="" desc=""/>
-    <constraint field="wikidata" exp="" desc=""/>
-    <constraint field="start_date" exp="" desc=""/>
-    <constraint field="source:url" exp="" desc=""/>
-    <constraint field="ref:INSEE" exp="" desc=""/>
-    <constraint field="political_division" exp="" desc=""/>
+    <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="school:FR" desc=""/>
+    <constraint exp="" field="ref:UAI" desc=""/>
+    <constraint exp="" field="phone" desc=""/>
+    <constraint exp="" field="operator:type" desc=""/>
+    <constraint exp="" field="opening_hours" desc=""/>
+    <constraint exp="" field="contact:street" desc=""/>
+    <constraint exp="" field="contact:housenumber" desc=""/>
+    <constraint exp="" field="check_date:opening_hours" desc=""/>
+    <constraint exp="" field="addr:street" desc=""/>
+    <constraint exp="" field="addr:postcode" desc=""/>
+    <constraint exp="" field="addr:housenumber" desc=""/>
+    <constraint exp="" field="addr:city" desc=""/>
+    <constraint exp="" field="fee" desc=""/>
+    <constraint exp="" field="access" desc=""/>
+    <constraint exp="" field="surface" desc=""/>
+    <constraint exp="" field="highway" desc=""/>
+    <constraint exp="" field="roof:shape" desc=""/>
+    <constraint exp="" field="roof:levels" desc=""/>
+    <constraint exp="" field="description" desc=""/>
+    <constraint exp="" field="building:levels" desc=""/>
+    <constraint exp="" field="wall" desc=""/>
+    <constraint exp="" field="leaf_type" desc=""/>
+    <constraint exp="" field="CLC:year" desc=""/>
+    <constraint exp="" field="CLC:id" desc=""/>
+    <constraint exp="" field="CLC:code" desc=""/>
+    <constraint exp="" field="wikipedia" desc=""/>
+    <constraint exp="" field="wikidata" desc=""/>
+    <constraint exp="" field="start_date" desc=""/>
+    <constraint exp="" field="source:url" desc=""/>
+    <constraint exp="" field="ref:INSEE" desc=""/>
+    <constraint exp="" field="political_division" desc=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting shortTitle="OpenStreetMap Browser" notificationMessage="" isEnabledOnlyWhenEditable="0" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" type="5" id="{5c438f3b-31de-411f-a59b-b11776bfdd96}" icon="" capture="0" name="OpenStreetMap Browser">
+    <actionsetting icon="" notificationMessage="" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" type="5" capture="0" name="OpenStreetMap Browser" shortTitle="OpenStreetMap Browser" id="{7ac6cb00-c9e1-4788-9540-7003c2d7adfd}">
       <actionScope id="Field"/>
-      <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="Mapillary" notificationMessage="" isEnabledOnlyWhenEditable="0" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" type="1" id="{1590c504-226a-42de-bcb9-d82be2735184}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" capture="0" name="Mapillary">
+    <actionsetting icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" notificationMessage="" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" type="1" capture="0" name="Mapillary" shortTitle="Mapillary" id="{521337a0-16b4-46ee-91f4-d6f1b1a4d91f}">
       <actionScope id="Field"/>
-      <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="JOSM" notificationMessage="" isEnabledOnlyWhenEditable="0" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" type="1" id="{a85356ff-a078-404b-bb06-b6d1a5bc3f5f}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" capture="0" name="JOSM">
+    <actionsetting icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" notificationMessage="" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" type="1" capture="0" name="JOSM" shortTitle="JOSM" id="{9fa871fb-5ab5-437f-97ba-8961714b0920}">
       <actionScope id="Field"/>
-      <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="User default editor" notificationMessage="" isEnabledOnlyWhenEditable="0" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" type="5" id="{d343594c-111d-43a1-8601-43d7ef9c8898}" icon="" capture="0" name="User default editor">
+    <actionsetting icon="" notificationMessage="" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" type="5" capture="0" name="User default editor" shortTitle="User default editor" id="{79151378-cda8-43b8-a748-18a12813c0ff}">
       <actionScope id="Field"/>
-      <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+  <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
     <columns>
-      <column type="field" hidden="0" name="osm_id" width="-1"/>
-      <column type="field" hidden="0" name="building" width="-1"/>
+      <column type="field" hidden="0" width="-1" name="osm_id"/>
+      <column type="field" hidden="0" width="-1" name="building"/>
       <column type="actions" hidden="1" width="-1"/>
-      <column type="field" hidden="0" name="name" width="-1"/>
-      <column type="field" hidden="0" name="leisure" width="-1"/>
-      <column type="field" hidden="0" name="fid" width="-1"/>
-      <column type="field" hidden="0" name="landuse" width="-1"/>
-      <column type="field" hidden="0" name="natural" width="-1"/>
-      <column type="field" hidden="0" name="boundary" width="-1"/>
-      <column type="field" hidden="0" name="type" width="-1"/>
-      <column type="field" hidden="0" name="osm_way_id" width="-1"/>
-      <column type="field" hidden="0" name="aeroway" width="-1"/>
-      <column type="field" hidden="0" name="amenity" width="-1"/>
-      <column type="field" hidden="0" name="admin_level" width="-1"/>
-      <column type="field" hidden="0" name="barrier" width="-1"/>
-      <column type="field" hidden="0" name="craft" width="-1"/>
-      <column type="field" hidden="0" name="geological" width="-1"/>
-      <column type="field" hidden="0" name="historic" width="-1"/>
-      <column type="field" hidden="0" name="land_area" width="-1"/>
-      <column type="field" hidden="0" name="man_made" width="-1"/>
-      <column type="field" hidden="0" name="military" width="-1"/>
-      <column type="field" hidden="0" name="office" width="-1"/>
-      <column type="field" hidden="0" name="place" width="-1"/>
-      <column type="field" hidden="0" name="shop" width="-1"/>
-      <column type="field" hidden="0" name="sport" width="-1"/>
-      <column type="field" hidden="0" name="tourism" width="-1"/>
-      <column type="field" hidden="0" name="other_tags" width="-1"/>
-      <column type="field" hidden="0" name="school:FR" width="-1"/>
-      <column type="field" hidden="0" name="ref:UAI" width="-1"/>
-      <column type="field" hidden="0" name="wall" width="-1"/>
-      <column type="field" hidden="0" name="highway" width="-1"/>
-      <column type="field" hidden="0" name="parking" width="-1"/>
-      <column type="field" hidden="0" name="fee" width="-1"/>
-      <column type="field" hidden="0" name="access" width="-1"/>
-      <column type="field" hidden="0" name="operator" width="-1"/>
-      <column type="field" hidden="0" name="CLC:year" width="-1"/>
-      <column type="field" hidden="0" name="CLC:id" width="-1"/>
-      <column type="field" hidden="0" name="CLC:code" width="-1"/>
-      <column type="field" hidden="0" name="operator:type" width="-1"/>
-      <column type="field" hidden="0" name="opening_hours" width="-1"/>
-      <column type="field" hidden="0" name="wikipedia" width="-1"/>
-      <column type="field" hidden="0" name="wikidata" width="-1"/>
-      <column type="field" hidden="0" name="start_date" width="-1"/>
-      <column type="field" hidden="0" name="source:url" width="-1"/>
-      <column type="field" hidden="0" name="ref:INSEE" width="-1"/>
-      <column type="field" hidden="0" name="political_division" width="-1"/>
+      <column type="field" hidden="0" width="-1" name="name"/>
+      <column type="field" hidden="0" width="-1" name="leisure"/>
+      <column type="field" hidden="0" width="-1" name="fid"/>
+      <column type="field" hidden="0" width="-1" name="landuse"/>
+      <column type="field" hidden="0" width="-1" name="natural"/>
+      <column type="field" hidden="0" width="-1" name="boundary"/>
+      <column type="field" hidden="0" width="-1" name="type"/>
+      <column type="field" hidden="0" width="-1" name="osm_way_id"/>
+      <column type="field" hidden="0" width="-1" name="aeroway"/>
+      <column type="field" hidden="0" width="-1" name="amenity"/>
+      <column type="field" hidden="0" width="-1" name="admin_level"/>
+      <column type="field" hidden="0" width="-1" name="barrier"/>
+      <column type="field" hidden="0" width="-1" name="craft"/>
+      <column type="field" hidden="0" width="-1" name="geological"/>
+      <column type="field" hidden="0" width="-1" name="historic"/>
+      <column type="field" hidden="0" width="-1" name="land_area"/>
+      <column type="field" hidden="0" width="-1" name="man_made"/>
+      <column type="field" hidden="0" width="-1" name="military"/>
+      <column type="field" hidden="0" width="-1" name="office"/>
+      <column type="field" hidden="0" width="-1" name="place"/>
+      <column type="field" hidden="0" width="-1" name="shop"/>
+      <column type="field" hidden="0" width="-1" name="sport"/>
+      <column type="field" hidden="0" width="-1" name="tourism"/>
+      <column type="field" hidden="0" width="-1" name="other_tags"/>
+      <column type="field" hidden="0" width="-1" name="school:FR"/>
+      <column type="field" hidden="0" width="-1" name="ref:UAI"/>
+      <column type="field" hidden="0" width="-1" name="wall"/>
+      <column type="field" hidden="0" width="-1" name="highway"/>
+      <column type="field" hidden="0" width="-1" name="fee"/>
+      <column type="field" hidden="0" width="-1" name="access"/>
+      <column type="field" hidden="0" width="-1" name="CLC:year"/>
+      <column type="field" hidden="0" width="-1" name="CLC:id"/>
+      <column type="field" hidden="0" width="-1" name="CLC:code"/>
+      <column type="field" hidden="0" width="-1" name="operator:type"/>
+      <column type="field" hidden="0" width="-1" name="opening_hours"/>
+      <column type="field" hidden="0" width="-1" name="wikipedia"/>
+      <column type="field" hidden="0" width="-1" name="wikidata"/>
+      <column type="field" hidden="0" width="-1" name="start_date"/>
+      <column type="field" hidden="0" width="-1" name="source:url"/>
+      <column type="field" hidden="0" width="-1" name="ref:INSEE"/>
+      <column type="field" hidden="0" width="-1" name="political_division"/>
+      <column type="field" hidden="0" width="-1" name="phone"/>
+      <column type="field" hidden="0" width="-1" name="contact:street"/>
+      <column type="field" hidden="0" width="-1" name="contact:housenumber"/>
+      <column type="field" hidden="0" width="-1" name="check_date:opening_hours"/>
+      <column type="field" hidden="0" width="-1" name="addr:street"/>
+      <column type="field" hidden="0" width="-1" name="addr:postcode"/>
+      <column type="field" hidden="0" width="-1" name="addr:housenumber"/>
+      <column type="field" hidden="0" width="-1" name="addr:city"/>
+      <column type="field" hidden="0" width="-1" name="surface"/>
+      <column type="field" hidden="0" width="-1" name="roof:shape"/>
+      <column type="field" hidden="0" width="-1" name="roof:levels"/>
+      <column type="field" hidden="0" width="-1" name="description"/>
+      <column type="field" hidden="0" width="-1" name="building:levels"/>
+      <column type="field" hidden="0" width="-1" name="leaf_type"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1885,7 +2029,10 @@ def my_form_open(dialog, layer, feature):
     <field editable="1" name="building"/>
     <field editable="1" name="building:levels"/>
     <field editable="1" name="building_2"/>
+    <field editable="1" name="check_date:opening_hours"/>
+    <field editable="1" name="contact:housenumber"/>
     <field editable="1" name="contact:phone"/>
+    <field editable="1" name="contact:street"/>
     <field editable="1" name="craft"/>
     <field editable="1" name="craft_2"/>
     <field editable="1" name="crop"/>
@@ -1951,6 +2098,7 @@ def my_form_open(dialog, layer, feature):
     <field editable="1" name="ref:UAI"/>
     <field editable="1" name="religion"/>
     <field editable="1" name="roof:levels"/>
+    <field editable="1" name="roof:shape"/>
     <field editable="1" name="school:FR"/>
     <field editable="1" name="shop"/>
     <field editable="1" name="shop_2"/>
@@ -2001,7 +2149,10 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="building"/>
     <field labelOnTop="0" name="building:levels"/>
     <field labelOnTop="0" name="building_2"/>
+    <field labelOnTop="0" name="check_date:opening_hours"/>
+    <field labelOnTop="0" name="contact:housenumber"/>
     <field labelOnTop="0" name="contact:phone"/>
+    <field labelOnTop="0" name="contact:street"/>
     <field labelOnTop="0" name="craft"/>
     <field labelOnTop="0" name="craft_2"/>
     <field labelOnTop="0" name="crop"/>
@@ -2067,6 +2218,7 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="ref:UAI"/>
     <field labelOnTop="0" name="religion"/>
     <field labelOnTop="0" name="roof:levels"/>
+    <field labelOnTop="0" name="roof:shape"/>
     <field labelOnTop="0" name="school:FR"/>
     <field labelOnTop="0" name="shop"/>
     <field labelOnTop="0" name="shop_2"/>