From 29d983ce4cc0515d303c44e3a204c0dbb1933bc3 Mon Sep 17 00:00:00 2001
From: Jacky Volpes <jacky@volpes.fr>
Date: Thu, 25 Feb 2021 11:25:38 +0100
Subject: [PATCH] Correction des styles

---
 styles/linestring.qml   | 3725 +++++++++++----------------------------
 styles/multipolygon.qml | 1008 ++++++-----
 styles/point.qml        | 1976 +++++++--------------
 3 files changed, 2156 insertions(+), 4553 deletions(-)

diff --git a/styles/linestring.qml b/styles/linestring.qml
index 302843f..7b773a8 100644
--- a/styles/linestring.qml
+++ b/styles/linestring.qml
@@ -1,746 +1,817 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis labelsEnabled="1" minScale="1e+08" maxScale="0" readOnly="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" version="3.10.4-A Coruña" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1">
+<qgis version="3.16.3-Hannover" labelsEnabled="1" readOnly="0" simplifyDrawingHints="1" simplifyDrawingTol="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="100000000" simplifyAlgorithm="0" simplifyLocal="1" simplifyMaxScale="1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 enableorderby="0" type="RuleRenderer" forceraster="0" symbollevels="0">
+  <temporal durationUnit="min" startExpression="" accumulate="0" fixedDuration="0" mode="0" endField="" enabled="0" durationField="" startField="" endExpression="">
+    <fixedRange>
+      <start></start>
+      <end></end>
+    </fixedRange>
+  </temporal>
+  <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
     <rules key="{129f6cf8-aa75-48cf-b691-24d3444e2b54}">
-      <rule filter="&quot;barrier&quot;='fence'" label="clôture" key="{1a510d65-0068-471e-9308-7459cd087491}" symbol="0"/>
-      <rule filter="&quot;barrier&quot;='wall'" label="mur" key="{a6e99132-537a-4948-86b5-8a65f769f21c}" symbol="1"/>
-      <rule filter="&quot;barrier&quot;='hedge'" label="haie" key="{5fd61f11-9766-4c13-8461-46cbfde5e90f}" symbol="2"/>
-      <rule filter="&quot;man_made&quot;='dyke'" label="digue" key="{9350847a-7763-4cd4-a9d0-4b1336c3aa67}" symbol="3"/>
-      <rule filter="&quot;waterway&quot;='river' or &quot;waterway&quot;='stream'" label="rivière" key="{3067fb57-79a9-4ed2-880a-2d91943ce66a}" symbol="4"/>
-      <rule filter="&quot;bridge&quot;='yes'" label="pont" key="{64c70c7e-88c1-4195-b7c5-50be2d0e34d2}" symbol="5"/>
-      <rule filter="&quot;highway&quot;='steps'" label="escalier" key="{6eb81f3c-bc99-41b9-b35a-afdee5606037}" symbol="6"/>
-      <rule filter="&quot;highway&quot;='primary'or&quot;highway&quot;='secondary'or&quot;highway&quot;='tertiary'or&quot;highway&quot;='residential'or&quot;highway&quot;='service' and &quot;service&quot;&lt;>'parking_aisle'or&quot;highway&quot;='unclassified'or&quot;highway&quot;='service'" label="rue, route" key="{2577b237-e0ad-418e-91e5-b30104eccaba}" symbol="7"/>
-      <rule filter="&quot;highway&quot;='path'or&quot;highway&quot;='footway'" label="sentier, chemin piéton" key="{9f9b2742-9499-437e-bee3-ec35588d9c75}" symbol="8"/>
-      <rule filter="&quot;highway&quot;='track'" label="piste" key="{32ab4ffd-6eb5-4497-81c0-c07bf261fca9}" symbol="9"/>
-      <rule filter="&quot;waterway&quot;='canal'" label="canal" key="{0819eb16-d95f-4f3f-9dd2-a5a7f989d83d}" symbol="10"/>
+      <rule key="{1a510d65-0068-471e-9308-7459cd087491}" label="clôture" symbol="0" filter="&quot;barrier&quot;='fence'"/>
+      <rule key="{a6e99132-537a-4948-86b5-8a65f769f21c}" label="mur" symbol="1" filter="&quot;barrier&quot;='wall'"/>
+      <rule key="{5fd61f11-9766-4c13-8461-46cbfde5e90f}" label="haie" symbol="2" filter="&quot;barrier&quot;='hedge'"/>
+      <rule key="{9350847a-7763-4cd4-a9d0-4b1336c3aa67}" label="digue" symbol="3" filter="&quot;man_made&quot;='dyke'"/>
+      <rule key="{3067fb57-79a9-4ed2-880a-2d91943ce66a}" label="rivière" symbol="4" filter="&quot;waterway&quot;='river' or &quot;waterway&quot;='stream'"/>
+      <rule key="{64c70c7e-88c1-4195-b7c5-50be2d0e34d2}" label="pont" symbol="5" filter="regexp_match(&quot;other_tags&quot;, '&quot;bridge&quot;=>&quot;yes&quot;')"/>
+      <rule key="{6eb81f3c-bc99-41b9-b35a-afdee5606037}" label="escalier" symbol="6" filter="&quot;highway&quot;='steps'"/>
+      <rule key="{2577b237-e0ad-418e-91e5-b30104eccaba}" label="rue, route" symbol="7" filter="&quot;highway&quot;='primary' or &quot;highway&quot;='secondary' or &quot;highway&quot;='tertiary' or &quot;highway&quot;='residential' or &quot;highway&quot;='service' and (not regexp_match(&quot;other_tags&quot;, '&quot;service&quot;=>&quot;parking_aisle&quot;') or &quot;other_tags&quot; is null) or&quot;highway&quot;='unclassified' or &quot;highway&quot;='service'"/>
+      <rule key="{9f9b2742-9499-437e-bee3-ec35588d9c75}" label="sentier, chemin piéton" symbol="8" filter="&quot;highway&quot;='path' or &quot;highway&quot;='footway'"/>
+      <rule key="{32ab4ffd-6eb5-4497-81c0-c07bf261fca9}" label="piste" symbol="9" filter="&quot;highway&quot;='track'"/>
+      <rule key="{0819eb16-d95f-4f3f-9dd2-a5a7f989d83d}" label="canal" symbol="10" filter="&quot;waterway&quot;='canal'"/>
     </rules>
     <symbols>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="0" force_rhr="0">
-        <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" 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="round" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.4" 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"/>
+      <symbol name="0" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="1" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.4"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-          <prop v="4" k="average_angle_length"/>
-          <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-          <prop v="MM" k="average_angle_unit"/>
-          <prop v="3" k="interval"/>
-          <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-          <prop v="MM" k="interval_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="0" k="offset_along_line"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-          <prop v="MM" k="offset_along_line_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="interval" k="placement"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="1" k="rotate"/>
+        <layer class="MarkerLine" pass="0" locked="0" enabled="1">
+          <prop k="average_angle_length" v="4"/>
+          <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="average_angle_unit" v="MM"/>
+          <prop k="interval" v="3"/>
+          <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="interval_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_along_line" v="0"/>
+          <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_along_line_unit" v="MM"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="placement" v="interval"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="rotate" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@1" force_rhr="0">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="255,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="line" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="2.4" 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"/>
+          <symbol name="@0@1" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="line"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="2.4"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="1" force_rhr="0">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="170,170,170,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="1.2" k="line_width"/>
-          <prop v="MapUnit" 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"/>
+      <symbol name="1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="170,170,170,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="1.2"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="10" force_rhr="0">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="25,140,255,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="1" k="line_width"/>
-          <prop v="MapUnit" 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="MapUnit" 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"/>
+      <symbol name="10" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="25,140,255,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="1"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="2" force_rhr="0">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" 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="round" k="joinstyle"/>
-          <prop v="4,159,66,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="1.86" k="line_width"/>
-          <prop v="MapUnit" 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"/>
+      <symbol name="2" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="4,159,66,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="1.86"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <effect type="effectStack" enabled="1">
             <effect type="dropShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="outerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="0.7935" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="1" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="83,255,129,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="0.7935"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="1"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="83,255,129,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
             <effect type="drawSource">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="1" k="enabled"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="1"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="outerGlow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.146" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.146"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
             <effect type="innerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="0.7935" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.386" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="0.7935"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.386"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="3" force_rhr="0">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.66" 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"/>
+      <symbol name="3" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.66"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="4" force_rhr="0">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="25,140,255,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="6" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" 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"/>
+      <symbol name="4" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="25,140,255,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="6"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="5" force_rhr="0">
-        <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-          <prop v="4" k="average_angle_length"/>
-          <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-          <prop v="MM" k="average_angle_unit"/>
-          <prop v="3" k="interval"/>
-          <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-          <prop v="MapUnit" k="interval_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="0" k="offset_along_line"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_along_line_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="centralpoint" k="placement"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="1" k="rotate"/>
+      <symbol name="5" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="MarkerLine" pass="0" locked="0" enabled="1">
+          <prop k="average_angle_length" v="4"/>
+          <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="average_angle_unit" v="MM"/>
+          <prop k="interval" v="3"/>
+          <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="interval_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_along_line" v="0"/>
+          <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_along_line_unit" v="MapUnit"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="placement" v="centralpoint"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="rotate" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@5@0" force_rhr="0">
-            <layer locked="0" enabled="1" class="SvgMarker" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/pont.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MapUnit" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="8" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MapUnit" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="@5@0" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/pont.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MapUnit"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="8"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MapUnit"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="6" force_rhr="0">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="134,134,134,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="-1.4" 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"/>
+      <symbol name="6" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="134,134,134,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="-1.4"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="134,134,134,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="1.4" 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"/>
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="134,134,134,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="1.4"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-          <prop v="4" k="average_angle_length"/>
-          <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-          <prop v="MM" k="average_angle_unit"/>
-          <prop v="1.5" k="interval"/>
-          <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-          <prop v="MM" k="interval_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="0" k="offset_along_line"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-          <prop v="MM" k="offset_along_line_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="interval" k="placement"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="1" k="rotate"/>
+        <layer class="MarkerLine" pass="0" locked="0" enabled="1">
+          <prop k="average_angle_length" v="4"/>
+          <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="average_angle_unit" v="MM"/>
+          <prop k="interval" v="1.5"/>
+          <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="interval_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_along_line" v="0"/>
+          <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_along_line_unit" v="MM"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="placement" v="interval"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="rotate" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@6@2" force_rhr="0">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="255,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="line" 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="69,69,69,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="area" k="scale_method"/>
-              <prop v="1.1" 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"/>
+          <symbol name="@6@2" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="line"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="69,69,69,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="1.1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="7" force_rhr="0">
-        <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-          <prop v="flat" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="4" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" 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="RenderMetersInMapUnits" 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"/>
+      <symbol name="7" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="1" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="flat"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="RenderMetersInMapUnits"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="4"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="RenderMetersInMapUnits"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <effect type="effectStack" enabled="1">
             <effect type="dropShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="outerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
             <effect type="drawSource">
-              <prop v="18" k="blend_mode"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="1" k="enabled"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="18"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="1"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="innerShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="innerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="flat" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="255,255,255,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="3.24528" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" 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="RenderMetersInMapUnits" 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"/>
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="flat"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="RenderMetersInMapUnits"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="255,255,255,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="3.24528"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="RenderMetersInMapUnits"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="8" force_rhr="0">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" k="capstyle"/>
-          <prop v="0.66;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="round" k="joinstyle"/>
-          <prop v="219,30,42,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="1" 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="1" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol name="8" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="0.66;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="219,30,42,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="1"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="1"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="9" force_rhr="0">
-        <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="3" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" 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="RenderMetersInMapUnits" 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"/>
+      <symbol name="9" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleLine" pass="0" locked="1" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="RenderMetersInMapUnits"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="3"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="RenderMetersInMapUnits"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <effect type="effectStack" enabled="1">
             <effect type="dropShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="outerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
             <effect type="drawSource">
-              <prop v="18" k="blend_mode"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="1" k="enabled"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="18"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="1"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="innerShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="innerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="243,188,84,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="2.43396" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" 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="RenderMetersInMapUnits" 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"/>
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="RenderMetersInMapUnits"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="243,188,84,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="2.43396"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="RenderMetersInMapUnits"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -748,82 +819,84 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{e99c3eb6-3729-415e-b0ed-09395f5d6729}">
-      <rule filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'" key="{bbe3a18f-7c18-425a-adaa-3b027cdbc66b}">
+    <rules key="{575af93c-52a9-4e3e-abc4-bee9d330feb4}">
+      <rule key="{8234e428-06e6-4aac-9591-153a506f1018}" filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" fontFamily="Liberation Sans" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fieldName="name" textColor="0,0,0,255" fontCapitals="0" blendMode="0" fontLetterSpacing="0" namedStyle="Regular" fontItalic="0" fontWordSpacing="0" textOrientation="horizontal" fontSizeUnit="Point" fontStrikeout="0" previewBkgrdColor="255,255,255,255" fontUnderline="0" fontWeight="50" fontSize="10" multilineHeight="1">
-            <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferJoinStyle="128" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1"/>
-            <background shapeSizeType="0" shapeRotation="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeType="0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeOffsetY="0" shapeRotationType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeSizeX="0" shapeSVGFile="" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol type="marker" clip_to_extent="1" alpha="1" name="markerSymbol" force_rhr="0">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="232,113,141,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+          <text-style fontLetterSpacing="0" fontWeight="50" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" blendMode="0" fontFamily="Liberation Sans" fontSize="10" multilineHeight="1" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontWordSpacing="0" allowHtml="0" textOpacity="1" isExpression="0" fontKerning="1" fontStrikeout="0" fontItalic="0" textColor="0,0,0,255" fontUnderline="0" fontSizeUnit="Point" useSubstitutions="0" fieldName="name">
+            <text-buffer bufferSizeUnits="MM" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskSizeUnits="MM" maskedSymbolLayers="" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSize="0"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeRotationType="0" shapeOpacity="1" shapeBlendMode="0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiUnit="MM" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeSizeX="0" shapeBorderWidth="0" shapeRadiiY="0">
+              <symbol name="markerSymbol" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+                <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="232,113,141,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOpacity="0.7" shadowScale="100"/>
+            <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetDist="1" shadowOpacity="0.7"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" addDirectionSymbol="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" wrapChar="" formatNumbers="0" leftDirectionSymbol="&lt;" plussign="0" decimals="3"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" distUnits="MM" fitInPolygonOnly="0" dist="0" geometryGeneratorEnabled="0" offsetUnits="MM" overrunDistanceUnit="MM" xOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" yOffset="0" overrunDistance="0" placement="3" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" geometryGenerator="" priority="5" rotationAngle="0" repeatDistance="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="9" offsetType="0" layerType="LineGeometry"/>
-          <rendering maxNumLabels="2000" obstacle="1" limitNumLabels="0" obstacleType="0" zIndex="0" labelPerPart="0" mergeLines="0" fontMaxPixelSize="10000" drawLabels="1" fontLimitPixelSize="0" minFeatureSize="0" obstacleFactor="1" displayAll="0" scaleVisibility="0" scaleMin="0" fontMinPixelSize="3" scaleMax="0" upsidedownLabels="0"/>
+          <text-format rightDirectionSymbol=">" decimals="3" leftDirectionSymbol="&lt;" addDirectionSymbol="0" wrapChar="" autoWrapLength="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" formatNumbers="0" multilineAlign="0"/>
+          <placement overrunDistanceUnit="MM" offsetUnits="MM" rotationAngle="0" lineAnchorType="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" placementFlags="9" distUnits="MM" placement="3" quadOffset="4" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" xOffset="0" geometryGeneratorEnabled="0" polygonPlacementFlags="2" yOffset="0" overrunDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetType="0" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="0" layerType="LineGeometry" geometryGenerator="" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering obstacleType="0" scaleMax="0" limitNumLabels="0" obstacleFactor="1" obstacle="1" labelPerPart="0" scaleVisibility="0" fontMaxPixelSize="10000" zIndex="0" upsidedownLabels="0" scaleMin="0" fontMinPixelSize="3" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" displayAll="0" mergeLines="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&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 type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol name=&quot;symbol&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot;>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -831,1182 +904,134 @@
     </rules>
   </labeling>
   <customproperties>
-    <property value="0" key="embeddedWidgets/count"/>
-    <property value="quickosm_query" key="variableNames"/>
-    <property value="&lt;osm-script bbox=&quot;44.08902897426553,6.24723494052887,44.089850630280395,6.249284148216248&quot;>&#xa;  &lt;union into=&quot;_&quot;>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;bench&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;gate&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;trash&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;building&quot; modv=&quot;&quot; v=&quot;&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;information&quot; modv=&quot;&quot; v=&quot;board&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree_stump&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;wall&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;playground&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;picnic_table&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;fence&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;landuse&quot; modv=&quot;&quot; v=&quot;grass&quot;/>&#xa;    &lt;/query>&#xa;  &lt;/union>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;  &lt;recurse from=&quot;_&quot; into=&quot;_&quot; type=&quot;down&quot;/>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;&lt;/osm-script>" key="variableValues"/>
+    <property key="dualview/previewExpressions" value="full_id"/>
+    <property key="embeddedWidgets/count" value="0"/>
+    <property key="variableNames" value="quickosm_query"/>
+    <property key="variableValues" value="&lt;osm-script bbox=&quot;44.08902897426553,6.24723494052887,44.089850630280395,6.249284148216248&quot;>&#xa;  &lt;union into=&quot;_&quot;>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;bench&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;gate&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;trash&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;building&quot; modv=&quot;&quot; v=&quot;&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;information&quot; modv=&quot;&quot; v=&quot;board&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree_stump&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;wall&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;playground&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;picnic_table&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;fence&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;landuse&quot; modv=&quot;&quot; v=&quot;grass&quot;/>&#xa;    &lt;/query>&#xa;  &lt;/union>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;  &lt;recurse from=&quot;_&quot; into=&quot;_&quot; type=&quot;down&quot;/>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;&lt;/osm-script>"/>
   </customproperties>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
   <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory enabled="0" barWidth="5" scaleBasedVisibility="0" minScaleDenominator="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" minimumSize="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15" sizeType="MM" diagramOrientation="Up" penWidth="0" width="15" scaleDependency="Area" maxScaleDenominator="1e+08" lineSizeType="MM" backgroundColor="#ffffff" backgroundAlpha="255">
-      <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-      <attribute field="" label="" color="#000000"/>
+    <DiagramCategory backgroundColor="#ffffff" showAxis="0" minimumSize="0" direction="1" minScaleDenominator="0" width="15" barWidth="5" spacingUnit="MM" labelPlacementMethod="XHeight" spacing="0" maxScaleDenominator="1e+8" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" sizeType="MM" scaleBasedVisibility="0" rotationOffset="270" scaleDependency="Area" lineSizeType="MM" backgroundAlpha="255" penAlpha="255" penWidth="0" height="15" opacity="1" diagramOrientation="Up" sizeScale="3x:0,0,0,0,0,0">
+      <fontProperties style="" description="Liberation Sans,10,-1,5,50,0,0,0,0,0"/>
+      <attribute label="" field="" color="#000000"/>
+      <axisSymbol>
+        <symbol name="" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+          <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+            <prop k="align_dash_pattern" v="0"/>
+            <prop k="capstyle" v="square"/>
+            <prop k="customdash" v="5;2"/>
+            <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="customdash_unit" v="MM"/>
+            <prop k="dash_pattern_offset" v="0"/>
+            <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="dash_pattern_offset_unit" v="MM"/>
+            <prop k="draw_inside_polygon" v="0"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="line_color" v="35,35,35,255"/>
+            <prop k="line_style" v="solid"/>
+            <prop k="line_width" v="0.26"/>
+            <prop k="line_width_unit" v="MM"/>
+            <prop k="offset" v="0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="ring_filter" v="0"/>
+            <prop k="tweak_dash_pattern_on_corners" v="0"/>
+            <prop k="use_custom_dash" v="0"/>
+            <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+          </layer>
+        </symbol>
+      </axisSymbol>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings obstacle="0" placement="2" dist="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0">
+  <DiagramLayerSettings obstacle="0" linePlacementFlags="18" priority="0" showAll="1" dist="0" placement="2" zIndex="0">
     <properties>
       <Option type="Map">
-        <Option type="QString" value="" name="name"/>
+        <Option name="name" type="QString" value=""/>
         <Option name="properties"/>
-        <Option type="QString" value="collection" name="type"/>
+        <Option name="type" type="QString" value="collection"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
-  <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+  <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
     <activeChecks/>
     <checkConfiguration/>
   </geometryOptions>
+  <legend type="default-vector"/>
+  <referencedLayers/>
   <fieldConfiguration>
-    <field name="fid">
+    <field name="fid" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="full_id">
+    <field name="osm_id" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_id">
+    <field name="name" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_type">
+    <field name="highway" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="cycleway">
+    <field name="waterway" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="highway">
+    <field name="aerialway" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="lanes">
+    <field name="barrier" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="maxspeed">
+    <field name="man_made" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="oneway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="surface">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="junction">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lit">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="toll">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cycleway:right">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bicycle">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="foot">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="sidewalk">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="turn:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bridge">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="layer">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="noname">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:colour">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ref:FR:FANTOIR">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="int_ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="operator">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:maxspeed">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxheight">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="tunnel">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lanes:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lanes:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxweight">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cycleway:both">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="old_ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="old_name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:oc">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:name:oc">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="boundary">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="political_division">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:conditional">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="distance">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:type">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:width">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="width">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="transit:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bridge:name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:colour:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="placement">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:symbol:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="railway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cutting">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:advisory">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lane_markings">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:symbol">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="embankment">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="alt_name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:hazmat">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="tunnel:name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wikidata">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="smoothness">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:wikidata">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxweight:signed">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cycleway:left">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="traffic_calming">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="motorroad">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cycleway:lane">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="level">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bus_bay">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="tracktype">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="service">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="description">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="motor_vehicle">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="mtb:scale">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="sac_scale">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="mtb">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="history">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="incline">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="mtb:scale:uphill">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bus">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="psv">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="mtb:description">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="segregated">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:maxspeed:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:maxspeed:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="turn:lanes:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="parking:lane:right">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="tourism">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wikipedia">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="smoothness:date">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="hgv">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="motorcar">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="motorcycle">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="turn:lanes:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="horse">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="note:railway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bus:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxweight:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="psv:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="trail_visibility">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="trailblazed">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="parking:lane:both">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="paved">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="snowmobile">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="piste:difficulty">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="piste:type">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxheight:forward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:forward:conditional">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="weight">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="oneway:bicycle">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bridge:structure">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="excellent">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="living_street">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="busway:right">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ford">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access:conditional">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="marked_trail">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="survey_date">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:fr">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="route">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="type">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="waterway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="network">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="motorway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:backward:conditional">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="railway:end_date">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="railway:start_date">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="local_ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="public_transport">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wheelchair">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="sac_scale_ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="parking:lane:left">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:etymology:wikidata">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ref:sandre">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="local_name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="crossing">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="footway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="change:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="taxi">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lanes:both_ways">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lanes:hgv">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cycleway:right:segregated">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="man_made">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="departures_board">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:ru">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed:source">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:ref:lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="barrier">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access:lanes:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="psv:lanes:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxwidth">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="informal">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="natural">
-      <editWidget type="TextEdit">
+    <field name="z_order" configurationFlags="None">
+      <editWidget type="Range">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="maxspeed:hgv">
+    <field name="other_tags" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -2015,867 +1040,90 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias field="fid" index="0" name=""/>
-    <alias field="full_id" index="1" name=""/>
-    <alias field="osm_id" index="2" name=""/>
-    <alias field="osm_type" index="3" name=""/>
-    <alias field="cycleway" index="4" name=""/>
-    <alias field="highway" index="5" name=""/>
-    <alias field="lanes" index="6" name=""/>
-    <alias field="maxspeed" index="7" name=""/>
-    <alias field="name" index="8" name=""/>
-    <alias field="oneway" index="9" name=""/>
-    <alias field="ref" index="10" name=""/>
-    <alias field="surface" index="11" name=""/>
-    <alias field="junction" index="12" name=""/>
-    <alias field="destination" index="13" name=""/>
-    <alias field="destination:ref" index="14" name=""/>
-    <alias field="lit" index="15" name=""/>
-    <alias field="toll" index="16" name=""/>
-    <alias field="cycleway:right" index="17" name=""/>
-    <alias field="bicycle" index="18" name=""/>
-    <alias field="foot" index="19" name=""/>
-    <alias field="sidewalk" index="20" name=""/>
-    <alias field="turn:lanes" index="21" name=""/>
-    <alias field="bridge" index="22" name=""/>
-    <alias field="layer" index="23" name=""/>
-    <alias field="noname" index="24" name=""/>
-    <alias field="destination:colour" index="25" name=""/>
-    <alias field="ref:FR:FANTOIR" index="26" name=""/>
-    <alias field="int_ref" index="27" name=""/>
-    <alias field="operator" index="28" name=""/>
-    <alias field="source:maxspeed" index="29" name=""/>
-    <alias field="maxheight" index="30" name=""/>
-    <alias field="tunnel" index="31" name=""/>
-    <alias field="lanes:backward" index="32" name=""/>
-    <alias field="lanes:forward" index="33" name=""/>
-    <alias field="maxweight" index="34" name=""/>
-    <alias field="cycleway:both" index="35" name=""/>
-    <alias field="source:name" index="36" name=""/>
-    <alias field="old_ref" index="37" name=""/>
-    <alias field="old_name" index="38" name=""/>
-    <alias field="name:oc" index="39" name=""/>
-    <alias field="source:name:oc" index="40" name=""/>
-    <alias field="boundary" index="41" name=""/>
-    <alias field="political_division" index="42" name=""/>
-    <alias field="maxspeed:conditional" index="43" name=""/>
-    <alias field="distance" index="44" name=""/>
-    <alias field="maxspeed:type" index="45" name=""/>
-    <alias field="source:width" index="46" name=""/>
-    <alias field="width" index="47" name=""/>
-    <alias field="transit:lanes" index="48" name=""/>
-    <alias field="bridge:name" index="49" name=""/>
-    <alias field="destination:colour:lanes" index="50" name=""/>
-    <alias field="destination:lanes" index="51" name=""/>
-    <alias field="placement" index="52" name=""/>
-    <alias field="destination:symbol:lanes" index="53" name=""/>
-    <alias field="railway" index="54" name=""/>
-    <alias field="cutting" index="55" name=""/>
-    <alias field="maxspeed:advisory" index="56" name=""/>
-    <alias field="lane_markings" index="57" name=""/>
-    <alias field="destination:symbol" index="58" name=""/>
-    <alias field="embankment" index="59" name=""/>
-    <alias field="alt_name" index="60" name=""/>
-    <alias field="maxspeed:hazmat" index="61" name=""/>
-    <alias field="tunnel:name" index="62" name=""/>
-    <alias field="wikidata" index="63" name=""/>
-    <alias field="smoothness" index="64" name=""/>
-    <alias field="name:wikidata" index="65" name=""/>
-    <alias field="maxweight:signed" index="66" name=""/>
-    <alias field="cycleway:left" index="67" name=""/>
-    <alias field="traffic_calming" index="68" name=""/>
-    <alias field="motorroad" index="69" name=""/>
-    <alias field="destination:forward" index="70" name=""/>
-    <alias field="destination:backward" index="71" name=""/>
-    <alias field="cycleway:lane" index="72" name=""/>
-    <alias field="level" index="73" name=""/>
-    <alias field="bus_bay" index="74" name=""/>
-    <alias field="tracktype" index="75" name=""/>
-    <alias field="service" index="76" name=""/>
-    <alias field="description" index="77" name=""/>
-    <alias field="access" index="78" name=""/>
-    <alias field="motor_vehicle" index="79" name=""/>
-    <alias field="mtb:scale" index="80" name=""/>
-    <alias field="sac_scale" index="81" name=""/>
-    <alias field="mtb" index="82" name=""/>
-    <alias field="history" index="83" name=""/>
-    <alias field="incline" index="84" name=""/>
-    <alias field="mtb:scale:uphill" index="85" name=""/>
-    <alias field="bus" index="86" name=""/>
-    <alias field="psv" index="87" name=""/>
-    <alias field="mtb:description" index="88" name=""/>
-    <alias field="segregated" index="89" name=""/>
-    <alias field="maxspeed:backward" index="90" name=""/>
-    <alias field="maxspeed:forward" index="91" name=""/>
-    <alias field="source:maxspeed:forward" index="92" name=""/>
-    <alias field="source:maxspeed:backward" index="93" name=""/>
-    <alias field="turn:lanes:backward" index="94" name=""/>
-    <alias field="parking:lane:right" index="95" name=""/>
-    <alias field="tourism" index="96" name=""/>
-    <alias field="wikipedia" index="97" name=""/>
-    <alias field="smoothness:date" index="98" name=""/>
-    <alias field="hgv" index="99" name=""/>
-    <alias field="motorcar" index="100" name=""/>
-    <alias field="motorcycle" index="101" name=""/>
-    <alias field="turn:lanes:forward" index="102" name=""/>
-    <alias field="horse" index="103" name=""/>
-    <alias field="note:railway" index="104" name=""/>
-    <alias field="bus:forward" index="105" name=""/>
-    <alias field="maxweight:forward" index="106" name=""/>
-    <alias field="psv:forward" index="107" name=""/>
-    <alias field="trail_visibility" index="108" name=""/>
-    <alias field="trailblazed" index="109" name=""/>
-    <alias field="parking:lane:both" index="110" name=""/>
-    <alias field="paved" index="111" name=""/>
-    <alias field="snowmobile" index="112" name=""/>
-    <alias field="piste:difficulty" index="113" name=""/>
-    <alias field="piste:type" index="114" name=""/>
-    <alias field="maxheight:forward" index="115" name=""/>
-    <alias field="maxspeed:forward:conditional" index="116" name=""/>
-    <alias field="weight" index="117" name=""/>
-    <alias field="oneway:bicycle" index="118" name=""/>
-    <alias field="bridge:structure" index="119" name=""/>
-    <alias field="excellent" index="120" name=""/>
-    <alias field="living_street" index="121" name=""/>
-    <alias field="busway:right" index="122" name=""/>
-    <alias field="ford" index="123" name=""/>
-    <alias field="access:conditional" index="124" name=""/>
-    <alias field="marked_trail" index="125" name=""/>
-    <alias field="survey_date" index="126" name=""/>
-    <alias field="name:fr" index="127" name=""/>
-    <alias field="route" index="128" name=""/>
-    <alias field="type" index="129" name=""/>
-    <alias field="waterway" index="130" name=""/>
-    <alias field="network" index="131" name=""/>
-    <alias field="motorway" index="132" name=""/>
-    <alias field="maxspeed:backward:conditional" index="133" name=""/>
-    <alias field="railway:end_date" index="134" name=""/>
-    <alias field="railway:start_date" index="135" name=""/>
-    <alias field="local_ref" index="136" name=""/>
-    <alias field="public_transport" index="137" name=""/>
-    <alias field="wheelchair" index="138" name=""/>
-    <alias field="sac_scale_ref" index="139" name=""/>
-    <alias field="parking:lane:left" index="140" name=""/>
-    <alias field="name:etymology:wikidata" index="141" name=""/>
-    <alias field="ref:sandre" index="142" name=""/>
-    <alias field="local_name" index="143" name=""/>
-    <alias field="crossing" index="144" name=""/>
-    <alias field="footway" index="145" name=""/>
-    <alias field="access:lanes" index="146" name=""/>
-    <alias field="change:lanes" index="147" name=""/>
-    <alias field="taxi" index="148" name=""/>
-    <alias field="lanes:both_ways" index="149" name=""/>
-    <alias field="lanes:hgv" index="150" name=""/>
-    <alias field="cycleway:right:segregated" index="151" name=""/>
-    <alias field="maxspeed:lanes" index="152" name=""/>
-    <alias field="man_made" index="153" name=""/>
-    <alias field="departures_board" index="154" name=""/>
-    <alias field="name:ru" index="155" name=""/>
-    <alias field="maxspeed:source" index="156" name=""/>
-    <alias field="destination:ref:lanes" index="157" name=""/>
-    <alias field="barrier" index="158" name=""/>
-    <alias field="access:lanes:backward" index="159" name=""/>
-    <alias field="psv:lanes:backward" index="160" name=""/>
-    <alias field="maxwidth" index="161" name=""/>
-    <alias field="informal" index="162" name=""/>
-    <alias field="natural" index="163" name=""/>
-    <alias field="maxspeed:hgv" index="164" name=""/>
+    <alias name="" field="fid" index="0"/>
+    <alias name="" field="osm_id" index="1"/>
+    <alias name="" field="name" index="2"/>
+    <alias name="" field="highway" index="3"/>
+    <alias name="" field="waterway" index="4"/>
+    <alias name="" field="aerialway" index="5"/>
+    <alias name="" field="barrier" index="6"/>
+    <alias name="" field="man_made" index="7"/>
+    <alias name="" field="z_order" index="8"/>
+    <alias name="" field="other_tags" index="9"/>
   </aliases>
-  <excludeAttributesWMS/>
-  <excludeAttributesWFS/>
   <defaults>
-    <default field="fid" expression="" applyOnUpdate="0"/>
-    <default field="full_id" expression="" applyOnUpdate="0"/>
-    <default field="osm_id" expression="" applyOnUpdate="0"/>
-    <default field="osm_type" expression="" applyOnUpdate="0"/>
-    <default field="cycleway" expression="" applyOnUpdate="0"/>
-    <default field="highway" expression="" applyOnUpdate="0"/>
-    <default field="lanes" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed" expression="" applyOnUpdate="0"/>
-    <default field="name" expression="" applyOnUpdate="0"/>
-    <default field="oneway" expression="" applyOnUpdate="0"/>
-    <default field="ref" expression="" applyOnUpdate="0"/>
-    <default field="surface" expression="" applyOnUpdate="0"/>
-    <default field="junction" expression="" applyOnUpdate="0"/>
-    <default field="destination" expression="" applyOnUpdate="0"/>
-    <default field="destination:ref" expression="" applyOnUpdate="0"/>
-    <default field="lit" expression="" applyOnUpdate="0"/>
-    <default field="toll" expression="" applyOnUpdate="0"/>
-    <default field="cycleway:right" expression="" applyOnUpdate="0"/>
-    <default field="bicycle" expression="" applyOnUpdate="0"/>
-    <default field="foot" expression="" applyOnUpdate="0"/>
-    <default field="sidewalk" expression="" applyOnUpdate="0"/>
-    <default field="turn:lanes" expression="" applyOnUpdate="0"/>
-    <default field="bridge" expression="" applyOnUpdate="0"/>
-    <default field="layer" expression="" applyOnUpdate="0"/>
-    <default field="noname" expression="" applyOnUpdate="0"/>
-    <default field="destination:colour" expression="" applyOnUpdate="0"/>
-    <default field="ref:FR:FANTOIR" expression="" applyOnUpdate="0"/>
-    <default field="int_ref" expression="" applyOnUpdate="0"/>
-    <default field="operator" expression="" applyOnUpdate="0"/>
-    <default field="source:maxspeed" expression="" applyOnUpdate="0"/>
-    <default field="maxheight" expression="" applyOnUpdate="0"/>
-    <default field="tunnel" expression="" applyOnUpdate="0"/>
-    <default field="lanes:backward" expression="" applyOnUpdate="0"/>
-    <default field="lanes:forward" expression="" applyOnUpdate="0"/>
-    <default field="maxweight" expression="" applyOnUpdate="0"/>
-    <default field="cycleway:both" expression="" applyOnUpdate="0"/>
-    <default field="source:name" expression="" applyOnUpdate="0"/>
-    <default field="old_ref" expression="" applyOnUpdate="0"/>
-    <default field="old_name" expression="" applyOnUpdate="0"/>
-    <default field="name:oc" expression="" applyOnUpdate="0"/>
-    <default field="source:name:oc" expression="" applyOnUpdate="0"/>
-    <default field="boundary" expression="" applyOnUpdate="0"/>
-    <default field="political_division" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:conditional" expression="" applyOnUpdate="0"/>
-    <default field="distance" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:type" expression="" applyOnUpdate="0"/>
-    <default field="source:width" expression="" applyOnUpdate="0"/>
-    <default field="width" expression="" applyOnUpdate="0"/>
-    <default field="transit:lanes" expression="" applyOnUpdate="0"/>
-    <default field="bridge:name" expression="" applyOnUpdate="0"/>
-    <default field="destination:colour:lanes" expression="" applyOnUpdate="0"/>
-    <default field="destination:lanes" expression="" applyOnUpdate="0"/>
-    <default field="placement" expression="" applyOnUpdate="0"/>
-    <default field="destination:symbol:lanes" expression="" applyOnUpdate="0"/>
-    <default field="railway" expression="" applyOnUpdate="0"/>
-    <default field="cutting" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:advisory" expression="" applyOnUpdate="0"/>
-    <default field="lane_markings" expression="" applyOnUpdate="0"/>
-    <default field="destination:symbol" expression="" applyOnUpdate="0"/>
-    <default field="embankment" expression="" applyOnUpdate="0"/>
-    <default field="alt_name" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:hazmat" expression="" applyOnUpdate="0"/>
-    <default field="tunnel:name" expression="" applyOnUpdate="0"/>
-    <default field="wikidata" expression="" applyOnUpdate="0"/>
-    <default field="smoothness" expression="" applyOnUpdate="0"/>
-    <default field="name:wikidata" expression="" applyOnUpdate="0"/>
-    <default field="maxweight:signed" expression="" applyOnUpdate="0"/>
-    <default field="cycleway:left" expression="" applyOnUpdate="0"/>
-    <default field="traffic_calming" expression="" applyOnUpdate="0"/>
-    <default field="motorroad" expression="" applyOnUpdate="0"/>
-    <default field="destination:forward" expression="" applyOnUpdate="0"/>
-    <default field="destination:backward" expression="" applyOnUpdate="0"/>
-    <default field="cycleway:lane" expression="" applyOnUpdate="0"/>
-    <default field="level" expression="" applyOnUpdate="0"/>
-    <default field="bus_bay" expression="" applyOnUpdate="0"/>
-    <default field="tracktype" expression="" applyOnUpdate="0"/>
-    <default field="service" expression="" applyOnUpdate="0"/>
-    <default field="description" expression="" applyOnUpdate="0"/>
-    <default field="access" expression="" applyOnUpdate="0"/>
-    <default field="motor_vehicle" expression="" applyOnUpdate="0"/>
-    <default field="mtb:scale" expression="" applyOnUpdate="0"/>
-    <default field="sac_scale" expression="" applyOnUpdate="0"/>
-    <default field="mtb" expression="" applyOnUpdate="0"/>
-    <default field="history" expression="" applyOnUpdate="0"/>
-    <default field="incline" expression="" applyOnUpdate="0"/>
-    <default field="mtb:scale:uphill" expression="" applyOnUpdate="0"/>
-    <default field="bus" expression="" applyOnUpdate="0"/>
-    <default field="psv" expression="" applyOnUpdate="0"/>
-    <default field="mtb:description" expression="" applyOnUpdate="0"/>
-    <default field="segregated" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:backward" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:forward" expression="" applyOnUpdate="0"/>
-    <default field="source:maxspeed:forward" expression="" applyOnUpdate="0"/>
-    <default field="source:maxspeed:backward" expression="" applyOnUpdate="0"/>
-    <default field="turn:lanes:backward" expression="" applyOnUpdate="0"/>
-    <default field="parking:lane:right" expression="" applyOnUpdate="0"/>
-    <default field="tourism" expression="" applyOnUpdate="0"/>
-    <default field="wikipedia" expression="" applyOnUpdate="0"/>
-    <default field="smoothness:date" expression="" applyOnUpdate="0"/>
-    <default field="hgv" expression="" applyOnUpdate="0"/>
-    <default field="motorcar" expression="" applyOnUpdate="0"/>
-    <default field="motorcycle" expression="" applyOnUpdate="0"/>
-    <default field="turn:lanes:forward" expression="" applyOnUpdate="0"/>
-    <default field="horse" expression="" applyOnUpdate="0"/>
-    <default field="note:railway" expression="" applyOnUpdate="0"/>
-    <default field="bus:forward" expression="" applyOnUpdate="0"/>
-    <default field="maxweight:forward" expression="" applyOnUpdate="0"/>
-    <default field="psv:forward" expression="" applyOnUpdate="0"/>
-    <default field="trail_visibility" expression="" applyOnUpdate="0"/>
-    <default field="trailblazed" expression="" applyOnUpdate="0"/>
-    <default field="parking:lane:both" expression="" applyOnUpdate="0"/>
-    <default field="paved" expression="" applyOnUpdate="0"/>
-    <default field="snowmobile" expression="" applyOnUpdate="0"/>
-    <default field="piste:difficulty" expression="" applyOnUpdate="0"/>
-    <default field="piste:type" expression="" applyOnUpdate="0"/>
-    <default field="maxheight:forward" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:forward:conditional" expression="" applyOnUpdate="0"/>
-    <default field="weight" expression="" applyOnUpdate="0"/>
-    <default field="oneway:bicycle" expression="" applyOnUpdate="0"/>
-    <default field="bridge:structure" expression="" applyOnUpdate="0"/>
-    <default field="excellent" expression="" applyOnUpdate="0"/>
-    <default field="living_street" expression="" applyOnUpdate="0"/>
-    <default field="busway:right" expression="" applyOnUpdate="0"/>
-    <default field="ford" expression="" applyOnUpdate="0"/>
-    <default field="access:conditional" expression="" applyOnUpdate="0"/>
-    <default field="marked_trail" expression="" applyOnUpdate="0"/>
-    <default field="survey_date" expression="" applyOnUpdate="0"/>
-    <default field="name:fr" expression="" applyOnUpdate="0"/>
-    <default field="route" expression="" applyOnUpdate="0"/>
-    <default field="type" expression="" applyOnUpdate="0"/>
-    <default field="waterway" expression="" applyOnUpdate="0"/>
-    <default field="network" expression="" applyOnUpdate="0"/>
-    <default field="motorway" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:backward:conditional" expression="" applyOnUpdate="0"/>
-    <default field="railway:end_date" expression="" applyOnUpdate="0"/>
-    <default field="railway:start_date" expression="" applyOnUpdate="0"/>
-    <default field="local_ref" expression="" applyOnUpdate="0"/>
-    <default field="public_transport" expression="" applyOnUpdate="0"/>
-    <default field="wheelchair" expression="" applyOnUpdate="0"/>
-    <default field="sac_scale_ref" expression="" applyOnUpdate="0"/>
-    <default field="parking:lane:left" expression="" applyOnUpdate="0"/>
-    <default field="name:etymology:wikidata" expression="" applyOnUpdate="0"/>
-    <default field="ref:sandre" expression="" applyOnUpdate="0"/>
-    <default field="local_name" expression="" applyOnUpdate="0"/>
-    <default field="crossing" expression="" applyOnUpdate="0"/>
-    <default field="footway" expression="" applyOnUpdate="0"/>
-    <default field="access:lanes" expression="" applyOnUpdate="0"/>
-    <default field="change:lanes" expression="" applyOnUpdate="0"/>
-    <default field="taxi" expression="" applyOnUpdate="0"/>
-    <default field="lanes:both_ways" expression="" applyOnUpdate="0"/>
-    <default field="lanes:hgv" expression="" applyOnUpdate="0"/>
-    <default field="cycleway:right:segregated" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:lanes" expression="" applyOnUpdate="0"/>
-    <default field="man_made" expression="" applyOnUpdate="0"/>
-    <default field="departures_board" expression="" applyOnUpdate="0"/>
-    <default field="name:ru" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:source" expression="" applyOnUpdate="0"/>
-    <default field="destination:ref:lanes" expression="" applyOnUpdate="0"/>
-    <default field="barrier" expression="" applyOnUpdate="0"/>
-    <default field="access:lanes:backward" expression="" applyOnUpdate="0"/>
-    <default field="psv:lanes:backward" expression="" applyOnUpdate="0"/>
-    <default field="maxwidth" expression="" applyOnUpdate="0"/>
-    <default field="informal" expression="" applyOnUpdate="0"/>
-    <default field="natural" expression="" applyOnUpdate="0"/>
-    <default field="maxspeed:hgv" expression="" applyOnUpdate="0"/>
+    <default applyOnUpdate="0" expression="" field="fid"/>
+    <default applyOnUpdate="0" expression="" field="osm_id"/>
+    <default applyOnUpdate="0" expression="" field="name"/>
+    <default applyOnUpdate="0" expression="" field="highway"/>
+    <default applyOnUpdate="0" expression="" field="waterway"/>
+    <default applyOnUpdate="0" expression="" field="aerialway"/>
+    <default applyOnUpdate="0" expression="" field="barrier"/>
+    <default applyOnUpdate="0" expression="" field="man_made"/>
+    <default applyOnUpdate="0" expression="" field="z_order"/>
+    <default applyOnUpdate="0" expression="" field="other_tags"/>
   </defaults>
   <constraints>
-    <constraint field="fid" notnull_strength="1" unique_strength="1" exp_strength="0" constraints="3"/>
-    <constraint field="full_id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="osm_type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="cycleway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="highway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="oneway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="ref" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="surface" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="junction" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:ref" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="lit" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="toll" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="cycleway:right" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="bicycle" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="foot" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="sidewalk" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="turn:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="bridge" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="layer" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="noname" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:colour" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="ref:FR:FANTOIR" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="int_ref" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="operator" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="source:maxspeed" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxheight" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="tunnel" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="lanes:backward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="lanes:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxweight" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="cycleway:both" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="source:name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="old_ref" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="old_name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="name:oc" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="source:name:oc" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="boundary" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="political_division" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:conditional" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="source:width" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="width" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="transit:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="bridge:name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:colour:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="placement" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:symbol:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="railway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="cutting" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:advisory" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="lane_markings" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:symbol" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="embankment" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="alt_name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:hazmat" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="tunnel:name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="wikidata" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="smoothness" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="name:wikidata" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxweight:signed" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="cycleway:left" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="traffic_calming" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="motorroad" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:backward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="cycleway:lane" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="level" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="bus_bay" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="tracktype" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="service" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="description" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="access" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="motor_vehicle" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="mtb:scale" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="sac_scale" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="mtb" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="history" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="incline" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="mtb:scale:uphill" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="bus" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="psv" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="mtb:description" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="segregated" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:backward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="source:maxspeed:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="source:maxspeed:backward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="turn:lanes:backward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="parking:lane:right" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="tourism" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="wikipedia" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="smoothness:date" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="hgv" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="motorcar" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="motorcycle" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="turn:lanes:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="horse" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="note:railway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="bus:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxweight:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="psv:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="trail_visibility" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="trailblazed" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="parking:lane:both" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="paved" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="snowmobile" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="piste:difficulty" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="piste:type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxheight:forward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:forward:conditional" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="weight" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="oneway:bicycle" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="bridge:structure" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="excellent" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="living_street" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="busway:right" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="ford" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="access:conditional" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="marked_trail" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="survey_date" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="name:fr" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="route" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="waterway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="network" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="motorway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:backward:conditional" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="railway:end_date" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="railway:start_date" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="local_ref" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="public_transport" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="wheelchair" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="sac_scale_ref" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="parking:lane:left" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="name:etymology:wikidata" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="ref:sandre" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="local_name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="crossing" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="footway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="access:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="change:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="taxi" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="lanes:both_ways" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="lanes:hgv" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="cycleway:right:segregated" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="man_made" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="departures_board" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="name:ru" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:source" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="destination:ref:lanes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="barrier" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="access:lanes:backward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="psv:lanes:backward" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxwidth" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="informal" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="natural" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
-    <constraint field="maxspeed:hgv" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint constraints="3" field="fid" notnull_strength="1" unique_strength="1" exp_strength="0"/>
+    <constraint constraints="0" field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="name" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="highway" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="waterway" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="aerialway" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="barrier" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="man_made" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="z_order" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="other_tags" notnull_strength="0" unique_strength="0" exp_strength="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint field="fid" desc="" exp=""/>
-    <constraint field="full_id" desc="" exp=""/>
-    <constraint field="osm_id" desc="" exp=""/>
-    <constraint field="osm_type" desc="" exp=""/>
-    <constraint field="cycleway" desc="" exp=""/>
-    <constraint field="highway" desc="" exp=""/>
-    <constraint field="lanes" desc="" exp=""/>
-    <constraint field="maxspeed" desc="" exp=""/>
-    <constraint field="name" desc="" exp=""/>
-    <constraint field="oneway" desc="" exp=""/>
-    <constraint field="ref" desc="" exp=""/>
-    <constraint field="surface" desc="" exp=""/>
-    <constraint field="junction" desc="" exp=""/>
-    <constraint field="destination" desc="" exp=""/>
-    <constraint field="destination:ref" desc="" exp=""/>
-    <constraint field="lit" desc="" exp=""/>
-    <constraint field="toll" desc="" exp=""/>
-    <constraint field="cycleway:right" desc="" exp=""/>
-    <constraint field="bicycle" desc="" exp=""/>
-    <constraint field="foot" desc="" exp=""/>
-    <constraint field="sidewalk" desc="" exp=""/>
-    <constraint field="turn:lanes" desc="" exp=""/>
-    <constraint field="bridge" desc="" exp=""/>
-    <constraint field="layer" desc="" exp=""/>
-    <constraint field="noname" desc="" exp=""/>
-    <constraint field="destination:colour" desc="" exp=""/>
-    <constraint field="ref:FR:FANTOIR" desc="" exp=""/>
-    <constraint field="int_ref" desc="" exp=""/>
-    <constraint field="operator" desc="" exp=""/>
-    <constraint field="source:maxspeed" desc="" exp=""/>
-    <constraint field="maxheight" desc="" exp=""/>
-    <constraint field="tunnel" desc="" exp=""/>
-    <constraint field="lanes:backward" desc="" exp=""/>
-    <constraint field="lanes:forward" desc="" exp=""/>
-    <constraint field="maxweight" desc="" exp=""/>
-    <constraint field="cycleway:both" desc="" exp=""/>
-    <constraint field="source:name" desc="" exp=""/>
-    <constraint field="old_ref" desc="" exp=""/>
-    <constraint field="old_name" desc="" exp=""/>
-    <constraint field="name:oc" desc="" exp=""/>
-    <constraint field="source:name:oc" desc="" exp=""/>
-    <constraint field="boundary" desc="" exp=""/>
-    <constraint field="political_division" desc="" exp=""/>
-    <constraint field="maxspeed:conditional" desc="" exp=""/>
-    <constraint field="distance" desc="" exp=""/>
-    <constraint field="maxspeed:type" desc="" exp=""/>
-    <constraint field="source:width" desc="" exp=""/>
-    <constraint field="width" desc="" exp=""/>
-    <constraint field="transit:lanes" desc="" exp=""/>
-    <constraint field="bridge:name" desc="" exp=""/>
-    <constraint field="destination:colour:lanes" desc="" exp=""/>
-    <constraint field="destination:lanes" desc="" exp=""/>
-    <constraint field="placement" desc="" exp=""/>
-    <constraint field="destination:symbol:lanes" desc="" exp=""/>
-    <constraint field="railway" desc="" exp=""/>
-    <constraint field="cutting" desc="" exp=""/>
-    <constraint field="maxspeed:advisory" desc="" exp=""/>
-    <constraint field="lane_markings" desc="" exp=""/>
-    <constraint field="destination:symbol" desc="" exp=""/>
-    <constraint field="embankment" desc="" exp=""/>
-    <constraint field="alt_name" desc="" exp=""/>
-    <constraint field="maxspeed:hazmat" desc="" exp=""/>
-    <constraint field="tunnel:name" desc="" exp=""/>
-    <constraint field="wikidata" desc="" exp=""/>
-    <constraint field="smoothness" desc="" exp=""/>
-    <constraint field="name:wikidata" desc="" exp=""/>
-    <constraint field="maxweight:signed" desc="" exp=""/>
-    <constraint field="cycleway:left" desc="" exp=""/>
-    <constraint field="traffic_calming" desc="" exp=""/>
-    <constraint field="motorroad" desc="" exp=""/>
-    <constraint field="destination:forward" desc="" exp=""/>
-    <constraint field="destination:backward" desc="" exp=""/>
-    <constraint field="cycleway:lane" desc="" exp=""/>
-    <constraint field="level" desc="" exp=""/>
-    <constraint field="bus_bay" desc="" exp=""/>
-    <constraint field="tracktype" desc="" exp=""/>
-    <constraint field="service" desc="" exp=""/>
-    <constraint field="description" desc="" exp=""/>
-    <constraint field="access" desc="" exp=""/>
-    <constraint field="motor_vehicle" desc="" exp=""/>
-    <constraint field="mtb:scale" desc="" exp=""/>
-    <constraint field="sac_scale" desc="" exp=""/>
-    <constraint field="mtb" desc="" exp=""/>
-    <constraint field="history" desc="" exp=""/>
-    <constraint field="incline" desc="" exp=""/>
-    <constraint field="mtb:scale:uphill" desc="" exp=""/>
-    <constraint field="bus" desc="" exp=""/>
-    <constraint field="psv" desc="" exp=""/>
-    <constraint field="mtb:description" desc="" exp=""/>
-    <constraint field="segregated" desc="" exp=""/>
-    <constraint field="maxspeed:backward" desc="" exp=""/>
-    <constraint field="maxspeed:forward" desc="" exp=""/>
-    <constraint field="source:maxspeed:forward" desc="" exp=""/>
-    <constraint field="source:maxspeed:backward" desc="" exp=""/>
-    <constraint field="turn:lanes:backward" desc="" exp=""/>
-    <constraint field="parking:lane:right" desc="" exp=""/>
-    <constraint field="tourism" desc="" exp=""/>
-    <constraint field="wikipedia" desc="" exp=""/>
-    <constraint field="smoothness:date" desc="" exp=""/>
-    <constraint field="hgv" desc="" exp=""/>
-    <constraint field="motorcar" desc="" exp=""/>
-    <constraint field="motorcycle" desc="" exp=""/>
-    <constraint field="turn:lanes:forward" desc="" exp=""/>
-    <constraint field="horse" desc="" exp=""/>
-    <constraint field="note:railway" desc="" exp=""/>
-    <constraint field="bus:forward" desc="" exp=""/>
-    <constraint field="maxweight:forward" desc="" exp=""/>
-    <constraint field="psv:forward" desc="" exp=""/>
-    <constraint field="trail_visibility" desc="" exp=""/>
-    <constraint field="trailblazed" desc="" exp=""/>
-    <constraint field="parking:lane:both" desc="" exp=""/>
-    <constraint field="paved" desc="" exp=""/>
-    <constraint field="snowmobile" desc="" exp=""/>
-    <constraint field="piste:difficulty" desc="" exp=""/>
-    <constraint field="piste:type" desc="" exp=""/>
-    <constraint field="maxheight:forward" desc="" exp=""/>
-    <constraint field="maxspeed:forward:conditional" desc="" exp=""/>
-    <constraint field="weight" desc="" exp=""/>
-    <constraint field="oneway:bicycle" desc="" exp=""/>
-    <constraint field="bridge:structure" desc="" exp=""/>
-    <constraint field="excellent" desc="" exp=""/>
-    <constraint field="living_street" desc="" exp=""/>
-    <constraint field="busway:right" desc="" exp=""/>
-    <constraint field="ford" desc="" exp=""/>
-    <constraint field="access:conditional" desc="" exp=""/>
-    <constraint field="marked_trail" desc="" exp=""/>
-    <constraint field="survey_date" desc="" exp=""/>
-    <constraint field="name:fr" desc="" exp=""/>
-    <constraint field="route" desc="" exp=""/>
-    <constraint field="type" desc="" exp=""/>
-    <constraint field="waterway" desc="" exp=""/>
-    <constraint field="network" desc="" exp=""/>
-    <constraint field="motorway" desc="" exp=""/>
-    <constraint field="maxspeed:backward:conditional" desc="" exp=""/>
-    <constraint field="railway:end_date" desc="" exp=""/>
-    <constraint field="railway:start_date" desc="" exp=""/>
-    <constraint field="local_ref" desc="" exp=""/>
-    <constraint field="public_transport" desc="" exp=""/>
-    <constraint field="wheelchair" desc="" exp=""/>
-    <constraint field="sac_scale_ref" desc="" exp=""/>
-    <constraint field="parking:lane:left" desc="" exp=""/>
-    <constraint field="name:etymology:wikidata" desc="" exp=""/>
-    <constraint field="ref:sandre" desc="" exp=""/>
-    <constraint field="local_name" desc="" exp=""/>
-    <constraint field="crossing" desc="" exp=""/>
-    <constraint field="footway" desc="" exp=""/>
-    <constraint field="access:lanes" desc="" exp=""/>
-    <constraint field="change:lanes" desc="" exp=""/>
-    <constraint field="taxi" desc="" exp=""/>
-    <constraint field="lanes:both_ways" desc="" exp=""/>
-    <constraint field="lanes:hgv" desc="" exp=""/>
-    <constraint field="cycleway:right:segregated" desc="" exp=""/>
-    <constraint field="maxspeed:lanes" desc="" exp=""/>
-    <constraint field="man_made" desc="" exp=""/>
-    <constraint field="departures_board" desc="" exp=""/>
-    <constraint field="name:ru" desc="" exp=""/>
-    <constraint field="maxspeed:source" desc="" exp=""/>
-    <constraint field="destination:ref:lanes" desc="" exp=""/>
-    <constraint field="barrier" desc="" exp=""/>
-    <constraint field="access:lanes:backward" desc="" exp=""/>
-    <constraint field="psv:lanes:backward" desc="" exp=""/>
-    <constraint field="maxwidth" desc="" exp=""/>
-    <constraint field="informal" desc="" exp=""/>
-    <constraint field="natural" desc="" exp=""/>
-    <constraint field="maxspeed:hgv" desc="" exp=""/>
+    <constraint exp="" desc="" field="fid"/>
+    <constraint exp="" desc="" field="osm_id"/>
+    <constraint exp="" desc="" field="name"/>
+    <constraint exp="" desc="" field="highway"/>
+    <constraint exp="" desc="" field="waterway"/>
+    <constraint exp="" desc="" field="aerialway"/>
+    <constraint exp="" desc="" field="barrier"/>
+    <constraint exp="" desc="" field="man_made"/>
+    <constraint exp="" desc="" field="z_order"/>
+    <constraint exp="" desc="" field="other_tags"/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting isEnabledOnlyWhenEditable="0" notificationMessage="" type="5" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" shortTitle="OpenStreetMap Browser" id="{fd7312d5-7340-4fc9-8774-5eaecbf06b33}" name="OpenStreetMap Browser" capture="0" icon="">
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+    <actionsetting shortTitle="OpenStreetMap Browser" icon="" name="OpenStreetMap Browser" type="5" capture="0" isEnabledOnlyWhenEditable="0" id="{3737a06d-2aa3-4a75-8502-a1b959556d60}" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" notificationMessage="">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" notificationMessage="" type="1" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" shortTitle="Mapillary" id="{3d0992ef-0289-4a99-804e-bba993b77da4}" name="Mapillary" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg">
+    <actionsetting shortTitle="Mapillary" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" name="Mapillary" type="1" capture="0" isEnabledOnlyWhenEditable="0" id="{c347938c-1453-4e62-8a04-152b13e68ad5}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" notificationMessage="">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" notificationMessage="" type="1" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" shortTitle="JOSM" id="{6ba48070-c422-4ff5-93ab-efe70785e269}" name="JOSM" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg">
+    <actionsetting shortTitle="JOSM" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" name="JOSM" type="1" capture="0" isEnabledOnlyWhenEditable="0" id="{a1826da3-52b4-41f7-ae02-a9ce12dd4d96}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" notificationMessage="">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" notificationMessage="" type="5" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" shortTitle="User default editor" id="{400d69ee-0a3b-48ea-b769-d1f8829d35d7}" name="User default editor" capture="0" icon="">
+    <actionsetting shortTitle="User default editor" icon="" name="User default editor" type="5" capture="0" isEnabledOnlyWhenEditable="0" id="{3e5bdef6-d402-4c27-8d6a-c3a4eae96806}" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" notificationMessage="">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
     <columns>
-      <column type="field" width="-1" name="full_id" hidden="0"/>
-      <column type="field" width="-1" name="osm_id" hidden="0"/>
-      <column type="field" width="-1" name="osm_type" hidden="0"/>
-      <column type="actions" width="-1" hidden="1"/>
-      <column type="field" width="-1" name="name" hidden="0"/>
-      <column type="field" width="-1" name="waterway" hidden="0"/>
-      <column type="field" width="-1" name="highway" hidden="0"/>
-      <column type="field" width="-1" name="oneway" hidden="0"/>
-      <column type="field" width="-1" name="lanes" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed" hidden="0"/>
-      <column type="field" width="-1" name="surface" hidden="0"/>
-      <column type="field" width="-1" name="cycleway" hidden="0"/>
-      <column type="field" width="-1" name="embankment" hidden="0"/>
-      <column type="field" width="-1" name="lit" hidden="0"/>
-      <column type="field" width="-1" name="sidewalk" hidden="0"/>
-      <column type="field" width="-1" name="cycleway:both" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:type" hidden="0"/>
-      <column type="field" width="-1" name="cycleway:left" hidden="0"/>
-      <column type="field" width="-1" name="cycleway:right" hidden="0"/>
-      <column type="field" width="-1" name="old_ref" hidden="0"/>
-      <column type="field" width="-1" name="service" hidden="0"/>
-      <column type="field" width="-1" name="barrier" hidden="0"/>
-      <column type="field" width="-1" name="source:maxspeed" hidden="0"/>
-      <column type="field" width="-1" name="man_made" hidden="0"/>
-      <column type="field" width="-1" name="access" hidden="0"/>
-      <column type="field" width="-1" name="incline" hidden="0"/>
-      <column type="field" width="-1" name="fid" hidden="0"/>
-      <column type="field" width="-1" name="ref" hidden="0"/>
-      <column type="field" width="-1" name="junction" hidden="0"/>
-      <column type="field" width="-1" name="destination" hidden="0"/>
-      <column type="field" width="-1" name="destination:ref" hidden="0"/>
-      <column type="field" width="-1" name="toll" hidden="0"/>
-      <column type="field" width="-1" name="bicycle" hidden="0"/>
-      <column type="field" width="-1" name="foot" hidden="0"/>
-      <column type="field" width="-1" name="turn:lanes" hidden="0"/>
-      <column type="field" width="-1" name="bridge" hidden="0"/>
-      <column type="field" width="-1" name="layer" hidden="0"/>
-      <column type="field" width="-1" name="noname" hidden="0"/>
-      <column type="field" width="-1" name="destination:colour" hidden="0"/>
-      <column type="field" width="-1" name="ref:FR:FANTOIR" hidden="0"/>
-      <column type="field" width="-1" name="int_ref" hidden="0"/>
-      <column type="field" width="-1" name="operator" hidden="0"/>
-      <column type="field" width="-1" name="maxheight" hidden="0"/>
-      <column type="field" width="-1" name="tunnel" hidden="0"/>
-      <column type="field" width="-1" name="lanes:backward" hidden="0"/>
-      <column type="field" width="-1" name="lanes:forward" hidden="0"/>
-      <column type="field" width="-1" name="maxweight" hidden="0"/>
-      <column type="field" width="-1" name="source:name" hidden="0"/>
-      <column type="field" width="-1" name="old_name" hidden="0"/>
-      <column type="field" width="-1" name="name:oc" hidden="0"/>
-      <column type="field" width="-1" name="source:name:oc" hidden="0"/>
-      <column type="field" width="-1" name="boundary" hidden="0"/>
-      <column type="field" width="-1" name="political_division" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:conditional" hidden="0"/>
-      <column type="field" width="-1" name="distance" hidden="0"/>
-      <column type="field" width="-1" name="source:width" hidden="0"/>
-      <column type="field" width="-1" name="width" hidden="0"/>
-      <column type="field" width="-1" name="transit:lanes" hidden="0"/>
-      <column type="field" width="-1" name="bridge:name" hidden="0"/>
-      <column type="field" width="-1" name="destination:colour:lanes" hidden="0"/>
-      <column type="field" width="-1" name="destination:lanes" hidden="0"/>
-      <column type="field" width="-1" name="placement" hidden="0"/>
-      <column type="field" width="-1" name="destination:symbol:lanes" hidden="0"/>
-      <column type="field" width="-1" name="railway" hidden="0"/>
-      <column type="field" width="-1" name="lane_markings" hidden="0"/>
-      <column type="field" width="-1" name="destination:symbol" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:hazmat" hidden="0"/>
-      <column type="field" width="-1" name="tunnel:name" hidden="0"/>
-      <column type="field" width="-1" name="wikidata" hidden="0"/>
-      <column type="field" width="-1" name="smoothness" hidden="0"/>
-      <column type="field" width="-1" name="name:wikidata" hidden="0"/>
-      <column type="field" width="-1" name="maxweight:signed" hidden="0"/>
-      <column type="field" width="-1" name="traffic_calming" hidden="0"/>
-      <column type="field" width="-1" name="motorroad" hidden="0"/>
-      <column type="field" width="-1" name="destination:forward" hidden="0"/>
-      <column type="field" width="-1" name="destination:backward" hidden="0"/>
-      <column type="field" width="-1" name="bus_bay" hidden="0"/>
-      <column type="field" width="-1" name="tracktype" hidden="0"/>
-      <column type="field" width="-1" name="description" hidden="0"/>
-      <column type="field" width="-1" name="motor_vehicle" hidden="0"/>
-      <column type="field" width="-1" name="mtb:scale" hidden="0"/>
-      <column type="field" width="-1" name="sac_scale" hidden="0"/>
-      <column type="field" width="-1" name="mtb" hidden="0"/>
-      <column type="field" width="-1" name="history" hidden="0"/>
-      <column type="field" width="-1" name="mtb:scale:uphill" hidden="0"/>
-      <column type="field" width="-1" name="bus" hidden="0"/>
-      <column type="field" width="-1" name="psv" hidden="0"/>
-      <column type="field" width="-1" name="mtb:description" hidden="0"/>
-      <column type="field" width="-1" name="segregated" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:backward" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:forward" hidden="0"/>
-      <column type="field" width="-1" name="source:maxspeed:forward" hidden="0"/>
-      <column type="field" width="-1" name="source:maxspeed:backward" hidden="0"/>
-      <column type="field" width="-1" name="cycleway:lane" hidden="0"/>
-      <column type="field" width="-1" name="turn:lanes:backward" hidden="0"/>
-      <column type="field" width="-1" name="parking:lane:right" hidden="0"/>
-      <column type="field" width="-1" name="tourism" hidden="0"/>
-      <column type="field" width="-1" name="wikipedia" hidden="0"/>
-      <column type="field" width="-1" name="smoothness:date" hidden="0"/>
-      <column type="field" width="-1" name="hgv" hidden="0"/>
-      <column type="field" width="-1" name="alt_name" hidden="0"/>
-      <column type="field" width="-1" name="motorcar" hidden="0"/>
-      <column type="field" width="-1" name="motorcycle" hidden="0"/>
-      <column type="field" width="-1" name="cutting" hidden="0"/>
-      <column type="field" width="-1" name="turn:lanes:forward" hidden="0"/>
-      <column type="field" width="-1" name="horse" hidden="0"/>
-      <column type="field" width="-1" name="note:railway" hidden="0"/>
-      <column type="field" width="-1" name="bus:forward" hidden="0"/>
-      <column type="field" width="-1" name="maxweight:forward" hidden="0"/>
-      <column type="field" width="-1" name="psv:forward" hidden="0"/>
-      <column type="field" width="-1" name="trail_visibility" hidden="0"/>
-      <column type="field" width="-1" name="trailblazed" hidden="0"/>
-      <column type="field" width="-1" name="parking:lane:both" hidden="0"/>
-      <column type="field" width="-1" name="paved" hidden="0"/>
-      <column type="field" width="-1" name="snowmobile" hidden="0"/>
-      <column type="field" width="-1" name="piste:difficulty" hidden="0"/>
-      <column type="field" width="-1" name="piste:type" hidden="0"/>
-      <column type="field" width="-1" name="maxheight:forward" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:forward:conditional" hidden="0"/>
-      <column type="field" width="-1" name="weight" hidden="0"/>
-      <column type="field" width="-1" name="oneway:bicycle" hidden="0"/>
-      <column type="field" width="-1" name="bridge:structure" hidden="0"/>
-      <column type="field" width="-1" name="excellent" hidden="0"/>
-      <column type="field" width="-1" name="living_street" hidden="0"/>
-      <column type="field" width="-1" name="ford" hidden="0"/>
-      <column type="field" width="-1" name="access:conditional" hidden="0"/>
-      <column type="field" width="-1" name="marked_trail" hidden="0"/>
-      <column type="field" width="-1" name="survey_date" hidden="0"/>
-      <column type="field" width="-1" name="name:fr" hidden="0"/>
-      <column type="field" width="-1" name="route" hidden="0"/>
-      <column type="field" width="-1" name="type" hidden="0"/>
-      <column type="field" width="-1" name="network" hidden="0"/>
-      <column type="field" width="-1" name="motorway" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:backward:conditional" hidden="0"/>
-      <column type="field" width="-1" name="railway:end_date" hidden="0"/>
-      <column type="field" width="-1" name="railway:start_date" hidden="0"/>
-      <column type="field" width="-1" name="local_ref" hidden="0"/>
-      <column type="field" width="-1" name="public_transport" hidden="0"/>
-      <column type="field" width="-1" name="wheelchair" hidden="0"/>
-      <column type="field" width="-1" name="sac_scale_ref" hidden="0"/>
-      <column type="field" width="-1" name="parking:lane:left" hidden="0"/>
-      <column type="field" width="-1" name="name:etymology:wikidata" hidden="0"/>
-      <column type="field" width="-1" name="ref:sandre" hidden="0"/>
-      <column type="field" width="-1" name="local_name" hidden="0"/>
-      <column type="field" width="-1" name="crossing" hidden="0"/>
-      <column type="field" width="-1" name="footway" hidden="0"/>
-      <column type="field" width="-1" name="access:lanes" hidden="0"/>
-      <column type="field" width="-1" name="change:lanes" hidden="0"/>
-      <column type="field" width="-1" name="taxi" hidden="0"/>
-      <column type="field" width="-1" name="lanes:both_ways" hidden="0"/>
-      <column type="field" width="-1" name="cycleway:right:segregated" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:lanes" hidden="0"/>
-      <column type="field" width="-1" name="departures_board" hidden="0"/>
-      <column type="field" width="-1" name="name:ru" hidden="0"/>
-      <column type="field" width="-1" name="destination:ref:lanes" hidden="0"/>
-      <column type="field" width="-1" name="access:lanes:backward" hidden="0"/>
-      <column type="field" width="-1" name="psv:lanes:backward" hidden="0"/>
-      <column type="field" width="-1" name="maxwidth" hidden="0"/>
-      <column type="field" width="-1" name="informal" hidden="0"/>
-      <column type="field" width="-1" name="natural" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:hgv" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:advisory" hidden="0"/>
-      <column type="field" width="-1" name="level" hidden="0"/>
-      <column type="field" width="-1" name="busway:right" hidden="0"/>
-      <column type="field" width="-1" name="lanes:hgv" hidden="0"/>
-      <column type="field" width="-1" name="maxspeed:source" hidden="0"/>
+      <column hidden="0" name="osm_id" type="field" width="-1"/>
+      <column hidden="1" type="actions" width="-1"/>
+      <column hidden="0" name="name" type="field" width="-1"/>
+      <column hidden="0" name="waterway" type="field" width="-1"/>
+      <column hidden="0" name="highway" type="field" width="-1"/>
+      <column hidden="0" name="barrier" type="field" width="-1"/>
+      <column hidden="0" name="man_made" type="field" width="-1"/>
+      <column hidden="0" name="fid" type="field" width="-1"/>
+      <column hidden="0" name="aerialway" type="field" width="-1"/>
+      <column hidden="0" name="z_order" type="field" width="-1"/>
+      <column hidden="0" name="other_tags" type="field" width="406"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -2910,6 +1158,7 @@ def my_form_open(dialog, layer, feature):
     <field name="access:conditional" editable="1"/>
     <field name="access:lanes" editable="1"/>
     <field name="access:lanes:backward" editable="1"/>
+    <field name="aerialway" editable="1"/>
     <field name="alt_name" editable="1"/>
     <field name="barrier" editable="1"/>
     <field name="bicycle" editable="1"/>
@@ -3017,6 +1266,7 @@ def my_form_open(dialog, layer, feature):
     <field name="operator" editable="1"/>
     <field name="osm_id" editable="1"/>
     <field name="osm_type" editable="1"/>
+    <field name="other_tags" editable="1"/>
     <field name="parking:lane:both" editable="1"/>
     <field name="parking:lane:left" editable="1"/>
     <field name="parking:lane:right" editable="1"/>
@@ -3072,175 +1322,180 @@ def my_form_open(dialog, layer, feature):
     <field name="width" editable="1"/>
     <field name="wikidata" editable="1"/>
     <field name="wikipedia" editable="1"/>
+    <field name="z_order" editable="1"/>
   </editable>
   <labelOnTop>
-    <field labelOnTop="0" name="access"/>
-    <field labelOnTop="0" name="access:conditional"/>
-    <field labelOnTop="0" name="access:lanes"/>
-    <field labelOnTop="0" name="access:lanes:backward"/>
-    <field labelOnTop="0" name="alt_name"/>
-    <field labelOnTop="0" name="barrier"/>
-    <field labelOnTop="0" name="bicycle"/>
-    <field labelOnTop="0" name="boundary"/>
-    <field labelOnTop="0" name="bridge"/>
-    <field labelOnTop="0" name="bridge:name"/>
-    <field labelOnTop="0" name="bridge:structure"/>
-    <field labelOnTop="0" name="bus"/>
-    <field labelOnTop="0" name="bus:forward"/>
-    <field labelOnTop="0" name="bus_bay"/>
-    <field labelOnTop="0" name="busway:right"/>
-    <field labelOnTop="0" name="change:lanes"/>
-    <field labelOnTop="0" name="crossing"/>
-    <field labelOnTop="0" name="cutting"/>
-    <field labelOnTop="0" name="cycleway"/>
-    <field labelOnTop="0" name="cycleway:both"/>
-    <field labelOnTop="0" name="cycleway:lane"/>
-    <field labelOnTop="0" name="cycleway:left"/>
-    <field labelOnTop="0" name="cycleway:right"/>
-    <field labelOnTop="0" name="cycleway:right:segregated"/>
-    <field labelOnTop="0" name="departures_board"/>
-    <field labelOnTop="0" name="description"/>
-    <field labelOnTop="0" name="destination"/>
-    <field labelOnTop="0" name="destination:backward"/>
-    <field labelOnTop="0" name="destination:colour"/>
-    <field labelOnTop="0" name="destination:colour:lanes"/>
-    <field labelOnTop="0" name="destination:forward"/>
-    <field labelOnTop="0" name="destination:lanes"/>
-    <field labelOnTop="0" name="destination:ref"/>
-    <field labelOnTop="0" name="destination:ref:lanes"/>
-    <field labelOnTop="0" name="destination:symbol"/>
-    <field labelOnTop="0" name="destination:symbol:lanes"/>
-    <field labelOnTop="0" name="distance"/>
-    <field labelOnTop="0" name="embankment"/>
-    <field labelOnTop="0" name="excellent"/>
-    <field labelOnTop="0" name="fid"/>
-    <field labelOnTop="0" name="foot"/>
-    <field labelOnTop="0" name="footway"/>
-    <field labelOnTop="0" name="ford"/>
-    <field labelOnTop="0" name="full_id"/>
-    <field labelOnTop="0" name="hgv"/>
-    <field labelOnTop="0" name="highway"/>
-    <field labelOnTop="0" name="history"/>
-    <field labelOnTop="0" name="horse"/>
-    <field labelOnTop="0" name="incline"/>
-    <field labelOnTop="0" name="informal"/>
-    <field labelOnTop="0" name="int_ref"/>
-    <field labelOnTop="0" name="intermittent"/>
-    <field labelOnTop="0" name="junction"/>
-    <field labelOnTop="0" name="lane_markings"/>
-    <field labelOnTop="0" name="lanes"/>
-    <field labelOnTop="0" name="lanes:backward"/>
-    <field labelOnTop="0" name="lanes:both_ways"/>
-    <field labelOnTop="0" name="lanes:forward"/>
-    <field labelOnTop="0" name="lanes:hgv"/>
-    <field labelOnTop="0" name="layer"/>
-    <field labelOnTop="0" name="level"/>
-    <field labelOnTop="0" name="lit"/>
-    <field labelOnTop="0" name="living_street"/>
-    <field labelOnTop="0" name="local_name"/>
-    <field labelOnTop="0" name="local_ref"/>
-    <field labelOnTop="0" name="man_made"/>
-    <field labelOnTop="0" name="marked_trail"/>
-    <field labelOnTop="0" name="maxheight"/>
-    <field labelOnTop="0" name="maxheight:forward"/>
-    <field labelOnTop="0" name="maxspeed"/>
-    <field labelOnTop="0" name="maxspeed:advisory"/>
-    <field labelOnTop="0" name="maxspeed:backward"/>
-    <field labelOnTop="0" name="maxspeed:backward:conditional"/>
-    <field labelOnTop="0" name="maxspeed:conditional"/>
-    <field labelOnTop="0" name="maxspeed:forward"/>
-    <field labelOnTop="0" name="maxspeed:forward:conditional"/>
-    <field labelOnTop="0" name="maxspeed:hazmat"/>
-    <field labelOnTop="0" name="maxspeed:hgv"/>
-    <field labelOnTop="0" name="maxspeed:lanes"/>
-    <field labelOnTop="0" name="maxspeed:source"/>
-    <field labelOnTop="0" name="maxspeed:type"/>
-    <field labelOnTop="0" name="maxweight"/>
-    <field labelOnTop="0" name="maxweight:forward"/>
-    <field labelOnTop="0" name="maxweight:signed"/>
-    <field labelOnTop="0" name="maxwidth"/>
-    <field labelOnTop="0" name="motor_vehicle"/>
-    <field labelOnTop="0" name="motorcar"/>
-    <field labelOnTop="0" name="motorcycle"/>
-    <field labelOnTop="0" name="motorroad"/>
-    <field labelOnTop="0" name="motorway"/>
-    <field labelOnTop="0" name="mtb"/>
-    <field labelOnTop="0" name="mtb:description"/>
-    <field labelOnTop="0" name="mtb:scale"/>
-    <field labelOnTop="0" name="mtb:scale:uphill"/>
-    <field labelOnTop="0" name="name"/>
-    <field labelOnTop="0" name="name:etymology:wikidata"/>
-    <field labelOnTop="0" name="name:fr"/>
-    <field labelOnTop="0" name="name:oc"/>
-    <field labelOnTop="0" name="name:ru"/>
-    <field labelOnTop="0" name="name:wikidata"/>
-    <field labelOnTop="0" name="natural"/>
-    <field labelOnTop="0" name="network"/>
-    <field labelOnTop="0" name="noname"/>
-    <field labelOnTop="0" name="note:railway"/>
-    <field labelOnTop="0" name="old_name"/>
-    <field labelOnTop="0" name="old_ref"/>
-    <field labelOnTop="0" name="oneway"/>
-    <field labelOnTop="0" name="oneway:bicycle"/>
-    <field labelOnTop="0" name="operator"/>
-    <field labelOnTop="0" name="osm_id"/>
-    <field labelOnTop="0" name="osm_type"/>
-    <field labelOnTop="0" name="parking:lane:both"/>
-    <field labelOnTop="0" name="parking:lane:left"/>
-    <field labelOnTop="0" name="parking:lane:right"/>
-    <field labelOnTop="0" name="paved"/>
-    <field labelOnTop="0" name="piste:difficulty"/>
-    <field labelOnTop="0" name="piste:type"/>
-    <field labelOnTop="0" name="placement"/>
-    <field labelOnTop="0" name="political_division"/>
-    <field labelOnTop="0" name="psv"/>
-    <field labelOnTop="0" name="psv:forward"/>
-    <field labelOnTop="0" name="psv:lanes:backward"/>
-    <field labelOnTop="0" name="public_transport"/>
-    <field labelOnTop="0" name="railway"/>
-    <field labelOnTop="0" name="railway:end_date"/>
-    <field labelOnTop="0" name="railway:start_date"/>
-    <field labelOnTop="0" name="ref"/>
-    <field labelOnTop="0" name="ref:FR:FANTOIR"/>
-    <field labelOnTop="0" name="ref:sandre"/>
-    <field labelOnTop="0" name="route"/>
-    <field labelOnTop="0" name="sac_scale"/>
-    <field labelOnTop="0" name="sac_scale_ref"/>
-    <field labelOnTop="0" name="segregated"/>
-    <field labelOnTop="0" name="service"/>
-    <field labelOnTop="0" name="sidewalk"/>
-    <field labelOnTop="0" name="smoothness"/>
-    <field labelOnTop="0" name="smoothness:date"/>
-    <field labelOnTop="0" name="snowmobile"/>
-    <field labelOnTop="0" name="source:maxspeed"/>
-    <field labelOnTop="0" name="source:maxspeed:backward"/>
-    <field labelOnTop="0" name="source:maxspeed:forward"/>
-    <field labelOnTop="0" name="source:name"/>
-    <field labelOnTop="0" name="source:name:oc"/>
-    <field labelOnTop="0" name="source:width"/>
-    <field labelOnTop="0" name="surface"/>
-    <field labelOnTop="0" name="survey_date"/>
-    <field labelOnTop="0" name="taxi"/>
-    <field labelOnTop="0" name="toll"/>
-    <field labelOnTop="0" name="tourism"/>
-    <field labelOnTop="0" name="tracktype"/>
-    <field labelOnTop="0" name="traffic_calming"/>
-    <field labelOnTop="0" name="trail_visibility"/>
-    <field labelOnTop="0" name="trailblazed"/>
-    <field labelOnTop="0" name="transit:lanes"/>
-    <field labelOnTop="0" name="tunnel"/>
-    <field labelOnTop="0" name="tunnel:name"/>
-    <field labelOnTop="0" name="turn:lanes"/>
-    <field labelOnTop="0" name="turn:lanes:backward"/>
-    <field labelOnTop="0" name="turn:lanes:forward"/>
-    <field labelOnTop="0" name="type"/>
-    <field labelOnTop="0" name="waterway"/>
-    <field labelOnTop="0" name="weight"/>
-    <field labelOnTop="0" name="wheelchair"/>
-    <field labelOnTop="0" name="width"/>
-    <field labelOnTop="0" name="wikidata"/>
-    <field labelOnTop="0" name="wikipedia"/>
+    <field name="access" labelOnTop="0"/>
+    <field name="access:conditional" labelOnTop="0"/>
+    <field name="access:lanes" labelOnTop="0"/>
+    <field name="access:lanes:backward" labelOnTop="0"/>
+    <field name="aerialway" labelOnTop="0"/>
+    <field name="alt_name" labelOnTop="0"/>
+    <field name="barrier" labelOnTop="0"/>
+    <field name="bicycle" labelOnTop="0"/>
+    <field name="boundary" labelOnTop="0"/>
+    <field name="bridge" labelOnTop="0"/>
+    <field name="bridge:name" labelOnTop="0"/>
+    <field name="bridge:structure" labelOnTop="0"/>
+    <field name="bus" labelOnTop="0"/>
+    <field name="bus:forward" labelOnTop="0"/>
+    <field name="bus_bay" labelOnTop="0"/>
+    <field name="busway:right" labelOnTop="0"/>
+    <field name="change:lanes" labelOnTop="0"/>
+    <field name="crossing" labelOnTop="0"/>
+    <field name="cutting" labelOnTop="0"/>
+    <field name="cycleway" labelOnTop="0"/>
+    <field name="cycleway:both" labelOnTop="0"/>
+    <field name="cycleway:lane" labelOnTop="0"/>
+    <field name="cycleway:left" labelOnTop="0"/>
+    <field name="cycleway:right" labelOnTop="0"/>
+    <field name="cycleway:right:segregated" labelOnTop="0"/>
+    <field name="departures_board" labelOnTop="0"/>
+    <field name="description" labelOnTop="0"/>
+    <field name="destination" labelOnTop="0"/>
+    <field name="destination:backward" labelOnTop="0"/>
+    <field name="destination:colour" labelOnTop="0"/>
+    <field name="destination:colour:lanes" labelOnTop="0"/>
+    <field name="destination:forward" labelOnTop="0"/>
+    <field name="destination:lanes" labelOnTop="0"/>
+    <field name="destination:ref" labelOnTop="0"/>
+    <field name="destination:ref:lanes" labelOnTop="0"/>
+    <field name="destination:symbol" labelOnTop="0"/>
+    <field name="destination:symbol:lanes" labelOnTop="0"/>
+    <field name="distance" labelOnTop="0"/>
+    <field name="embankment" labelOnTop="0"/>
+    <field name="excellent" labelOnTop="0"/>
+    <field name="fid" labelOnTop="0"/>
+    <field name="foot" labelOnTop="0"/>
+    <field name="footway" labelOnTop="0"/>
+    <field name="ford" labelOnTop="0"/>
+    <field name="full_id" labelOnTop="0"/>
+    <field name="hgv" labelOnTop="0"/>
+    <field name="highway" labelOnTop="0"/>
+    <field name="history" labelOnTop="0"/>
+    <field name="horse" labelOnTop="0"/>
+    <field name="incline" labelOnTop="0"/>
+    <field name="informal" labelOnTop="0"/>
+    <field name="int_ref" labelOnTop="0"/>
+    <field name="intermittent" labelOnTop="0"/>
+    <field name="junction" labelOnTop="0"/>
+    <field name="lane_markings" labelOnTop="0"/>
+    <field name="lanes" labelOnTop="0"/>
+    <field name="lanes:backward" labelOnTop="0"/>
+    <field name="lanes:both_ways" labelOnTop="0"/>
+    <field name="lanes:forward" labelOnTop="0"/>
+    <field name="lanes:hgv" labelOnTop="0"/>
+    <field name="layer" labelOnTop="0"/>
+    <field name="level" labelOnTop="0"/>
+    <field name="lit" labelOnTop="0"/>
+    <field name="living_street" labelOnTop="0"/>
+    <field name="local_name" labelOnTop="0"/>
+    <field name="local_ref" labelOnTop="0"/>
+    <field name="man_made" labelOnTop="0"/>
+    <field name="marked_trail" labelOnTop="0"/>
+    <field name="maxheight" labelOnTop="0"/>
+    <field name="maxheight:forward" labelOnTop="0"/>
+    <field name="maxspeed" labelOnTop="0"/>
+    <field name="maxspeed:advisory" labelOnTop="0"/>
+    <field name="maxspeed:backward" labelOnTop="0"/>
+    <field name="maxspeed:backward:conditional" labelOnTop="0"/>
+    <field name="maxspeed:conditional" labelOnTop="0"/>
+    <field name="maxspeed:forward" labelOnTop="0"/>
+    <field name="maxspeed:forward:conditional" labelOnTop="0"/>
+    <field name="maxspeed:hazmat" labelOnTop="0"/>
+    <field name="maxspeed:hgv" labelOnTop="0"/>
+    <field name="maxspeed:lanes" labelOnTop="0"/>
+    <field name="maxspeed:source" labelOnTop="0"/>
+    <field name="maxspeed:type" labelOnTop="0"/>
+    <field name="maxweight" labelOnTop="0"/>
+    <field name="maxweight:forward" labelOnTop="0"/>
+    <field name="maxweight:signed" labelOnTop="0"/>
+    <field name="maxwidth" labelOnTop="0"/>
+    <field name="motor_vehicle" labelOnTop="0"/>
+    <field name="motorcar" labelOnTop="0"/>
+    <field name="motorcycle" labelOnTop="0"/>
+    <field name="motorroad" labelOnTop="0"/>
+    <field name="motorway" labelOnTop="0"/>
+    <field name="mtb" labelOnTop="0"/>
+    <field name="mtb:description" labelOnTop="0"/>
+    <field name="mtb:scale" labelOnTop="0"/>
+    <field name="mtb:scale:uphill" labelOnTop="0"/>
+    <field name="name" labelOnTop="0"/>
+    <field name="name:etymology:wikidata" labelOnTop="0"/>
+    <field name="name:fr" labelOnTop="0"/>
+    <field name="name:oc" labelOnTop="0"/>
+    <field name="name:ru" labelOnTop="0"/>
+    <field name="name:wikidata" labelOnTop="0"/>
+    <field name="natural" labelOnTop="0"/>
+    <field name="network" labelOnTop="0"/>
+    <field name="noname" labelOnTop="0"/>
+    <field name="note:railway" labelOnTop="0"/>
+    <field name="old_name" labelOnTop="0"/>
+    <field name="old_ref" labelOnTop="0"/>
+    <field name="oneway" labelOnTop="0"/>
+    <field name="oneway:bicycle" labelOnTop="0"/>
+    <field name="operator" labelOnTop="0"/>
+    <field name="osm_id" labelOnTop="0"/>
+    <field name="osm_type" labelOnTop="0"/>
+    <field name="other_tags" labelOnTop="0"/>
+    <field name="parking:lane:both" labelOnTop="0"/>
+    <field name="parking:lane:left" labelOnTop="0"/>
+    <field name="parking:lane:right" labelOnTop="0"/>
+    <field name="paved" labelOnTop="0"/>
+    <field name="piste:difficulty" labelOnTop="0"/>
+    <field name="piste:type" labelOnTop="0"/>
+    <field name="placement" labelOnTop="0"/>
+    <field name="political_division" labelOnTop="0"/>
+    <field name="psv" labelOnTop="0"/>
+    <field name="psv:forward" labelOnTop="0"/>
+    <field name="psv:lanes:backward" labelOnTop="0"/>
+    <field name="public_transport" labelOnTop="0"/>
+    <field name="railway" labelOnTop="0"/>
+    <field name="railway:end_date" labelOnTop="0"/>
+    <field name="railway:start_date" labelOnTop="0"/>
+    <field name="ref" labelOnTop="0"/>
+    <field name="ref:FR:FANTOIR" labelOnTop="0"/>
+    <field name="ref:sandre" labelOnTop="0"/>
+    <field name="route" labelOnTop="0"/>
+    <field name="sac_scale" labelOnTop="0"/>
+    <field name="sac_scale_ref" labelOnTop="0"/>
+    <field name="segregated" labelOnTop="0"/>
+    <field name="service" labelOnTop="0"/>
+    <field name="sidewalk" labelOnTop="0"/>
+    <field name="smoothness" labelOnTop="0"/>
+    <field name="smoothness:date" labelOnTop="0"/>
+    <field name="snowmobile" labelOnTop="0"/>
+    <field name="source:maxspeed" labelOnTop="0"/>
+    <field name="source:maxspeed:backward" labelOnTop="0"/>
+    <field name="source:maxspeed:forward" labelOnTop="0"/>
+    <field name="source:name" labelOnTop="0"/>
+    <field name="source:name:oc" labelOnTop="0"/>
+    <field name="source:width" labelOnTop="0"/>
+    <field name="surface" labelOnTop="0"/>
+    <field name="survey_date" labelOnTop="0"/>
+    <field name="taxi" labelOnTop="0"/>
+    <field name="toll" labelOnTop="0"/>
+    <field name="tourism" labelOnTop="0"/>
+    <field name="tracktype" labelOnTop="0"/>
+    <field name="traffic_calming" labelOnTop="0"/>
+    <field name="trail_visibility" labelOnTop="0"/>
+    <field name="trailblazed" labelOnTop="0"/>
+    <field name="transit:lanes" labelOnTop="0"/>
+    <field name="tunnel" labelOnTop="0"/>
+    <field name="tunnel:name" labelOnTop="0"/>
+    <field name="turn:lanes" labelOnTop="0"/>
+    <field name="turn:lanes:backward" labelOnTop="0"/>
+    <field name="turn:lanes:forward" labelOnTop="0"/>
+    <field name="type" labelOnTop="0"/>
+    <field name="waterway" labelOnTop="0"/>
+    <field name="weight" labelOnTop="0"/>
+    <field name="wheelchair" labelOnTop="0"/>
+    <field name="width" labelOnTop="0"/>
+    <field name="wikidata" labelOnTop="0"/>
+    <field name="wikipedia" labelOnTop="0"/>
+    <field name="z_order" labelOnTop="0"/>
   </labelOnTop>
+  <dataDefinedFieldProperties/>
   <widgets/>
   <previewExpression>full_id</previewExpression>
   <mapTip></mapTip>
diff --git a/styles/multipolygon.qml b/styles/multipolygon.qml
index a060e1e..99a8b6c 100644
--- a/styles/multipolygon.qml
+++ b/styles/multipolygon.qml
@@ -1,29 +1,35 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="AllStyleCategories" simplifyDrawingTol="1" maxScale="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" readOnly="0" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyLocal="1" simplifyMaxScale="1" labelsEnabled="0" version="3.10.4-A Coruña">
+<qgis version="3.16.3-Hannover" labelsEnabled="0" readOnly="0" simplifyDrawingHints="1" simplifyDrawingTol="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="100000000" simplifyAlgorithm="0" simplifyLocal="1" simplifyMaxScale="1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="1">
+  <temporal durationUnit="min" startExpression="" accumulate="0" fixedDuration="0" mode="0" endField="" enabled="0" durationField="" startField="" endExpression="">
+    <fixedRange>
+      <start></start>
+      <end></end>
+    </fixedRange>
+  </temporal>
+  <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" 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'" 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}"/>
-      <rule filter="&quot;building&quot;='school' and &quot;wall&quot;&lt;>'no'" symbol="2" label="bâtiment scolaire" key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}"/>
-      <rule filter="&quot;building&quot;='shed'" symbol="3" label="cabanon" key="{bc2342be-b587-40e8-8c25-1043595b314d}"/>
-      <rule filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or &quot;surface&quot;='grass'" symbol="4" label="herbe" key="{af8ca696-fc2e-4142-945a-24b6a15acc48}"/>
-      <rule filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" symbol="5" label="eau" key="{933821c2-969e-44c3-ac11-8153737ba71a}"/>
-      <rule filter="&quot;natural&quot;='shingle'" symbol="6" label="lit de rivière" key="{e91700e9-45b0-4885-8be1-33970cf2f64c}"/>
-      <rule filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" symbol="7" label="zone boisée" key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}"/>
-      <rule filter="&quot;leisure&quot;='playground'" symbol="8" label="jeux" key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}"/>
-      <rule filter="&quot;amenity&quot;='parking'" symbol="9" label="parking" key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}"/>
-      <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 key="{f69f1a82-2331-4139-9487-e27714a58a63}" label="bâtiment" symbol="0" filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (not regexp_match(&quot;other_tags&quot;, '&quot;wall&quot;=>&quot;no&quot;') or &quot;other_tags&quot; is null)"/>
+      <rule key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}" label="toit,auvent,préau" symbol="1" filter="&quot;building&quot;='roof' or regexp_match(&quot;other_tags&quot;, '&quot;wall&quot;=>&quot;no&quot;')"/>
+      <rule key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}" label="bâtiment scolaire" symbol="2" filter="&quot;building&quot;='school' and (not regexp_match(&quot;other_tags&quot;, '&quot;wall&quot;=>&quot;no&quot;') or &quot;other_tags&quot; is null)"/>
+      <rule key="{bc2342be-b587-40e8-8c25-1043595b314d}" label="cabanon" symbol="3" filter="&quot;building&quot;='shed'"/>
+      <rule key="{af8ca696-fc2e-4142-945a-24b6a15acc48}" label="herbe" symbol="4" filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or regexp_match(&quot;other_tags&quot;, '&quot;surface&quot;=>&quot;grass&quot;')"/>
+      <rule key="{933821c2-969e-44c3-ac11-8153737ba71a}" label="eau" symbol="5" filter="&quot;natural&quot;='water' or regexp_match(&quot;other_tags&quot;, '&quot;waterway&quot;=>&quot;riverbank&quot;')"/>
+      <rule key="{e91700e9-45b0-4885-8be1-33970cf2f64c}" label="lit de rivière" symbol="6" filter="&quot;natural&quot;='shingle'"/>
+      <rule key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}" label="zone boisée" symbol="7" filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'"/>
+      <rule key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}" label="jeux" symbol="8" filter="&quot;leisure&quot;='playground'"/>
+      <rule key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}" label="parking" symbol="9" filter="&quot;amenity&quot;='parking'"/>
+      <rule key="{b908d622-4193-4ced-8781-7bb5b8930e60}" label="champ" symbol="10" filter="&quot;landuse&quot;='farmland'"/>
+      <rule key="{074e0ef0-f2ea-480e-88de-08dda8d27bf6}" label="terrain" symbol="11" filter="&quot;leisure&quot;='pitch'"/>
+      <rule key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}" label="sable compact" symbol="12" filter="regexp_match(&quot;other_tags&quot;, '&quot;surface&quot;=>&quot;compacted&quot;')"/>
     </rules>
     <symbols>
-      <symbol clip_to_extent="1" name="0" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="0" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="209,209,209,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -37,13 +43,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="LinePatternFill" locked="0">
+        <layer class="LinePatternFill" pass="0" locked="0" enabled="1">
           <prop k="angle" v="45"/>
           <prop k="color" v="0,0,255,255"/>
           <prop k="distance" v="1"/>
@@ -59,17 +65,21 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@0@1" force_rhr="0" type="line" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="@0@1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+              <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
               <prop k="draw_inside_polygon" v="0"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="line_color" v="0,0,0,255"/>
@@ -80,21 +90,22 @@
               <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="offset_unit" v="MM"/>
               <prop k="ring_filter" v="0"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
               <prop k="use_custom_dash" v="0"/>
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="1" force_rhr="0" type="fill" alpha="0.5">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="1" type="fill" clip_to_extent="1" force_rhr="0" alpha="0.5">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="229,229,229,128"/>
           <prop k="joinstyle" v="bevel"/>
@@ -108,13 +119,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="LinePatternFill" locked="0">
+        <layer class="LinePatternFill" pass="0" locked="0" enabled="1">
           <prop k="angle" v="45"/>
           <prop k="color" v="0,0,0,255"/>
           <prop k="distance" v="3"/>
@@ -130,17 +141,21 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@1@1" force_rhr="0" type="line" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="@1@1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+              <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
               <prop k="draw_inside_polygon" v="0"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="line_color" v="0,0,0,255"/>
@@ -151,21 +166,22 @@
               <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="offset_unit" v="MM"/>
               <prop k="ring_filter" v="0"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
               <prop k="use_custom_dash" v="0"/>
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="10" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="10" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="187,233,166,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -179,13 +195,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="SVGFill" locked="0">
+        <layer class="SVGFill" pass="0" locked="0" enabled="1">
           <prop k="angle" v="0"/>
           <prop k="color" v="0,0,255,255"/>
           <prop k="outline_color" v="35,35,35,255"/>
@@ -200,17 +216,21 @@
           <prop k="width" v="6"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@10@1" force_rhr="0" type="line" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="@10@1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+              <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
               <prop k="draw_inside_polygon" v="0"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="line_color" v="35,35,35,255"/>
@@ -221,21 +241,22 @@
               <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="offset_unit" v="MM"/>
               <prop k="ring_filter" v="0"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
               <prop k="use_custom_dash" v="0"/>
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="11" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="10" class="SimpleFill" locked="0">
+      <symbol name="11" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="10" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="0,0,255,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -249,15 +270,15 @@
           <prop k="style" v="no"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="12" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SVGFill" locked="0">
+      <symbol name="12" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SVGFill" pass="0" locked="0" enabled="1">
           <prop k="angle" v="0"/>
           <prop k="color" v="183,72,75,255"/>
           <prop k="outline_color" v="35,35,35,255"/>
@@ -272,17 +293,21 @@
           <prop k="width" v="20"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@12@0" force_rhr="0" type="line" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="@12@0" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+              <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
               <prop k="draw_inside_polygon" v="0"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="line_color" v="35,35,35,255"/>
@@ -293,21 +318,22 @@
               <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="offset_unit" v="MM"/>
               <prop k="ring_filter" v="0"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
               <prop k="use_custom_dash" v="0"/>
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="2" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="2" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="231,229,183,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -321,13 +347,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="LinePatternFill" locked="0">
+        <layer class="LinePatternFill" pass="0" locked="0" enabled="1">
           <prop k="angle" v="45"/>
           <prop k="color" v="0,0,255,255"/>
           <prop k="distance" v="1"/>
@@ -343,17 +369,21 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@2@1" force_rhr="0" type="line" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="@2@1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+              <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
               <prop k="draw_inside_polygon" v="0"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="line_color" v="0,0,0,255"/>
@@ -364,21 +394,22 @@
               <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="offset_unit" v="MM"/>
               <prop k="ring_filter" v="0"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
               <prop k="use_custom_dash" v="0"/>
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="3" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="3" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="187,169,2,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -392,13 +423,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="LinePatternFill" locked="0">
+        <layer class="LinePatternFill" pass="0" locked="0" enabled="1">
           <prop k="angle" v="45"/>
           <prop k="color" v="55,126,184,255"/>
           <prop k="distance" v="2"/>
@@ -414,17 +445,21 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@3@1" force_rhr="0" type="line" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="@3@1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+              <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
               <prop k="draw_inside_polygon" v="0"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="line_color" v="0,0,0,255"/>
@@ -435,19 +470,20 @@
               <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="offset_unit" v="MM"/>
               <prop k="ring_filter" v="0"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
               <prop k="use_custom_dash" v="0"/>
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" pass="0" class="LinePatternFill" locked="0">
+        <layer class="LinePatternFill" pass="0" locked="0" enabled="1">
           <prop k="angle" v="0"/>
           <prop k="color" v="55,126,184,255"/>
           <prop k="distance" v="2"/>
@@ -463,17 +499,21 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@3@2" force_rhr="0" type="line" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+          <symbol name="@3@2" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+              <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
               <prop k="customdash" v="5;2"/>
               <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
               <prop k="draw_inside_polygon" v="0"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="line_color" v="0,0,0,255"/>
@@ -484,23 +524,28 @@
               <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="offset_unit" v="MM"/>
               <prop k="ring_filter" v="0"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
               <prop k="use_custom_dash" v="0"/>
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
           <prop k="capstyle" v="square"/>
           <prop k="customdash" v="5;2"/>
           <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
           <prop k="draw_inside_polygon" v="0"/>
           <prop k="joinstyle" v="bevel"/>
           <prop k="line_color" v="0,0,0,255"/>
@@ -511,19 +556,20 @@
           <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="offset_unit" v="MM"/>
           <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
           <prop k="use_custom_dash" v="0"/>
           <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="4" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="4" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="95,255,95,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -537,13 +583,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="PointPatternFill" locked="0">
+        <layer class="PointPatternFill" pass="0" locked="0" enabled="1">
           <prop k="displacement_x" v="1.2"/>
           <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="displacement_x_unit" v="MM"/>
@@ -566,13 +612,13 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@4@1" force_rhr="0" type="marker" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="@4@1" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -593,17 +639,17 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="5" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="5" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="25,140,255,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -617,15 +663,15 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="6" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="6" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="255,246,205,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -639,13 +685,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="PointPatternFill" locked="0">
+        <layer class="PointPatternFill" pass="0" locked="0" enabled="1">
           <prop k="displacement_x" v="1.2"/>
           <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="displacement_x_unit" v="MM"/>
@@ -668,13 +714,13 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@6@1" force_rhr="0" type="marker" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="@6@1" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -695,19 +741,23 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
           <prop k="capstyle" v="square"/>
           <prop k="customdash" v="5;2"/>
           <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
           <prop k="draw_inside_polygon" v="0"/>
           <prop k="joinstyle" v="bevel"/>
           <prop k="line_color" v="0,0,0,255"/>
@@ -718,19 +768,20 @@
           <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="offset_unit" v="MM"/>
           <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
           <prop k="use_custom_dash" v="0"/>
           <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="7" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="7" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="0,142,54,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -744,13 +795,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="PointPatternFill" locked="0">
+        <layer class="PointPatternFill" pass="0" locked="0" enabled="1">
           <prop k="displacement_x" v="1.2"/>
           <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="displacement_x_unit" v="MM"/>
@@ -773,13 +824,13 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@7@1" force_rhr="0" type="marker" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="@7@1" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
               <prop k="angle" v="0"/>
               <prop k="color" v="77,175,74,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -800,17 +851,17 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="8" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="10" class="SimpleFill" locked="0">
+      <symbol name="8" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="10" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="127,255,211,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -824,13 +875,13 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="10" class="PointPatternFill" locked="0">
+        <layer class="PointPatternFill" pass="10" locked="0" enabled="1">
           <prop k="displacement_x" v="1.2"/>
           <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="displacement_x_unit" v="MM"/>
@@ -853,13 +904,13 @@
           <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@8@1" force_rhr="0" type="marker" alpha="1">
-            <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+          <symbol name="@8@1" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
               <prop k="angle" v="0"/>
               <prop k="color" v="77,175,74,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -880,19 +931,23 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" pass="10" class="SimpleLine" locked="0">
+        <layer class="SimpleLine" pass="10" locked="0" enabled="1">
+          <prop k="align_dash_pattern" v="0"/>
           <prop k="capstyle" v="square"/>
           <prop k="customdash" v="5;2"/>
           <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="customdash_unit" v="MM"/>
+          <prop k="dash_pattern_offset" v="0"/>
+          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="dash_pattern_offset_unit" v="MM"/>
           <prop k="draw_inside_polygon" v="0"/>
           <prop k="joinstyle" v="bevel"/>
           <prop k="line_color" v="77,175,74,255"/>
@@ -903,28 +958,31 @@
           <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="offset_unit" v="MM"/>
           <prop k="ring_filter" v="0"/>
+          <prop k="tweak_dash_pattern_on_corners" v="0"/>
           <prop k="use_custom_dash" v="0"/>
           <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="10" class="CentroidFill" locked="0">
+        <layer class="CentroidFill" pass="10" locked="0" enabled="1">
+          <prop k="clip_on_current_part_only" v="0"/>
+          <prop k="clip_points" v="0"/>
           <prop k="point_on_all_parts" v="1"/>
           <prop k="point_on_surface" v="0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@8@3" force_rhr="0" type="marker" alpha="1">
-            <layer enabled="1" pass="0" class="SvgMarker" locked="0">
+          <symbol name="@8@3" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="SvgMarker" pass="0" locked="0" enabled="1">
               <prop k="angle" v="0"/>
               <prop k="color" v="255,0,0,255"/>
               <prop k="fixedAspectRatio" v="0"/>
@@ -944,17 +1002,17 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" name="9" force_rhr="0" type="fill" alpha="1">
-        <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+      <symbol name="9" type="fill" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SimpleFill" pass="0" locked="0" enabled="1">
           <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <prop k="color" v="232,234,234,255"/>
           <prop k="joinstyle" v="bevel"/>
@@ -968,28 +1026,31 @@
           <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" pass="0" class="CentroidFill" locked="0">
+        <layer class="CentroidFill" pass="0" locked="0" enabled="1">
+          <prop k="clip_on_current_part_only" v="0"/>
+          <prop k="clip_points" v="0"/>
           <prop k="point_on_all_parts" v="1"/>
           <prop k="point_on_surface" v="0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol clip_to_extent="1" name="@9@1" force_rhr="0" type="marker" alpha="1">
-            <layer enabled="1" pass="0" class="FontMarker" locked="0">
+          <symbol name="@9@1" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+            <layer class="FontMarker" pass="0" locked="0" enabled="1">
               <prop k="angle" v="0"/>
               <prop k="chr" v="P"/>
               <prop k="color" v="7,60,255,255"/>
               <prop k="font" v="Liberation Sans"/>
+              <prop k="font_style" v=""/>
               <prop k="horizontal_anchor_point" v="1"/>
               <prop k="joinstyle" v="bevel"/>
               <prop k="offset" v="0,0"/>
@@ -1005,9 +1066,9 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1017,8 +1078,8 @@
     </symbols>
   </renderer-v2>
   <customproperties>
-    <property value="description" key="dualview/previewExpressions"/>
-    <property value="0" key="embeddedWidgets/count"/>
+    <property key="dualview/previewExpressions" value="description"/>
+    <property key="embeddedWidgets/count" value="0"/>
     <property key="variableNames">
       <value>qgis_25d_angle</value>
       <value>qgis_25d_height</value>
@@ -1076,17 +1137,51 @@
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
   <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory sizeType="MM" rotationOffset="270" scaleDependency="Area" minScaleDenominator="0" width="15" backgroundColor="#ffffff" maxScaleDenominator="1e+08" diagramOrientation="Up" lineSizeType="MM" penColor="#000000" lineSizeScale="3x:0,0,0,0,0,0" penWidth="0" barWidth="5" enabled="0" sizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" labelPlacementMethod="XHeight" penAlpha="255" opacity="1" backgroundAlpha="255" height="15" minimumSize="0">
-      <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-      <attribute color="#000000" label="" field=""/>
+    <DiagramCategory backgroundColor="#ffffff" showAxis="0" minimumSize="0" direction="1" minScaleDenominator="0" width="15" barWidth="5" spacingUnit="MM" labelPlacementMethod="XHeight" spacing="0" maxScaleDenominator="1e+8" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" sizeType="MM" scaleBasedVisibility="0" rotationOffset="270" scaleDependency="Area" lineSizeType="MM" backgroundAlpha="255" penAlpha="255" penWidth="0" height="15" opacity="1" diagramOrientation="Up" sizeScale="3x:0,0,0,0,0,0">
+      <fontProperties style="" description="Liberation Sans,10,-1,5,50,0,0,0,0,0"/>
+      <attribute label="" field="" color="#000000"/>
+      <axisSymbol>
+        <symbol name="" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+          <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+            <prop k="align_dash_pattern" v="0"/>
+            <prop k="capstyle" v="square"/>
+            <prop k="customdash" v="5;2"/>
+            <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="customdash_unit" v="MM"/>
+            <prop k="dash_pattern_offset" v="0"/>
+            <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="dash_pattern_offset_unit" v="MM"/>
+            <prop k="draw_inside_polygon" v="0"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="line_color" v="35,35,35,255"/>
+            <prop k="line_style" v="solid"/>
+            <prop k="line_width" v="0.26"/>
+            <prop k="line_width_unit" v="MM"/>
+            <prop k="offset" v="0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="ring_filter" v="0"/>
+            <prop k="tweak_dash_pattern_on_corners" v="0"/>
+            <prop k="use_custom_dash" v="0"/>
+            <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+          </layer>
+        </symbol>
+      </axisSymbol>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings priority="0" linePlacementFlags="18" dist="0" zIndex="0" showAll="1" placement="1" obstacle="0">
+  <DiagramLayerSettings obstacle="0" linePlacementFlags="18" priority="0" showAll="1" dist="0" placement="1" zIndex="0">
     <properties>
       <Option type="Map">
-        <Option name="name" value="" type="QString"/>
+        <Option name="name" type="QString" value=""/>
         <Option name="properties"/>
-        <Option name="type" value="collection" type="QString"/>
+        <Option name="type" type="QString" value="collection"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
@@ -1094,231 +1189,191 @@
     <activeChecks/>
     <checkConfiguration type="Map">
       <Option name="QgsGeometryGapCheck" type="Map">
-        <Option name="allowedGapsBuffer" value="0" type="double"/>
-        <Option name="allowedGapsEnabled" value="false" type="bool"/>
-        <Option name="allowedGapsLayer" value="" type="QString"/>
+        <Option name="allowedGapsBuffer" type="double" value="0"/>
+        <Option name="allowedGapsEnabled" type="bool" value="false"/>
+        <Option name="allowedGapsLayer" type="QString" value=""/>
       </Option>
     </checkConfiguration>
   </geometryOptions>
+  <legend type="default-vector"/>
+  <referencedLayers/>
   <fieldConfiguration>
-    <field name="fid">
+    <field name="fid" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="full_id">
+    <field name="osm_id" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_id">
+    <field name="osm_way_id" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_type">
+    <field name="name" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="boundary">
+    <field name="type" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="name">
+    <field name="aeroway" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="political_division">
+    <field name="amenity" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref:INSEE">
+    <field name="admin_level" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="source:url">
+    <field name="barrier" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="start_date">
+    <field name="boundary" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="type">
+    <field name="building" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wikidata">
+    <field name="craft" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wikipedia">
+    <field name="geological" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="natural">
+    <field name="historic" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="water">
+    <field name="land_area" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="landuse">
+    <field name="landuse" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="CLC:code">
+    <field name="leisure" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="CLC:id">
+    <field name="man_made" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="CLC:year">
+    <field name="military" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="building">
+    <field name="natural" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wall">
+    <field name="office" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="access">
+    <field name="place" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="leisure">
+    <field name="shop" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="addr:city">
+    <field name="sport" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="addr:street">
+    <field name="tourism" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="highway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="min_age">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="description">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="surface">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="disused:amenity">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="female">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="male">
+    <field name="other_tags" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1327,202 +1382,170 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias index="0" name="" field="fid"/>
-    <alias index="1" name="" field="full_id"/>
-    <alias index="2" name="" field="osm_id"/>
-    <alias index="3" name="" field="osm_type"/>
-    <alias index="4" name="" field="boundary"/>
-    <alias index="5" name="" field="name"/>
-    <alias index="6" name="" field="political_division"/>
-    <alias index="7" name="" field="ref:INSEE"/>
-    <alias index="8" name="" field="source:url"/>
-    <alias index="9" name="" field="start_date"/>
-    <alias index="10" name="" field="type"/>
-    <alias index="11" name="" field="wikidata"/>
-    <alias index="12" name="" field="wikipedia"/>
-    <alias index="13" name="" field="natural"/>
-    <alias index="14" name="" field="water"/>
-    <alias index="15" name="" field="landuse"/>
-    <alias index="16" name="" field="CLC:code"/>
-    <alias index="17" name="" field="CLC:id"/>
-    <alias index="18" name="" field="CLC:year"/>
-    <alias index="19" name="" field="building"/>
-    <alias index="20" name="" field="wall"/>
-    <alias index="21" name="" field="access"/>
-    <alias index="22" name="" field="leisure"/>
-    <alias index="23" name="" field="addr:city"/>
-    <alias index="24" name="" field="addr:street"/>
-    <alias index="25" name="" field="highway"/>
-    <alias index="26" name="" field="min_age"/>
-    <alias index="27" name="" field="description"/>
-    <alias index="28" name="" field="surface"/>
-    <alias index="29" name="" field="disused:amenity"/>
-    <alias index="30" name="" field="female"/>
-    <alias index="31" name="" field="male"/>
+    <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"/>
   </aliases>
-  <excludeAttributesWMS/>
-  <excludeAttributesWFS/>
   <defaults>
-    <default expression="" applyOnUpdate="0" field="fid"/>
-    <default expression="" applyOnUpdate="0" field="full_id"/>
-    <default expression="" applyOnUpdate="0" field="osm_id"/>
-    <default expression="" applyOnUpdate="0" field="osm_type"/>
-    <default expression="" applyOnUpdate="0" field="boundary"/>
-    <default expression="" applyOnUpdate="0" field="name"/>
-    <default expression="" applyOnUpdate="0" field="political_division"/>
-    <default expression="" applyOnUpdate="0" field="ref:INSEE"/>
-    <default expression="" applyOnUpdate="0" field="source:url"/>
-    <default expression="" applyOnUpdate="0" field="start_date"/>
-    <default expression="" applyOnUpdate="0" field="type"/>
-    <default expression="" applyOnUpdate="0" field="wikidata"/>
-    <default expression="" applyOnUpdate="0" field="wikipedia"/>
-    <default expression="" applyOnUpdate="0" field="natural"/>
-    <default expression="" applyOnUpdate="0" field="water"/>
-    <default expression="" applyOnUpdate="0" field="landuse"/>
-    <default expression="" applyOnUpdate="0" field="CLC:code"/>
-    <default expression="" applyOnUpdate="0" field="CLC:id"/>
-    <default expression="" applyOnUpdate="0" field="CLC:year"/>
-    <default expression="" applyOnUpdate="0" field="building"/>
-    <default expression="" applyOnUpdate="0" field="wall"/>
-    <default expression="" applyOnUpdate="0" field="access"/>
-    <default expression="" applyOnUpdate="0" field="leisure"/>
-    <default expression="" applyOnUpdate="0" field="addr:city"/>
-    <default expression="" applyOnUpdate="0" field="addr:street"/>
-    <default expression="" applyOnUpdate="0" field="highway"/>
-    <default expression="" applyOnUpdate="0" field="min_age"/>
-    <default expression="" applyOnUpdate="0" field="description"/>
-    <default expression="" applyOnUpdate="0" field="surface"/>
-    <default expression="" applyOnUpdate="0" field="disused:amenity"/>
-    <default expression="" applyOnUpdate="0" field="female"/>
-    <default expression="" applyOnUpdate="0" field="male"/>
+    <default applyOnUpdate="0" expression="" field="fid"/>
+    <default applyOnUpdate="0" expression="" field="osm_id"/>
+    <default applyOnUpdate="0" expression="" field="osm_way_id"/>
+    <default applyOnUpdate="0" expression="" field="name"/>
+    <default applyOnUpdate="0" expression="" field="type"/>
+    <default applyOnUpdate="0" expression="" field="aeroway"/>
+    <default applyOnUpdate="0" expression="" field="amenity"/>
+    <default applyOnUpdate="0" expression="" field="admin_level"/>
+    <default applyOnUpdate="0" expression="" field="barrier"/>
+    <default applyOnUpdate="0" expression="" field="boundary"/>
+    <default applyOnUpdate="0" expression="" field="building"/>
+    <default applyOnUpdate="0" expression="" field="craft"/>
+    <default applyOnUpdate="0" expression="" field="geological"/>
+    <default applyOnUpdate="0" expression="" field="historic"/>
+    <default applyOnUpdate="0" expression="" field="land_area"/>
+    <default applyOnUpdate="0" expression="" field="landuse"/>
+    <default applyOnUpdate="0" expression="" field="leisure"/>
+    <default applyOnUpdate="0" expression="" field="man_made"/>
+    <default applyOnUpdate="0" expression="" field="military"/>
+    <default applyOnUpdate="0" expression="" field="natural"/>
+    <default applyOnUpdate="0" expression="" field="office"/>
+    <default applyOnUpdate="0" expression="" field="place"/>
+    <default applyOnUpdate="0" expression="" field="shop"/>
+    <default applyOnUpdate="0" expression="" field="sport"/>
+    <default applyOnUpdate="0" expression="" field="tourism"/>
+    <default applyOnUpdate="0" expression="" field="other_tags"/>
   </defaults>
   <constraints>
-    <constraint constraints="3" notnull_strength="1" exp_strength="0" unique_strength="1" field="fid"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="full_id"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_id"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_type"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="boundary"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="political_division"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="ref:INSEE"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="source:url"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="start_date"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="type"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="wikidata"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="wikipedia"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="natural"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="water"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="landuse"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="CLC:code"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="CLC:id"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="CLC:year"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="building"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="wall"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="access"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="leisure"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="addr:city"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="addr:street"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="highway"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="min_age"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="description"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="surface"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="disused:amenity"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="female"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="male"/>
+    <constraint constraints="3" field="fid" notnull_strength="1" unique_strength="1" exp_strength="0"/>
+    <constraint constraints="0" field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="osm_way_id" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="name" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="type" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="aeroway" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="amenity" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="admin_level" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="barrier" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="boundary" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="building" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="craft" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="geological" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="historic" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="land_area" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="landuse" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="leisure" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="man_made" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="military" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="natural" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="office" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="place" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="shop" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="sport" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="tourism" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="other_tags" notnull_strength="0" unique_strength="0" exp_strength="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint desc="" exp="" field="fid"/>
-    <constraint desc="" exp="" field="full_id"/>
-    <constraint desc="" exp="" field="osm_id"/>
-    <constraint desc="" exp="" field="osm_type"/>
-    <constraint desc="" exp="" field="boundary"/>
-    <constraint desc="" exp="" field="name"/>
-    <constraint desc="" exp="" field="political_division"/>
-    <constraint desc="" exp="" field="ref:INSEE"/>
-    <constraint desc="" exp="" field="source:url"/>
-    <constraint desc="" exp="" field="start_date"/>
-    <constraint desc="" exp="" field="type"/>
-    <constraint desc="" exp="" field="wikidata"/>
-    <constraint desc="" exp="" field="wikipedia"/>
-    <constraint desc="" exp="" field="natural"/>
-    <constraint desc="" exp="" field="water"/>
-    <constraint desc="" exp="" field="landuse"/>
-    <constraint desc="" exp="" field="CLC:code"/>
-    <constraint desc="" exp="" field="CLC:id"/>
-    <constraint desc="" exp="" field="CLC:year"/>
-    <constraint desc="" exp="" field="building"/>
-    <constraint desc="" exp="" field="wall"/>
-    <constraint desc="" exp="" field="access"/>
-    <constraint desc="" exp="" field="leisure"/>
-    <constraint desc="" exp="" field="addr:city"/>
-    <constraint desc="" exp="" field="addr:street"/>
-    <constraint desc="" exp="" field="highway"/>
-    <constraint desc="" exp="" field="min_age"/>
-    <constraint desc="" exp="" field="description"/>
-    <constraint desc="" exp="" field="surface"/>
-    <constraint desc="" exp="" field="disused:amenity"/>
-    <constraint desc="" exp="" field="female"/>
-    <constraint desc="" exp="" field="male"/>
+    <constraint exp="" desc="" field="fid"/>
+    <constraint exp="" desc="" field="osm_id"/>
+    <constraint exp="" desc="" field="osm_way_id"/>
+    <constraint exp="" desc="" field="name"/>
+    <constraint exp="" desc="" field="type"/>
+    <constraint exp="" desc="" field="aeroway"/>
+    <constraint exp="" desc="" field="amenity"/>
+    <constraint exp="" desc="" field="admin_level"/>
+    <constraint exp="" desc="" field="barrier"/>
+    <constraint exp="" desc="" field="boundary"/>
+    <constraint exp="" desc="" field="building"/>
+    <constraint exp="" desc="" field="craft"/>
+    <constraint exp="" desc="" field="geological"/>
+    <constraint exp="" desc="" field="historic"/>
+    <constraint exp="" desc="" field="land_area"/>
+    <constraint exp="" desc="" field="landuse"/>
+    <constraint exp="" desc="" field="leisure"/>
+    <constraint exp="" desc="" field="man_made"/>
+    <constraint exp="" desc="" field="military"/>
+    <constraint exp="" desc="" field="natural"/>
+    <constraint exp="" desc="" field="office"/>
+    <constraint exp="" desc="" field="place"/>
+    <constraint exp="" desc="" field="shop"/>
+    <constraint exp="" desc="" field="sport"/>
+    <constraint exp="" desc="" field="tourism"/>
+    <constraint exp="" desc="" field="other_tags"/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting shortTitle="OpenStreetMap Browser" capture="0" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" notificationMessage="" id="{e84be314-9dd2-4ce5-96d5-66b2f4e80b50}" isEnabledOnlyWhenEditable="0" icon="" type="5">
-      <actionScope id="Feature"/>
-      <actionScope id="Field"/>
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+    <actionsetting shortTitle="OpenStreetMap Browser" icon="" name="OpenStreetMap Browser" type="5" capture="0" isEnabledOnlyWhenEditable="0" id="{cff6a4e7-8378-4fa6-9492-dfc48a238ed6}" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" notificationMessage="">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="Mapillary" capture="0" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" notificationMessage="" id="{957bccd7-722a-4dae-8101-2114d7a6d404}" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" type="1">
-      <actionScope id="Feature"/>
-      <actionScope id="Field"/>
+    <actionsetting shortTitle="Mapillary" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" name="Mapillary" type="1" capture="0" isEnabledOnlyWhenEditable="0" id="{df7a7a4d-d65b-406f-81e3-0a6a81a9f438}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" notificationMessage="">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="JOSM" capture="0" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" notificationMessage="" id="{3c5cdb4c-f035-48eb-a347-1a224030c902}" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" type="1">
-      <actionScope id="Feature"/>
-      <actionScope id="Field"/>
+    <actionsetting shortTitle="JOSM" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" name="JOSM" type="1" capture="0" isEnabledOnlyWhenEditable="0" id="{89b1d5c4-108a-4a72-8170-60ba0d752256}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" notificationMessage="">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="User default editor" capture="0" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" notificationMessage="" id="{06ce2392-9d1d-4c66-867d-759626986c40}" isEnabledOnlyWhenEditable="0" icon="" type="5">
-      <actionScope id="Feature"/>
-      <actionScope id="Field"/>
+    <actionsetting shortTitle="User default editor" icon="" name="User default editor" type="5" capture="0" isEnabledOnlyWhenEditable="0" id="{9ff5de6e-e57e-4ad1-ac65-2531eacbd03b}" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" notificationMessage="">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
+      <actionScope id="Feature"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
     <columns>
-      <column hidden="0" name="full_id" width="-1" type="field"/>
-      <column hidden="0" name="osm_id" width="-1" type="field"/>
-      <column hidden="0" name="osm_type" width="-1" type="field"/>
-      <column hidden="0" name="building" width="-1" type="field"/>
-      <column hidden="1" width="-1" type="actions"/>
-      <column hidden="0" name="name" width="-1" type="field"/>
-      <column hidden="0" name="leisure" width="-1" type="field"/>
-      <column hidden="0" name="wall" width="-1" type="field"/>
-      <column hidden="0" name="fid" width="-1" type="field"/>
-      <column hidden="0" name="landuse" width="-1" type="field"/>
-      <column hidden="0" name="surface" width="-1" type="field"/>
-      <column hidden="0" name="description" width="-1" type="field"/>
-      <column hidden="0" name="access" width="-1" type="field"/>
-      <column hidden="0" name="natural" width="-1" type="field"/>
-      <column hidden="0" name="boundary" width="-1" type="field"/>
-      <column hidden="0" name="political_division" width="-1" type="field"/>
-      <column hidden="0" name="ref:INSEE" width="-1" type="field"/>
-      <column hidden="0" name="source:url" width="-1" type="field"/>
-      <column hidden="0" name="start_date" width="-1" type="field"/>
-      <column hidden="0" name="type" width="-1" type="field"/>
-      <column hidden="0" name="wikidata" width="-1" type="field"/>
-      <column hidden="0" name="wikipedia" width="-1" type="field"/>
-      <column hidden="0" name="water" width="-1" type="field"/>
-      <column hidden="0" name="CLC:code" width="-1" type="field"/>
-      <column hidden="0" name="CLC:id" width="-1" type="field"/>
-      <column hidden="0" name="CLC:year" width="-1" type="field"/>
-      <column hidden="0" name="addr:city" width="-1" type="field"/>
-      <column hidden="0" name="addr:street" width="-1" type="field"/>
-      <column hidden="0" name="highway" width="-1" type="field"/>
-      <column hidden="0" name="min_age" width="-1" type="field"/>
-      <column hidden="0" name="disused:amenity" width="-1" type="field"/>
-      <column hidden="0" name="female" width="-1" type="field"/>
-      <column hidden="0" name="male" width="-1" type="field"/>
+      <column hidden="0" name="osm_id" type="field" width="-1"/>
+      <column hidden="0" name="building" type="field" width="-1"/>
+      <column hidden="1" type="actions" width="-1"/>
+      <column hidden="0" name="name" type="field" width="-1"/>
+      <column hidden="0" name="leisure" type="field" width="-1"/>
+      <column hidden="0" name="fid" type="field" width="-1"/>
+      <column hidden="0" name="landuse" type="field" width="-1"/>
+      <column hidden="0" name="natural" type="field" width="-1"/>
+      <column hidden="0" name="boundary" type="field" width="-1"/>
+      <column hidden="0" name="type" type="field" width="-1"/>
+      <column hidden="0" name="osm_way_id" type="field" width="-1"/>
+      <column hidden="0" name="aeroway" type="field" width="-1"/>
+      <column hidden="0" name="amenity" type="field" width="-1"/>
+      <column hidden="0" name="admin_level" type="field" width="-1"/>
+      <column hidden="0" name="barrier" type="field" width="-1"/>
+      <column hidden="0" name="craft" type="field" width="-1"/>
+      <column hidden="0" name="geological" type="field" width="-1"/>
+      <column hidden="0" name="historic" type="field" width="-1"/>
+      <column hidden="0" name="land_area" type="field" width="-1"/>
+      <column hidden="0" name="man_made" type="field" width="-1"/>
+      <column hidden="0" name="military" type="field" width="-1"/>
+      <column hidden="0" name="office" type="field" width="-1"/>
+      <column hidden="0" name="place" type="field" width="-1"/>
+      <column hidden="0" name="shop" type="field" width="-1"/>
+      <column hidden="0" name="sport" type="field" width="-1"/>
+      <column hidden="0" name="tourism" type="field" width="-1"/>
+      <column hidden="0" name="other_tags" type="field" width="-1"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1561,6 +1584,8 @@ def my_form_open(dialog, layer, feature):
     <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="amenity" editable="1"/>
     <field name="barrier" editable="1"/>
     <field name="blind" editable="1"/>
@@ -1568,6 +1593,7 @@ def my_form_open(dialog, layer, feature):
     <field name="building" editable="1"/>
     <field name="building:levels" editable="1"/>
     <field name="contact:phone" editable="1"/>
+    <field name="craft" editable="1"/>
     <field name="description" editable="1"/>
     <field name="disused:amenity" editable="1"/>
     <field name="emergency" editable="1"/>
@@ -1576,26 +1602,36 @@ def my_form_open(dialog, layer, feature):
     <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="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="ref:FR:FINESS" editable="1"/>
     <field name="ref:INSEE" editable="1"/>
     <field name="roof:levels" editable="1"/>
+    <field name="shop" editable="1"/>
     <field name="social_facility" editable="1"/>
     <field name="social_facility:for" editable="1"/>
     <field name="source:url" editable="1"/>
@@ -1604,6 +1640,7 @@ def my_form_open(dialog, layer, feature):
     <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"/>
@@ -1613,65 +1650,80 @@ def my_form_open(dialog, layer, feature):
     <field name="wikipedia" editable="1"/>
   </editable>
   <labelOnTop>
-    <field labelOnTop="0" name="CLC:code"/>
-    <field labelOnTop="0" name="CLC:id"/>
-    <field labelOnTop="0" name="CLC:year"/>
-    <field labelOnTop="0" name="access"/>
-    <field labelOnTop="0" name="addr:city"/>
-    <field labelOnTop="0" name="addr:housenumber"/>
-    <field labelOnTop="0" name="addr:postcode"/>
-    <field labelOnTop="0" name="addr:street"/>
-    <field labelOnTop="0" name="amenity"/>
-    <field labelOnTop="0" name="barrier"/>
-    <field labelOnTop="0" name="blind"/>
-    <field labelOnTop="0" name="boundary"/>
-    <field labelOnTop="0" name="building"/>
-    <field labelOnTop="0" name="building:levels"/>
-    <field labelOnTop="0" name="contact:phone"/>
-    <field labelOnTop="0" name="description"/>
-    <field labelOnTop="0" name="disused:amenity"/>
-    <field labelOnTop="0" name="emergency"/>
-    <field labelOnTop="0" name="fee"/>
-    <field labelOnTop="0" name="female"/>
-    <field labelOnTop="0" name="fence_type"/>
-    <field labelOnTop="0" name="fid"/>
-    <field labelOnTop="0" name="full_id"/>
-    <field labelOnTop="0" name="highway"/>
-    <field labelOnTop="0" name="landuse"/>
-    <field labelOnTop="0" name="leaf_type"/>
-    <field labelOnTop="0" name="leisure"/>
-    <field labelOnTop="0" name="male"/>
-    <field labelOnTop="0" name="max_age"/>
-    <field labelOnTop="0" name="min_age"/>
-    <field labelOnTop="0" name="name"/>
-    <field labelOnTop="0" name="natural"/>
-    <field labelOnTop="0" name="operator"/>
-    <field labelOnTop="0" name="operator:type"/>
-    <field labelOnTop="0" name="operator_type"/>
-    <field labelOnTop="0" name="osm_id"/>
-    <field labelOnTop="0" name="osm_type"/>
-    <field labelOnTop="0" name="parking"/>
-    <field labelOnTop="0" name="phone"/>
-    <field labelOnTop="0" name="political_division"/>
-    <field labelOnTop="0" name="ref:FR:FINESS"/>
-    <field labelOnTop="0" name="ref:INSEE"/>
-    <field labelOnTop="0" name="roof:levels"/>
-    <field labelOnTop="0" name="social_facility"/>
-    <field labelOnTop="0" name="social_facility:for"/>
-    <field labelOnTop="0" name="source:url"/>
-    <field labelOnTop="0" name="sport"/>
-    <field labelOnTop="0" name="start_date"/>
-    <field labelOnTop="0" name="street_cabinet"/>
-    <field labelOnTop="0" name="supervised"/>
-    <field labelOnTop="0" name="surface"/>
-    <field labelOnTop="0" name="type"/>
-    <field labelOnTop="0" name="wall"/>
-    <field labelOnTop="0" name="water"/>
-    <field labelOnTop="0" name="waterway"/>
-    <field labelOnTop="0" name="wheelchair"/>
-    <field labelOnTop="0" name="wikidata"/>
-    <field labelOnTop="0" name="wikipedia"/>
+    <field name="CLC:code" labelOnTop="0"/>
+    <field name="CLC:id" labelOnTop="0"/>
+    <field name="CLC:year" labelOnTop="0"/>
+    <field name="access" labelOnTop="0"/>
+    <field name="addr:city" labelOnTop="0"/>
+    <field name="addr:housenumber" labelOnTop="0"/>
+    <field name="addr:postcode" labelOnTop="0"/>
+    <field name="addr:street" labelOnTop="0"/>
+    <field name="admin_level" labelOnTop="0"/>
+    <field name="aeroway" labelOnTop="0"/>
+    <field name="amenity" labelOnTop="0"/>
+    <field name="barrier" labelOnTop="0"/>
+    <field name="blind" labelOnTop="0"/>
+    <field name="boundary" labelOnTop="0"/>
+    <field name="building" labelOnTop="0"/>
+    <field name="building:levels" labelOnTop="0"/>
+    <field name="contact:phone" labelOnTop="0"/>
+    <field name="craft" labelOnTop="0"/>
+    <field name="description" labelOnTop="0"/>
+    <field name="disused:amenity" labelOnTop="0"/>
+    <field name="emergency" labelOnTop="0"/>
+    <field name="fee" labelOnTop="0"/>
+    <field name="female" labelOnTop="0"/>
+    <field name="fence_type" labelOnTop="0"/>
+    <field name="fid" labelOnTop="0"/>
+    <field name="full_id" labelOnTop="0"/>
+    <field name="geological" labelOnTop="0"/>
+    <field name="highway" labelOnTop="0"/>
+    <field name="historic" labelOnTop="0"/>
+    <field name="land_area" labelOnTop="0"/>
+    <field name="landuse" labelOnTop="0"/>
+    <field name="leaf_type" labelOnTop="0"/>
+    <field name="leisure" labelOnTop="0"/>
+    <field name="male" labelOnTop="0"/>
+    <field name="man_made" labelOnTop="0"/>
+    <field name="max_age" labelOnTop="0"/>
+    <field name="military" labelOnTop="0"/>
+    <field name="min_age" labelOnTop="0"/>
+    <field name="name" labelOnTop="0"/>
+    <field name="natural" labelOnTop="0"/>
+    <field name="office" 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_type" labelOnTop="0"/>
+    <field name="osm_way_id" labelOnTop="0"/>
+    <field name="other_tags" labelOnTop="0"/>
+    <field name="parking" labelOnTop="0"/>
+    <field name="phone" labelOnTop="0"/>
+    <field name="place" labelOnTop="0"/>
+    <field name="political_division" labelOnTop="0"/>
+    <field name="ref:FR:FINESS" labelOnTop="0"/>
+    <field name="ref:INSEE" labelOnTop="0"/>
+    <field name="roof:levels" labelOnTop="0"/>
+    <field name="shop" labelOnTop="0"/>
+    <field name="social_facility" labelOnTop="0"/>
+    <field name="social_facility:for" labelOnTop="0"/>
+    <field name="source:url" labelOnTop="0"/>
+    <field name="sport" 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="type" labelOnTop="0"/>
+    <field name="wall" labelOnTop="0"/>
+    <field name="water" labelOnTop="0"/>
+    <field name="waterway" labelOnTop="0"/>
+    <field name="wheelchair" labelOnTop="0"/>
+    <field name="wikidata" labelOnTop="0"/>
+    <field name="wikipedia" labelOnTop="0"/>
   </labelOnTop>
+  <dataDefinedFieldProperties/>
   <widgets/>
   <previewExpression>description</previewExpression>
   <mapTip></mapTip>
diff --git a/styles/point.qml b/styles/point.qml
index f34e67a..3b1ab9c 100644
--- a/styles/point.qml
+++ b/styles/point.qml
@@ -1,416 +1,422 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis minScale="1e+08" version="3.10.4-A Coruña" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" readOnly="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyLocal="1" simplifyAlgorithm="0" labelsEnabled="0" simplifyDrawingHints="0">
+<qgis version="3.16.3-Hannover" labelsEnabled="0" readOnly="0" simplifyDrawingHints="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="100000000" simplifyAlgorithm="0" simplifyLocal="1" simplifyMaxScale="1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+  <temporal durationUnit="min" startExpression="" accumulate="0" fixedDuration="0" mode="0" endField="" enabled="0" durationField="" startField="" endExpression="">
+    <fixedRange>
+      <start></start>
+      <end></end>
+    </fixedRange>
+  </temporal>
+  <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" enableorderby="0">
     <rules key="{b4a7e217-96d3-4a17-a86d-82cb169bb06f}">
-      <rule symbol="0" filter="&quot;amenity&quot;='bench'" label="banc" key="{0b88dc4f-12bb-46c3-b3cd-63c869b8310c}"/>
-      <rule symbol="1" filter="&quot;barrier&quot;='gate'" label="portail" key="{4f58d0e7-0e87-4b1d-b8ec-c0fc23cdecdb}"/>
-      <rule symbol="2" filter="&quot;amenity&quot;='waste_basket'" label="poubelle" key="{c8c6a164-d2c2-422b-a84c-52df2e743491}"/>
-      <rule symbol="3" filter="&quot;information&quot;='board'" label="panneau" key="{5c21004d-d780-4834-8bb7-1127b12f9386}"/>
-      <rule symbol="4" filter="&quot;natural&quot;='tree_stump'" label="souche" key="{eaef9329-482d-4dff-bb17-ec9b4a21877c}"/>
-      <rule symbol="5" filter="&quot;natural&quot;='tree'" label="arbre" key="{165ea62b-bcd4-46f9-a54d-a3c9c5e50d63}"/>
-      <rule symbol="6" filter="&quot;leisure&quot;='playground'" label="jeux" key="{25ce3ab4-dca5-4d00-97f4-5bc3e0694cc8}"/>
-      <rule symbol="7" filter="&quot;leisure&quot;='picnic_table'" label="table" key="{33fbb90e-4c36-4eb5-b4a3-66996cb42a5c}"/>
-      <rule symbol="8" filter="&quot;highway&quot;='street_lamp'" label="lampadaire" key="{3b25e8ac-36bc-456a-9ba6-e040edc656fa}"/>
-      <rule symbol="9" filter="&quot;amenity&quot;='toilets'" label="toilettes" key="{b949a7d0-328e-45e7-8254-cd249b0e2e6b}"/>
-      <rule symbol="10" filter="&quot;amenity&quot;='bicycle_parking'" label="parking à vélos" key="{e21ed702-ca88-4229-b77d-123cc1498265}"/>
-      <rule symbol="11" filter="&quot;amenity&quot;='drinking_water'" label="point d'eau" key="{b374c9c1-d61f-4eb6-a8b2-e8f06e8f0abb}"/>
-      <rule symbol="12" filter="&quot;amenity&quot;='waste_disposal'or&quot;amenity&quot;='recycling'" label="conteneur à déchets" key="{dbd1cd33-4ca5-4b63-a0c5-4fffc6120d17}"/>
-      <rule symbol="13" filter="&quot;sport&quot;='table_tennis'" label="table de ping pong" key="{ef06879f-ddc6-45ce-a41e-67d2981d3ba7}"/>
+      <rule key="{0b88dc4f-12bb-46c3-b3cd-63c869b8310c}" label="banc" symbol="0" filter="regexp_match(&quot;other_tags&quot;, '&quot;amenity&quot;=>&quot;bench&quot;')"/>
+      <rule key="{4f58d0e7-0e87-4b1d-b8ec-c0fc23cdecdb}" label="portail" symbol="1" filter="&quot;barrier&quot;='gate'"/>
+      <rule key="{c8c6a164-d2c2-422b-a84c-52df2e743491}" label="poubelle" symbol="2" filter="regexp_match(&quot;other_tags&quot;, '&quot;amenity&quot;=>&quot;waste_basket&quot;')"/>
+      <rule key="{5c21004d-d780-4834-8bb7-1127b12f9386}" label="panneau" symbol="3" filter="regexp_match(&quot;other_tags&quot;, '&quot;information&quot;=>&quot;board&quot;')"/>
+      <rule key="{eaef9329-482d-4dff-bb17-ec9b4a21877c}" label="souche" symbol="4" filter="regexp_match(&quot;other_tags&quot;, '&quot;natural&quot;=>&quot;tree_stump&quot;')"/>
+      <rule key="{165ea62b-bcd4-46f9-a54d-a3c9c5e50d63}" label="arbre" symbol="5" filter="regexp_match(&quot;other_tags&quot;, '&quot;natural&quot;=>&quot;tree&quot;')"/>
+      <rule key="{25ce3ab4-dca5-4d00-97f4-5bc3e0694cc8}" label="jeux" symbol="6" filter="regexp_match(&quot;other_tags&quot;, '&quot;leisure&quot;=>&quot;playground&quot;')&#xa;"/>
+      <rule key="{33fbb90e-4c36-4eb5-b4a3-66996cb42a5c}" label="table" symbol="7" filter="regexp_match(&quot;other_tags&quot;, '&quot;leisure&quot;=>&quot;picnic_table&quot;')"/>
+      <rule key="{3b25e8ac-36bc-456a-9ba6-e040edc656fa}" label="lampadaire" symbol="8" filter="&quot;highway&quot;='street_lamp'"/>
+      <rule key="{b949a7d0-328e-45e7-8254-cd249b0e2e6b}" label="toilettes" symbol="9" filter="regexp_match(&quot;other_tags&quot;, '&quot;amenity&quot;=>&quot;toilets&quot;')"/>
+      <rule key="{e21ed702-ca88-4229-b77d-123cc1498265}" label="parking à vélos" symbol="10" filter="regexp_match(&quot;other_tags&quot;, '&quot;amenity&quot;=>&quot;bicycle_parking&quot;')"/>
+      <rule key="{b374c9c1-d61f-4eb6-a8b2-e8f06e8f0abb}" label="point d'eau" symbol="11" filter="regexp_match(&quot;other_tags&quot;, '&quot;amenity&quot;=>&quot;drinking_water&quot;')"/>
+      <rule key="{dbd1cd33-4ca5-4b63-a0c5-4fffc6120d17}" label="conteneur à déchets" symbol="12" filter="regexp_match(&quot;other_tags&quot;, '&quot;amenity&quot;=>&quot;waste_disposal&quot;') or regexp_match(&quot;other_tags&quot;, '&quot;amenity&quot;=>&quot;recycling&quot;')"/>
+      <rule key="{ef06879f-ddc6-45ce-a41e-67d2981d3ba7}" label="table de ping pong" symbol="13" filter="regexp_match(&quot;other_tags&quot;, '&quot;sport&quot;=>&quot;table_tennis&quot;')"/>
     </rules>
     <symbols>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="0">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/banc.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="5" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="0" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/banc.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="5"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="1">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/portail.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="4" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="1" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/portail.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="4"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="10">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="231,113,72,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/parking_velos.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="4" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="10" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="231,113,72,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/parking_velos.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="4"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="11">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="232,113,141,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/point_eau.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="4" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="11" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="232,113,141,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/point_eau.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="4"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="12">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="133,182,111,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="http://www.linux-alpes.org/osm/ressources/symboles/conteneur.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="7" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="12" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="133,182,111,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="http://www.linux-alpes.org/osm/ressources/symboles/conteneur.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="7"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="13">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="190,178,151,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/ping-pong.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="10" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="13" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="190,178,151,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/ping-pong.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="10"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="2">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/poubelle.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="3" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="2" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/poubelle.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="3"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="3">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/panneau.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="5" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="2" k="vertical_anchor_point"/>
+      <symbol name="3" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/panneau.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="5"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="2"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="4">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/souche.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="4" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="4" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/souche.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="4"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="5">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/arbre.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="6" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="5" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/arbre.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="6"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="6">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/jeux.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="8" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="6" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/jeux.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="8"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="7">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/table.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MapUnit" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="5" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="7" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/table.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MapUnit"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="5"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="8">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="229,182,54,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/lampadaire.svg" k="name"/>
-          <prop v="0,-1" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="2.5" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="2" k="vertical_anchor_point"/>
+      <symbol name="8" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="229,182,54,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/lampadaire.svg"/>
+          <prop k="offset" v="0,-1"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="2.5"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="2"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="marker" force_rhr="0" alpha="1" name="9">
-        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="0" k="fixedAspectRatio"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/toilettes.svg" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="3.4" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="MapUnit" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+      <symbol name="9" type="marker" clip_to_extent="1" force_rhr="0" alpha="1">
+        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="fixedAspectRatio" v="0"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="name" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/symboles/toilettes.svg"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="3.4"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="MapUnit"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -418,545 +424,143 @@
     </symbols>
   </renderer-v2>
   <customproperties>
-    <property value="0" key="embeddedWidgets/count"/>
-    <property value="quickosm_query" key="variableNames"/>
-    <property value="&lt;osm-script bbox=&quot;44.08902897426553,6.24723494052887,44.089850630280395,6.249284148216248&quot;>&#xa;  &lt;union into=&quot;_&quot;>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;bench&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;gate&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;trash&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;building&quot; modv=&quot;&quot; v=&quot;&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;information&quot; modv=&quot;&quot; v=&quot;board&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree_stump&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;wall&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;playground&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;picnic_table&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;fence&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;landuse&quot; modv=&quot;&quot; v=&quot;grass&quot;/>&#xa;    &lt;/query>&#xa;  &lt;/union>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;  &lt;recurse from=&quot;_&quot; into=&quot;_&quot; type=&quot;down&quot;/>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;&lt;/osm-script>" key="variableValues"/>
+    <property key="dualview/previewExpressions">
+      <value></value>
+    </property>
+    <property key="embeddedWidgets/count" value="0"/>
+    <property key="variableNames" value="quickosm_query"/>
+    <property key="variableValues" value="&lt;osm-script bbox=&quot;44.08902897426553,6.24723494052887,44.089850630280395,6.249284148216248&quot;>&#xa;  &lt;union into=&quot;_&quot;>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;bench&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;gate&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;trash&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;building&quot; modv=&quot;&quot; v=&quot;&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;information&quot; modv=&quot;&quot; v=&quot;board&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree_stump&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;wall&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;playground&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;picnic_table&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;fence&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;landuse&quot; modv=&quot;&quot; v=&quot;grass&quot;/>&#xa;    &lt;/query>&#xa;  &lt;/union>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;  &lt;recurse from=&quot;_&quot; into=&quot;_&quot; type=&quot;down&quot;/>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;&lt;/osm-script>"/>
   </customproperties>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
   <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory diagramOrientation="Up" enabled="0" penWidth="0" labelPlacementMethod="XHeight" backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" penColor="#000000" barWidth="5" opacity="1" scaleDependency="Area" maxScaleDenominator="1e+08" rotationOffset="270" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" minScaleDenominator="0" sizeType="MM" width="15" lineSizeType="MM">
+    <DiagramCategory backgroundColor="#ffffff" showAxis="0" minimumSize="0" direction="1" minScaleDenominator="0" width="15" barWidth="5" spacingUnit="MM" labelPlacementMethod="XHeight" spacing="0" maxScaleDenominator="1e+8" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" sizeType="MM" scaleBasedVisibility="0" rotationOffset="270" scaleDependency="Area" lineSizeType="MM" backgroundAlpha="255" penAlpha="255" penWidth="0" height="15" opacity="1" diagramOrientation="Up" sizeScale="3x:0,0,0,0,0,0">
       <fontProperties style="" description="Liberation Sans,10,-1,5,50,0,0,0,0,0"/>
-      <attribute field="" label="" color="#000000"/>
+      <attribute label="" field="" color="#000000"/>
+      <axisSymbol>
+        <symbol name="" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+          <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+            <prop k="align_dash_pattern" v="0"/>
+            <prop k="capstyle" v="square"/>
+            <prop k="customdash" v="5;2"/>
+            <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="customdash_unit" v="MM"/>
+            <prop k="dash_pattern_offset" v="0"/>
+            <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="dash_pattern_offset_unit" v="MM"/>
+            <prop k="draw_inside_polygon" v="0"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="line_color" v="35,35,35,255"/>
+            <prop k="line_style" v="solid"/>
+            <prop k="line_width" v="0.26"/>
+            <prop k="line_width_unit" v="MM"/>
+            <prop k="offset" v="0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="ring_filter" v="0"/>
+            <prop k="tweak_dash_pattern_on_corners" v="0"/>
+            <prop k="use_custom_dash" v="0"/>
+            <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+          </layer>
+        </symbol>
+      </axisSymbol>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings zIndex="0" obstacle="0" priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="18">
+  <DiagramLayerSettings obstacle="0" linePlacementFlags="18" priority="0" showAll="1" dist="0" placement="0" zIndex="0">
     <properties>
       <Option type="Map">
-        <Option type="QString" name="name" value=""/>
+        <Option name="name" type="QString" value=""/>
         <Option name="properties"/>
-        <Option type="QString" name="type" value="collection"/>
+        <Option name="type" type="QString" value="collection"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
-  <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+  <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
     <activeChecks/>
     <checkConfiguration/>
   </geometryOptions>
+  <legend type="default-vector"/>
+  <referencedLayers/>
   <fieldConfiguration>
-    <field name="fid">
+    <field name="fid" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="full_id">
+    <field name="osm_id" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_id">
+    <field name="name" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="osm_type">
+    <field name="barrier" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="crossing">
+    <field name="highway" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="highway">
+    <field name="ref" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="railway">
+    <field name="address" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="traffic_signals">
+    <field name="is_in" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="bicycle">
+    <field name="place" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="crossing_ref">
+    <field name="man_made" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="traffic_calming">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ele">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="mountain_pass">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="crossing:island">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="segregated">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bus">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="public_transport">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="survey:date">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="tactile_paving">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="barrier">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="natural">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ford">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="alt_name">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="hiking">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="information">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="tourism">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="traffic_sign">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="mtb">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="foot">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:fr">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:postcode">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="capital">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:ca">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="name:oc">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="place">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ref:FR:SIREN">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:name:oc">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wikidata">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wikipedia">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bollard">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="material">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="history">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="horse">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="swing_gate:type">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="network">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bench">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="shelter">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wheelchair">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="crossing:barrier">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="stile">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="direction">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="motor_vehicle">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxspeed">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="traffic_sign:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="entrance">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="leisure">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="sport">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="amenity">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:housenumber">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:street">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="passenger_information_display">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="hazard">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="backrest">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="description:fr">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="drinking_water">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="fee">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="female">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="toilets:disposal">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="toilets:position">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="male">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="advertising">
+    <field name="other_tags" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -965,412 +569,95 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias field="fid" name="" index="0"/>
-    <alias field="full_id" name="" index="1"/>
-    <alias field="osm_id" name="" index="2"/>
-    <alias field="osm_type" name="" index="3"/>
-    <alias field="crossing" name="" index="4"/>
-    <alias field="highway" name="" index="5"/>
-    <alias field="railway" name="" index="6"/>
-    <alias field="traffic_signals" name="" index="7"/>
-    <alias field="bicycle" name="" index="8"/>
-    <alias field="crossing_ref" name="" index="9"/>
-    <alias field="traffic_calming" name="" index="10"/>
-    <alias field="ele" name="" index="11"/>
-    <alias field="mountain_pass" name="" index="12"/>
-    <alias field="name" name="" index="13"/>
-    <alias field="crossing:island" name="" index="14"/>
-    <alias field="segregated" name="" index="15"/>
-    <alias field="bus" name="" index="16"/>
-    <alias field="public_transport" name="" index="17"/>
-    <alias field="survey:date" name="" index="18"/>
-    <alias field="tactile_paving" name="" index="19"/>
-    <alias field="barrier" name="" index="20"/>
-    <alias field="natural" name="" index="21"/>
-    <alias field="ford" name="" index="22"/>
-    <alias field="alt_name" name="" index="23"/>
-    <alias field="hiking" name="" index="24"/>
-    <alias field="information" name="" index="25"/>
-    <alias field="ref" name="" index="26"/>
-    <alias field="tourism" name="" index="27"/>
-    <alias field="traffic_sign" name="" index="28"/>
-    <alias field="mtb" name="" index="29"/>
-    <alias field="foot" name="" index="30"/>
-    <alias field="name:fr" name="" index="31"/>
-    <alias field="addr:postcode" name="" index="32"/>
-    <alias field="capital" name="" index="33"/>
-    <alias field="name:ca" name="" index="34"/>
-    <alias field="name:oc" name="" index="35"/>
-    <alias field="place" name="" index="36"/>
-    <alias field="ref:FR:SIREN" name="" index="37"/>
-    <alias field="source:name:oc" name="" index="38"/>
-    <alias field="wikidata" name="" index="39"/>
-    <alias field="wikipedia" name="" index="40"/>
-    <alias field="bollard" name="" index="41"/>
-    <alias field="material" name="" index="42"/>
-    <alias field="history" name="" index="43"/>
-    <alias field="horse" name="" index="44"/>
-    <alias field="swing_gate:type" name="" index="45"/>
-    <alias field="network" name="" index="46"/>
-    <alias field="bench" name="" index="47"/>
-    <alias field="shelter" name="" index="48"/>
-    <alias field="wheelchair" name="" index="49"/>
-    <alias field="crossing:barrier" name="" index="50"/>
-    <alias field="stile" name="" index="51"/>
-    <alias field="direction" name="" index="52"/>
-    <alias field="motor_vehicle" name="" index="53"/>
-    <alias field="maxspeed" name="" index="54"/>
-    <alias field="traffic_sign:backward" name="" index="55"/>
-    <alias field="entrance" name="" index="56"/>
-    <alias field="leisure" name="" index="57"/>
-    <alias field="sport" name="" index="58"/>
-    <alias field="amenity" name="" index="59"/>
-    <alias field="access" name="" index="60"/>
-    <alias field="addr:housenumber" name="" index="61"/>
-    <alias field="addr:street" name="" index="62"/>
-    <alias field="passenger_information_display" name="" index="63"/>
-    <alias field="hazard" name="" index="64"/>
-    <alias field="backrest" name="" index="65"/>
-    <alias field="description:fr" name="" index="66"/>
-    <alias field="drinking_water" name="" index="67"/>
-    <alias field="fee" name="" index="68"/>
-    <alias field="female" name="" index="69"/>
-    <alias field="toilets:disposal" name="" index="70"/>
-    <alias field="toilets:position" name="" index="71"/>
-    <alias field="male" name="" index="72"/>
-    <alias field="advertising" name="" index="73"/>
+    <alias name="" field="fid" index="0"/>
+    <alias name="" field="osm_id" index="1"/>
+    <alias name="" field="name" index="2"/>
+    <alias name="" field="barrier" index="3"/>
+    <alias name="" field="highway" index="4"/>
+    <alias name="" field="ref" index="5"/>
+    <alias name="" field="address" index="6"/>
+    <alias name="" field="is_in" index="7"/>
+    <alias name="" field="place" index="8"/>
+    <alias name="" field="man_made" index="9"/>
+    <alias name="" field="other_tags" index="10"/>
   </aliases>
-  <excludeAttributesWMS/>
-  <excludeAttributesWFS/>
   <defaults>
-    <default expression="" field="fid" applyOnUpdate="0"/>
-    <default expression="" field="full_id" applyOnUpdate="0"/>
-    <default expression="" field="osm_id" applyOnUpdate="0"/>
-    <default expression="" field="osm_type" applyOnUpdate="0"/>
-    <default expression="" field="crossing" applyOnUpdate="0"/>
-    <default expression="" field="highway" applyOnUpdate="0"/>
-    <default expression="" field="railway" applyOnUpdate="0"/>
-    <default expression="" field="traffic_signals" applyOnUpdate="0"/>
-    <default expression="" field="bicycle" applyOnUpdate="0"/>
-    <default expression="" field="crossing_ref" applyOnUpdate="0"/>
-    <default expression="" field="traffic_calming" applyOnUpdate="0"/>
-    <default expression="" field="ele" applyOnUpdate="0"/>
-    <default expression="" field="mountain_pass" applyOnUpdate="0"/>
-    <default expression="" field="name" applyOnUpdate="0"/>
-    <default expression="" field="crossing:island" applyOnUpdate="0"/>
-    <default expression="" field="segregated" applyOnUpdate="0"/>
-    <default expression="" field="bus" applyOnUpdate="0"/>
-    <default expression="" field="public_transport" applyOnUpdate="0"/>
-    <default expression="" field="survey:date" applyOnUpdate="0"/>
-    <default expression="" field="tactile_paving" applyOnUpdate="0"/>
-    <default expression="" field="barrier" applyOnUpdate="0"/>
-    <default expression="" field="natural" applyOnUpdate="0"/>
-    <default expression="" field="ford" applyOnUpdate="0"/>
-    <default expression="" field="alt_name" applyOnUpdate="0"/>
-    <default expression="" field="hiking" applyOnUpdate="0"/>
-    <default expression="" field="information" applyOnUpdate="0"/>
-    <default expression="" field="ref" applyOnUpdate="0"/>
-    <default expression="" field="tourism" applyOnUpdate="0"/>
-    <default expression="" field="traffic_sign" applyOnUpdate="0"/>
-    <default expression="" field="mtb" applyOnUpdate="0"/>
-    <default expression="" field="foot" applyOnUpdate="0"/>
-    <default expression="" field="name:fr" applyOnUpdate="0"/>
-    <default expression="" field="addr:postcode" applyOnUpdate="0"/>
-    <default expression="" field="capital" applyOnUpdate="0"/>
-    <default expression="" field="name:ca" applyOnUpdate="0"/>
-    <default expression="" field="name:oc" applyOnUpdate="0"/>
-    <default expression="" field="place" applyOnUpdate="0"/>
-    <default expression="" field="ref:FR:SIREN" applyOnUpdate="0"/>
-    <default expression="" field="source:name:oc" applyOnUpdate="0"/>
-    <default expression="" field="wikidata" applyOnUpdate="0"/>
-    <default expression="" field="wikipedia" applyOnUpdate="0"/>
-    <default expression="" field="bollard" applyOnUpdate="0"/>
-    <default expression="" field="material" applyOnUpdate="0"/>
-    <default expression="" field="history" applyOnUpdate="0"/>
-    <default expression="" field="horse" applyOnUpdate="0"/>
-    <default expression="" field="swing_gate:type" applyOnUpdate="0"/>
-    <default expression="" field="network" applyOnUpdate="0"/>
-    <default expression="" field="bench" applyOnUpdate="0"/>
-    <default expression="" field="shelter" applyOnUpdate="0"/>
-    <default expression="" field="wheelchair" applyOnUpdate="0"/>
-    <default expression="" field="crossing:barrier" applyOnUpdate="0"/>
-    <default expression="" field="stile" applyOnUpdate="0"/>
-    <default expression="" field="direction" applyOnUpdate="0"/>
-    <default expression="" field="motor_vehicle" applyOnUpdate="0"/>
-    <default expression="" field="maxspeed" applyOnUpdate="0"/>
-    <default expression="" field="traffic_sign:backward" applyOnUpdate="0"/>
-    <default expression="" field="entrance" applyOnUpdate="0"/>
-    <default expression="" field="leisure" applyOnUpdate="0"/>
-    <default expression="" field="sport" applyOnUpdate="0"/>
-    <default expression="" field="amenity" applyOnUpdate="0"/>
-    <default expression="" field="access" applyOnUpdate="0"/>
-    <default expression="" field="addr:housenumber" applyOnUpdate="0"/>
-    <default expression="" field="addr:street" applyOnUpdate="0"/>
-    <default expression="" field="passenger_information_display" applyOnUpdate="0"/>
-    <default expression="" field="hazard" applyOnUpdate="0"/>
-    <default expression="" field="backrest" applyOnUpdate="0"/>
-    <default expression="" field="description:fr" applyOnUpdate="0"/>
-    <default expression="" field="drinking_water" applyOnUpdate="0"/>
-    <default expression="" field="fee" applyOnUpdate="0"/>
-    <default expression="" field="female" applyOnUpdate="0"/>
-    <default expression="" field="toilets:disposal" applyOnUpdate="0"/>
-    <default expression="" field="toilets:position" applyOnUpdate="0"/>
-    <default expression="" field="male" applyOnUpdate="0"/>
-    <default expression="" field="advertising" applyOnUpdate="0"/>
+    <default applyOnUpdate="0" expression="" field="fid"/>
+    <default applyOnUpdate="0" expression="" field="osm_id"/>
+    <default applyOnUpdate="0" expression="" field="name"/>
+    <default applyOnUpdate="0" expression="" field="barrier"/>
+    <default applyOnUpdate="0" expression="" field="highway"/>
+    <default applyOnUpdate="0" expression="" field="ref"/>
+    <default applyOnUpdate="0" expression="" field="address"/>
+    <default applyOnUpdate="0" expression="" field="is_in"/>
+    <default applyOnUpdate="0" expression="" field="place"/>
+    <default applyOnUpdate="0" expression="" field="man_made"/>
+    <default applyOnUpdate="0" expression="" field="other_tags"/>
   </defaults>
   <constraints>
-    <constraint constraints="3" notnull_strength="1" exp_strength="0" unique_strength="1" field="fid"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="full_id"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_id"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="osm_type"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="crossing"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="highway"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="railway"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="traffic_signals"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="bicycle"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="crossing_ref"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="traffic_calming"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="ele"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="mountain_pass"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="crossing:island"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="segregated"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="bus"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="public_transport"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="survey:date"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="tactile_paving"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="barrier"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="natural"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="ford"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="alt_name"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="hiking"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="information"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="ref"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="tourism"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="traffic_sign"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="mtb"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="foot"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name:fr"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="addr:postcode"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="capital"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name:ca"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="name:oc"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="place"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="ref:FR:SIREN"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="source:name:oc"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="wikidata"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="wikipedia"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="bollard"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="material"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="history"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="horse"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="swing_gate:type"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="network"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="bench"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="shelter"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="wheelchair"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="crossing:barrier"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="stile"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="direction"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="motor_vehicle"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="maxspeed"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="traffic_sign:backward"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="entrance"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="leisure"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="sport"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="amenity"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="access"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="addr:housenumber"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="addr:street"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="passenger_information_display"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="hazard"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="backrest"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="description:fr"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="drinking_water"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="fee"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="female"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="toilets:disposal"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="toilets:position"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="male"/>
-    <constraint constraints="0" notnull_strength="0" exp_strength="0" unique_strength="0" field="advertising"/>
+    <constraint constraints="3" field="fid" notnull_strength="1" unique_strength="1" exp_strength="0"/>
+    <constraint constraints="0" field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="name" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="barrier" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="highway" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="ref" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="address" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="is_in" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="place" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="man_made" notnull_strength="0" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" field="other_tags" notnull_strength="0" unique_strength="0" exp_strength="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint exp="" field="fid" desc=""/>
-    <constraint exp="" field="full_id" desc=""/>
-    <constraint exp="" field="osm_id" desc=""/>
-    <constraint exp="" field="osm_type" desc=""/>
-    <constraint exp="" field="crossing" desc=""/>
-    <constraint exp="" field="highway" desc=""/>
-    <constraint exp="" field="railway" desc=""/>
-    <constraint exp="" field="traffic_signals" desc=""/>
-    <constraint exp="" field="bicycle" desc=""/>
-    <constraint exp="" field="crossing_ref" desc=""/>
-    <constraint exp="" field="traffic_calming" desc=""/>
-    <constraint exp="" field="ele" desc=""/>
-    <constraint exp="" field="mountain_pass" desc=""/>
-    <constraint exp="" field="name" desc=""/>
-    <constraint exp="" field="crossing:island" desc=""/>
-    <constraint exp="" field="segregated" desc=""/>
-    <constraint exp="" field="bus" desc=""/>
-    <constraint exp="" field="public_transport" desc=""/>
-    <constraint exp="" field="survey:date" desc=""/>
-    <constraint exp="" field="tactile_paving" desc=""/>
-    <constraint exp="" field="barrier" desc=""/>
-    <constraint exp="" field="natural" desc=""/>
-    <constraint exp="" field="ford" desc=""/>
-    <constraint exp="" field="alt_name" desc=""/>
-    <constraint exp="" field="hiking" desc=""/>
-    <constraint exp="" field="information" desc=""/>
-    <constraint exp="" field="ref" desc=""/>
-    <constraint exp="" field="tourism" desc=""/>
-    <constraint exp="" field="traffic_sign" desc=""/>
-    <constraint exp="" field="mtb" desc=""/>
-    <constraint exp="" field="foot" desc=""/>
-    <constraint exp="" field="name:fr" desc=""/>
-    <constraint exp="" field="addr:postcode" desc=""/>
-    <constraint exp="" field="capital" desc=""/>
-    <constraint exp="" field="name:ca" desc=""/>
-    <constraint exp="" field="name:oc" desc=""/>
-    <constraint exp="" field="place" desc=""/>
-    <constraint exp="" field="ref:FR:SIREN" desc=""/>
-    <constraint exp="" field="source:name:oc" desc=""/>
-    <constraint exp="" field="wikidata" desc=""/>
-    <constraint exp="" field="wikipedia" desc=""/>
-    <constraint exp="" field="bollard" desc=""/>
-    <constraint exp="" field="material" desc=""/>
-    <constraint exp="" field="history" desc=""/>
-    <constraint exp="" field="horse" desc=""/>
-    <constraint exp="" field="swing_gate:type" desc=""/>
-    <constraint exp="" field="network" desc=""/>
-    <constraint exp="" field="bench" desc=""/>
-    <constraint exp="" field="shelter" desc=""/>
-    <constraint exp="" field="wheelchair" desc=""/>
-    <constraint exp="" field="crossing:barrier" desc=""/>
-    <constraint exp="" field="stile" desc=""/>
-    <constraint exp="" field="direction" desc=""/>
-    <constraint exp="" field="motor_vehicle" desc=""/>
-    <constraint exp="" field="maxspeed" desc=""/>
-    <constraint exp="" field="traffic_sign:backward" desc=""/>
-    <constraint exp="" field="entrance" desc=""/>
-    <constraint exp="" field="leisure" desc=""/>
-    <constraint exp="" field="sport" desc=""/>
-    <constraint exp="" field="amenity" desc=""/>
-    <constraint exp="" field="access" desc=""/>
-    <constraint exp="" field="addr:housenumber" desc=""/>
-    <constraint exp="" field="addr:street" desc=""/>
-    <constraint exp="" field="passenger_information_display" desc=""/>
-    <constraint exp="" field="hazard" desc=""/>
-    <constraint exp="" field="backrest" desc=""/>
-    <constraint exp="" field="description:fr" desc=""/>
-    <constraint exp="" field="drinking_water" desc=""/>
-    <constraint exp="" field="fee" desc=""/>
-    <constraint exp="" field="female" desc=""/>
-    <constraint exp="" field="toilets:disposal" desc=""/>
-    <constraint exp="" field="toilets:position" desc=""/>
-    <constraint exp="" field="male" desc=""/>
-    <constraint exp="" field="advertising" desc=""/>
+    <constraint exp="" desc="" field="fid"/>
+    <constraint exp="" desc="" field="osm_id"/>
+    <constraint exp="" desc="" field="name"/>
+    <constraint exp="" desc="" field="barrier"/>
+    <constraint exp="" desc="" field="highway"/>
+    <constraint exp="" desc="" field="ref"/>
+    <constraint exp="" desc="" field="address"/>
+    <constraint exp="" desc="" field="is_in"/>
+    <constraint exp="" desc="" field="place"/>
+    <constraint exp="" desc="" field="man_made"/>
+    <constraint exp="" desc="" field="other_tags"/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{9a42f684-c7ab-4632-aade-f845c747b2a6}" type="5" notificationMessage="" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" name="OpenStreetMap Browser" shortTitle="OpenStreetMap Browser" capture="0" icon="">
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+    <actionsetting shortTitle="OpenStreetMap Browser" icon="" name="OpenStreetMap Browser" type="5" capture="0" isEnabledOnlyWhenEditable="0" id="{b17a9791-9f68-4797-b2a7-f253df5de291}" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{023da321-644a-4b3b-83f5-9cba138e886d}" type="1" notificationMessage="" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" name="Mapillary" shortTitle="Mapillary" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg">
+    <actionsetting shortTitle="Mapillary" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" name="Mapillary" type="1" capture="0" isEnabledOnlyWhenEditable="0" id="{2cd7eff9-275e-452f-bf8b-3a243d2258d8}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{1bdca233-1115-44b7-9f17-0fc2595037d6}" type="1" notificationMessage="" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" name="JOSM" shortTitle="JOSM" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg">
+    <actionsetting shortTitle="JOSM" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" name="JOSM" type="1" capture="0" isEnabledOnlyWhenEditable="0" id="{99cd7f04-e6aa-4286-be7a-e4b1955afc37}" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{c8fcf667-f422-496b-bc97-460cd130f78f}" type="5" notificationMessage="" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" name="User default editor" shortTitle="User default editor" capture="0" icon="">
+    <actionsetting shortTitle="User default editor" icon="" name="User default editor" type="5" capture="0" isEnabledOnlyWhenEditable="0" id="{a9cad4d6-45d3-48bf-965f-4aa2d5266fa8}" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;other_tags&quot;" sortOrder="1">
     <columns>
-      <column type="field" hidden="0" name="full_id" width="-1"/>
-      <column type="field" hidden="0" name="osm_id" width="-1"/>
-      <column type="field" hidden="0" name="osm_type" width="-1"/>
-      <column type="field" hidden="0" name="natural" width="-1"/>
-      <column type="field" hidden="0" name="amenity" width="-1"/>
-      <column type="actions" hidden="1" width="-1"/>
-      <column type="field" hidden="0" name="barrier" width="-1"/>
-      <column type="field" hidden="0" name="entrance" width="-1"/>
-      <column type="field" hidden="0" name="access" width="-1"/>
-      <column type="field" hidden="0" name="crossing" width="-1"/>
-      <column type="field" hidden="0" name="highway" width="-1"/>
-      <column type="field" hidden="0" name="tourism" width="-1"/>
-      <column type="field" hidden="0" name="leisure" width="-1"/>
-      <column type="field" hidden="0" name="addr:housenumber" width="-1"/>
-      <column type="field" hidden="0" name="addr:street" width="-1"/>
-      <column type="field" hidden="0" name="motor_vehicle" width="-1"/>
-      <column type="field" hidden="0" name="backrest" width="-1"/>
-      <column type="field" hidden="0" name="drinking_water" width="-1"/>
-      <column type="field" hidden="0" name="fee" width="-1"/>
-      <column type="field" hidden="0" name="female" width="-1"/>
-      <column type="field" hidden="0" name="toilets:disposal" width="-1"/>
-      <column type="field" hidden="0" name="toilets:position" width="-1"/>
-      <column type="field" hidden="0" name="male" width="-1"/>
-      <column type="field" hidden="0" name="foot" width="-1"/>
-      <column type="field" hidden="0" name="information" width="-1"/>
-      <column type="field" hidden="0" name="advertising" width="-1"/>
-      <column type="field" hidden="0" name="wheelchair" width="-1"/>
-      <column type="field" hidden="0" name="fid" width="-1"/>
-      <column type="field" hidden="0" name="railway" width="-1"/>
-      <column type="field" hidden="0" name="traffic_signals" width="-1"/>
-      <column type="field" hidden="0" name="bicycle" width="-1"/>
-      <column type="field" hidden="0" name="crossing_ref" width="-1"/>
-      <column type="field" hidden="0" name="traffic_calming" width="-1"/>
-      <column type="field" hidden="0" name="ele" width="-1"/>
-      <column type="field" hidden="0" name="mountain_pass" width="-1"/>
-      <column type="field" hidden="0" name="name" width="-1"/>
-      <column type="field" hidden="0" name="crossing:island" width="-1"/>
-      <column type="field" hidden="0" name="segregated" width="-1"/>
-      <column type="field" hidden="0" name="bus" width="-1"/>
-      <column type="field" hidden="0" name="public_transport" width="-1"/>
-      <column type="field" hidden="0" name="survey:date" width="-1"/>
-      <column type="field" hidden="0" name="tactile_paving" width="-1"/>
-      <column type="field" hidden="0" name="ford" width="-1"/>
-      <column type="field" hidden="0" name="alt_name" width="-1"/>
-      <column type="field" hidden="0" name="hiking" width="-1"/>
-      <column type="field" hidden="0" name="ref" width="-1"/>
-      <column type="field" hidden="0" name="traffic_sign" width="-1"/>
-      <column type="field" hidden="0" name="mtb" width="-1"/>
-      <column type="field" hidden="0" name="name:fr" width="-1"/>
-      <column type="field" hidden="0" name="addr:postcode" width="-1"/>
-      <column type="field" hidden="0" name="capital" width="-1"/>
-      <column type="field" hidden="0" name="name:ca" width="-1"/>
-      <column type="field" hidden="0" name="name:oc" width="-1"/>
-      <column type="field" hidden="0" name="place" width="-1"/>
-      <column type="field" hidden="0" name="ref:FR:SIREN" width="-1"/>
-      <column type="field" hidden="0" name="source:name:oc" width="-1"/>
-      <column type="field" hidden="0" name="wikidata" width="-1"/>
-      <column type="field" hidden="0" name="wikipedia" width="-1"/>
-      <column type="field" hidden="0" name="bollard" width="-1"/>
-      <column type="field" hidden="0" name="material" width="-1"/>
-      <column type="field" hidden="0" name="history" width="-1"/>
-      <column type="field" hidden="0" name="horse" width="-1"/>
-      <column type="field" hidden="0" name="swing_gate:type" width="-1"/>
-      <column type="field" hidden="0" name="network" width="-1"/>
-      <column type="field" hidden="0" name="bench" width="-1"/>
-      <column type="field" hidden="0" name="shelter" width="-1"/>
-      <column type="field" hidden="0" name="crossing:barrier" width="-1"/>
-      <column type="field" hidden="0" name="stile" width="-1"/>
-      <column type="field" hidden="0" name="direction" width="-1"/>
-      <column type="field" hidden="0" name="maxspeed" width="-1"/>
-      <column type="field" hidden="0" name="traffic_sign:backward" width="-1"/>
-      <column type="field" hidden="0" name="sport" width="-1"/>
-      <column type="field" hidden="0" name="passenger_information_display" width="-1"/>
-      <column type="field" hidden="0" name="hazard" width="-1"/>
-      <column type="field" hidden="0" name="description:fr" width="-1"/>
+      <column hidden="0" name="osm_id" type="field" width="-1"/>
+      <column hidden="1" type="actions" width="-1"/>
+      <column hidden="0" name="barrier" type="field" width="-1"/>
+      <column hidden="0" name="highway" type="field" width="-1"/>
+      <column hidden="0" name="fid" type="field" width="-1"/>
+      <column hidden="0" name="name" type="field" width="-1"/>
+      <column hidden="0" name="ref" type="field" width="-1"/>
+      <column hidden="0" name="place" type="field" width="-1"/>
+      <column hidden="0" name="address" type="field" width="-1"/>
+      <column hidden="0" name="is_in" type="field" width="-1"/>
+      <column hidden="0" name="man_made" type="field" width="-1"/>
+      <column hidden="0" name="other_tags" type="field" width="238"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1401,199 +688,208 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field editable="1" name="access"/>
-    <field editable="1" name="addr:housenumber"/>
-    <field editable="1" name="addr:postcode"/>
-    <field editable="1" name="addr:street"/>
-    <field editable="1" name="advertising"/>
-    <field editable="1" name="alt_name"/>
-    <field editable="1" name="amenity"/>
-    <field editable="1" name="backrest"/>
-    <field editable="1" name="barrier"/>
-    <field editable="1" name="bench"/>
-    <field editable="1" name="bicycle"/>
-    <field editable="1" name="bicycle_parking"/>
-    <field editable="1" name="board:title"/>
-    <field editable="1" name="board_type"/>
-    <field editable="1" name="bollard"/>
-    <field editable="1" name="bus"/>
-    <field editable="1" name="capacity"/>
-    <field editable="1" name="capital"/>
-    <field editable="1" name="colour"/>
-    <field editable="1" name="covered"/>
-    <field editable="1" name="crossing"/>
-    <field editable="1" name="crossing:barrier"/>
-    <field editable="1" name="crossing:island"/>
-    <field editable="1" name="crossing_ref"/>
-    <field editable="1" name="description:fr"/>
-    <field editable="1" name="diameter"/>
-    <field editable="1" name="direction"/>
-    <field editable="1" name="drinking_water"/>
-    <field editable="1" name="ele"/>
-    <field editable="1" name="entrance"/>
-    <field editable="1" name="fee"/>
-    <field editable="1" name="female"/>
-    <field editable="1" name="fid"/>
-    <field editable="1" name="foot"/>
-    <field editable="1" name="ford"/>
-    <field editable="1" name="full_id"/>
-    <field editable="1" name="genus:fr"/>
-    <field editable="1" name="genus:la"/>
-    <field editable="1" name="hazard"/>
-    <field editable="1" name="highway"/>
-    <field editable="1" name="hiking"/>
-    <field editable="1" name="history"/>
-    <field editable="1" name="horse"/>
-    <field editable="1" name="information"/>
-    <field editable="1" name="leaf_type"/>
-    <field editable="1" name="leisure"/>
-    <field editable="1" name="male"/>
-    <field editable="1" name="material"/>
-    <field editable="1" name="maxspeed"/>
-    <field editable="1" name="motor_vehicle"/>
-    <field editable="1" name="mountain_pass"/>
-    <field editable="1" name="mtb"/>
-    <field editable="1" name="name"/>
-    <field editable="1" name="name:ca"/>
-    <field editable="1" name="name:fr"/>
-    <field editable="1" name="name:oc"/>
-    <field editable="1" name="natural"/>
-    <field editable="1" name="network"/>
-    <field editable="1" name="operator"/>
-    <field editable="1" name="osm_id"/>
-    <field editable="1" name="osm_type"/>
-    <field editable="1" name="passenger_information_display"/>
-    <field editable="1" name="place"/>
-    <field editable="1" name="public_transport"/>
-    <field editable="1" name="railway"/>
-    <field editable="1" name="recycling:cans"/>
-    <field editable="1" name="recycling:cardboard"/>
-    <field editable="1" name="recycling:paper"/>
-    <field editable="1" name="recycling:plastic_bottles"/>
-    <field editable="1" name="recycling:plastic_packaging"/>
-    <field editable="1" name="recycling_type"/>
-    <field editable="1" name="ref"/>
-    <field editable="1" name="ref:FR:SIREN"/>
-    <field editable="1" name="seats"/>
-    <field editable="1" name="segregated"/>
-    <field editable="1" name="shelter"/>
-    <field editable="1" name="source:name:oc"/>
-    <field editable="1" name="species:fr"/>
-    <field editable="1" name="species:la"/>
-    <field editable="1" name="sport"/>
-    <field editable="1" name="stile"/>
-    <field editable="1" name="survey:date"/>
-    <field editable="1" name="swing_gate:type"/>
-    <field editable="1" name="tactile_paving"/>
-    <field editable="1" name="toilets:disposal"/>
-    <field editable="1" name="toilets:position"/>
-    <field editable="1" name="tourism"/>
-    <field editable="1" name="traffic_calming"/>
-    <field editable="1" name="traffic_sign"/>
-    <field editable="1" name="traffic_sign:backward"/>
-    <field editable="1" name="traffic_signals"/>
-    <field editable="1" name="waste"/>
-    <field editable="1" name="wheelchair"/>
-    <field editable="1" name="wikidata"/>
-    <field editable="1" name="wikipedia"/>
+    <field name="access" editable="1"/>
+    <field name="addr:housenumber" editable="1"/>
+    <field name="addr:postcode" editable="1"/>
+    <field name="addr:street" editable="1"/>
+    <field name="address" editable="1"/>
+    <field name="advertising" editable="1"/>
+    <field name="alt_name" editable="1"/>
+    <field name="amenity" editable="1"/>
+    <field name="backrest" editable="1"/>
+    <field name="barrier" editable="1"/>
+    <field name="bench" editable="1"/>
+    <field name="bicycle" editable="1"/>
+    <field name="bicycle_parking" editable="1"/>
+    <field name="board:title" editable="1"/>
+    <field name="board_type" editable="1"/>
+    <field name="bollard" editable="1"/>
+    <field name="bus" editable="1"/>
+    <field name="capacity" editable="1"/>
+    <field name="capital" editable="1"/>
+    <field name="colour" editable="1"/>
+    <field name="covered" editable="1"/>
+    <field name="crossing" editable="1"/>
+    <field name="crossing:barrier" editable="1"/>
+    <field name="crossing:island" editable="1"/>
+    <field name="crossing_ref" editable="1"/>
+    <field name="description:fr" editable="1"/>
+    <field name="diameter" editable="1"/>
+    <field name="direction" editable="1"/>
+    <field name="drinking_water" editable="1"/>
+    <field name="ele" editable="1"/>
+    <field name="entrance" editable="1"/>
+    <field name="fee" editable="1"/>
+    <field name="female" editable="1"/>
+    <field name="fid" editable="1"/>
+    <field name="foot" editable="1"/>
+    <field name="ford" editable="1"/>
+    <field name="full_id" editable="1"/>
+    <field name="genus:fr" editable="1"/>
+    <field name="genus:la" editable="1"/>
+    <field name="hazard" editable="1"/>
+    <field name="highway" editable="1"/>
+    <field name="hiking" editable="1"/>
+    <field name="history" editable="1"/>
+    <field name="horse" editable="1"/>
+    <field name="information" editable="1"/>
+    <field name="is_in" 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="material" editable="1"/>
+    <field name="maxspeed" editable="1"/>
+    <field name="motor_vehicle" editable="1"/>
+    <field name="mountain_pass" editable="1"/>
+    <field name="mtb" editable="1"/>
+    <field name="name" editable="1"/>
+    <field name="name:ca" editable="1"/>
+    <field name="name:fr" editable="1"/>
+    <field name="name:oc" editable="1"/>
+    <field name="natural" editable="1"/>
+    <field name="network" editable="1"/>
+    <field name="operator" editable="1"/>
+    <field name="osm_id" editable="1"/>
+    <field name="osm_type" editable="1"/>
+    <field name="other_tags" editable="1"/>
+    <field name="passenger_information_display" editable="1"/>
+    <field name="place" editable="1"/>
+    <field name="public_transport" editable="1"/>
+    <field name="railway" editable="1"/>
+    <field name="recycling:cans" editable="1"/>
+    <field name="recycling:cardboard" editable="1"/>
+    <field name="recycling:paper" editable="1"/>
+    <field name="recycling:plastic_bottles" editable="1"/>
+    <field name="recycling:plastic_packaging" editable="1"/>
+    <field name="recycling_type" editable="1"/>
+    <field name="ref" editable="1"/>
+    <field name="ref:FR:SIREN" editable="1"/>
+    <field name="seats" editable="1"/>
+    <field name="segregated" editable="1"/>
+    <field name="shelter" editable="1"/>
+    <field name="source:name:oc" editable="1"/>
+    <field name="species:fr" editable="1"/>
+    <field name="species:la" editable="1"/>
+    <field name="sport" editable="1"/>
+    <field name="stile" editable="1"/>
+    <field name="survey:date" editable="1"/>
+    <field name="swing_gate:type" editable="1"/>
+    <field name="tactile_paving" editable="1"/>
+    <field name="toilets:disposal" editable="1"/>
+    <field name="toilets:position" editable="1"/>
+    <field name="tourism" editable="1"/>
+    <field name="traffic_calming" editable="1"/>
+    <field name="traffic_sign" editable="1"/>
+    <field name="traffic_sign:backward" editable="1"/>
+    <field name="traffic_signals" editable="1"/>
+    <field name="waste" editable="1"/>
+    <field name="wheelchair" editable="1"/>
+    <field name="wikidata" editable="1"/>
+    <field name="wikipedia" editable="1"/>
   </editable>
   <labelOnTop>
-    <field labelOnTop="0" name="access"/>
-    <field labelOnTop="0" name="addr:housenumber"/>
-    <field labelOnTop="0" name="addr:postcode"/>
-    <field labelOnTop="0" name="addr:street"/>
-    <field labelOnTop="0" name="advertising"/>
-    <field labelOnTop="0" name="alt_name"/>
-    <field labelOnTop="0" name="amenity"/>
-    <field labelOnTop="0" name="backrest"/>
-    <field labelOnTop="0" name="barrier"/>
-    <field labelOnTop="0" name="bench"/>
-    <field labelOnTop="0" name="bicycle"/>
-    <field labelOnTop="0" name="bicycle_parking"/>
-    <field labelOnTop="0" name="board:title"/>
-    <field labelOnTop="0" name="board_type"/>
-    <field labelOnTop="0" name="bollard"/>
-    <field labelOnTop="0" name="bus"/>
-    <field labelOnTop="0" name="capacity"/>
-    <field labelOnTop="0" name="capital"/>
-    <field labelOnTop="0" name="colour"/>
-    <field labelOnTop="0" name="covered"/>
-    <field labelOnTop="0" name="crossing"/>
-    <field labelOnTop="0" name="crossing:barrier"/>
-    <field labelOnTop="0" name="crossing:island"/>
-    <field labelOnTop="0" name="crossing_ref"/>
-    <field labelOnTop="0" name="description:fr"/>
-    <field labelOnTop="0" name="diameter"/>
-    <field labelOnTop="0" name="direction"/>
-    <field labelOnTop="0" name="drinking_water"/>
-    <field labelOnTop="0" name="ele"/>
-    <field labelOnTop="0" name="entrance"/>
-    <field labelOnTop="0" name="fee"/>
-    <field labelOnTop="0" name="female"/>
-    <field labelOnTop="0" name="fid"/>
-    <field labelOnTop="0" name="foot"/>
-    <field labelOnTop="0" name="ford"/>
-    <field labelOnTop="0" name="full_id"/>
-    <field labelOnTop="0" name="genus:fr"/>
-    <field labelOnTop="0" name="genus:la"/>
-    <field labelOnTop="0" name="hazard"/>
-    <field labelOnTop="0" name="highway"/>
-    <field labelOnTop="0" name="hiking"/>
-    <field labelOnTop="0" name="history"/>
-    <field labelOnTop="0" name="horse"/>
-    <field labelOnTop="0" name="information"/>
-    <field labelOnTop="0" name="leaf_type"/>
-    <field labelOnTop="0" name="leisure"/>
-    <field labelOnTop="0" name="male"/>
-    <field labelOnTop="0" name="material"/>
-    <field labelOnTop="0" name="maxspeed"/>
-    <field labelOnTop="0" name="motor_vehicle"/>
-    <field labelOnTop="0" name="mountain_pass"/>
-    <field labelOnTop="0" name="mtb"/>
-    <field labelOnTop="0" name="name"/>
-    <field labelOnTop="0" name="name:ca"/>
-    <field labelOnTop="0" name="name:fr"/>
-    <field labelOnTop="0" name="name:oc"/>
-    <field labelOnTop="0" name="natural"/>
-    <field labelOnTop="0" name="network"/>
-    <field labelOnTop="0" name="operator"/>
-    <field labelOnTop="0" name="osm_id"/>
-    <field labelOnTop="0" name="osm_type"/>
-    <field labelOnTop="0" name="passenger_information_display"/>
-    <field labelOnTop="0" name="place"/>
-    <field labelOnTop="0" name="public_transport"/>
-    <field labelOnTop="0" name="railway"/>
-    <field labelOnTop="0" name="recycling:cans"/>
-    <field labelOnTop="0" name="recycling:cardboard"/>
-    <field labelOnTop="0" name="recycling:paper"/>
-    <field labelOnTop="0" name="recycling:plastic_bottles"/>
-    <field labelOnTop="0" name="recycling:plastic_packaging"/>
-    <field labelOnTop="0" name="recycling_type"/>
-    <field labelOnTop="0" name="ref"/>
-    <field labelOnTop="0" name="ref:FR:SIREN"/>
-    <field labelOnTop="0" name="seats"/>
-    <field labelOnTop="0" name="segregated"/>
-    <field labelOnTop="0" name="shelter"/>
-    <field labelOnTop="0" name="source:name:oc"/>
-    <field labelOnTop="0" name="species:fr"/>
-    <field labelOnTop="0" name="species:la"/>
-    <field labelOnTop="0" name="sport"/>
-    <field labelOnTop="0" name="stile"/>
-    <field labelOnTop="0" name="survey:date"/>
-    <field labelOnTop="0" name="swing_gate:type"/>
-    <field labelOnTop="0" name="tactile_paving"/>
-    <field labelOnTop="0" name="toilets:disposal"/>
-    <field labelOnTop="0" name="toilets:position"/>
-    <field labelOnTop="0" name="tourism"/>
-    <field labelOnTop="0" name="traffic_calming"/>
-    <field labelOnTop="0" name="traffic_sign"/>
-    <field labelOnTop="0" name="traffic_sign:backward"/>
-    <field labelOnTop="0" name="traffic_signals"/>
-    <field labelOnTop="0" name="waste"/>
-    <field labelOnTop="0" name="wheelchair"/>
-    <field labelOnTop="0" name="wikidata"/>
-    <field labelOnTop="0" name="wikipedia"/>
+    <field name="access" labelOnTop="0"/>
+    <field name="addr:housenumber" labelOnTop="0"/>
+    <field name="addr:postcode" labelOnTop="0"/>
+    <field name="addr:street" labelOnTop="0"/>
+    <field name="address" labelOnTop="0"/>
+    <field name="advertising" labelOnTop="0"/>
+    <field name="alt_name" labelOnTop="0"/>
+    <field name="amenity" labelOnTop="0"/>
+    <field name="backrest" labelOnTop="0"/>
+    <field name="barrier" labelOnTop="0"/>
+    <field name="bench" labelOnTop="0"/>
+    <field name="bicycle" labelOnTop="0"/>
+    <field name="bicycle_parking" labelOnTop="0"/>
+    <field name="board:title" labelOnTop="0"/>
+    <field name="board_type" labelOnTop="0"/>
+    <field name="bollard" labelOnTop="0"/>
+    <field name="bus" labelOnTop="0"/>
+    <field name="capacity" labelOnTop="0"/>
+    <field name="capital" labelOnTop="0"/>
+    <field name="colour" labelOnTop="0"/>
+    <field name="covered" labelOnTop="0"/>
+    <field name="crossing" labelOnTop="0"/>
+    <field name="crossing:barrier" labelOnTop="0"/>
+    <field name="crossing:island" labelOnTop="0"/>
+    <field name="crossing_ref" labelOnTop="0"/>
+    <field name="description:fr" labelOnTop="0"/>
+    <field name="diameter" labelOnTop="0"/>
+    <field name="direction" labelOnTop="0"/>
+    <field name="drinking_water" labelOnTop="0"/>
+    <field name="ele" labelOnTop="0"/>
+    <field name="entrance" labelOnTop="0"/>
+    <field name="fee" labelOnTop="0"/>
+    <field name="female" labelOnTop="0"/>
+    <field name="fid" labelOnTop="0"/>
+    <field name="foot" labelOnTop="0"/>
+    <field name="ford" labelOnTop="0"/>
+    <field name="full_id" labelOnTop="0"/>
+    <field name="genus:fr" labelOnTop="0"/>
+    <field name="genus:la" labelOnTop="0"/>
+    <field name="hazard" labelOnTop="0"/>
+    <field name="highway" labelOnTop="0"/>
+    <field name="hiking" labelOnTop="0"/>
+    <field name="history" labelOnTop="0"/>
+    <field name="horse" labelOnTop="0"/>
+    <field name="information" labelOnTop="0"/>
+    <field name="is_in" labelOnTop="0"/>
+    <field name="leaf_type" labelOnTop="0"/>
+    <field name="leisure" labelOnTop="0"/>
+    <field name="male" labelOnTop="0"/>
+    <field name="man_made" labelOnTop="0"/>
+    <field name="material" labelOnTop="0"/>
+    <field name="maxspeed" labelOnTop="0"/>
+    <field name="motor_vehicle" labelOnTop="0"/>
+    <field name="mountain_pass" labelOnTop="0"/>
+    <field name="mtb" labelOnTop="0"/>
+    <field name="name" labelOnTop="0"/>
+    <field name="name:ca" labelOnTop="0"/>
+    <field name="name:fr" labelOnTop="0"/>
+    <field name="name:oc" labelOnTop="0"/>
+    <field name="natural" labelOnTop="0"/>
+    <field name="network" labelOnTop="0"/>
+    <field name="operator" labelOnTop="0"/>
+    <field name="osm_id" labelOnTop="0"/>
+    <field name="osm_type" labelOnTop="0"/>
+    <field name="other_tags" labelOnTop="0"/>
+    <field name="passenger_information_display" labelOnTop="0"/>
+    <field name="place" labelOnTop="0"/>
+    <field name="public_transport" labelOnTop="0"/>
+    <field name="railway" labelOnTop="0"/>
+    <field name="recycling:cans" labelOnTop="0"/>
+    <field name="recycling:cardboard" labelOnTop="0"/>
+    <field name="recycling:paper" labelOnTop="0"/>
+    <field name="recycling:plastic_bottles" labelOnTop="0"/>
+    <field name="recycling:plastic_packaging" labelOnTop="0"/>
+    <field name="recycling_type" labelOnTop="0"/>
+    <field name="ref" labelOnTop="0"/>
+    <field name="ref:FR:SIREN" labelOnTop="0"/>
+    <field name="seats" labelOnTop="0"/>
+    <field name="segregated" labelOnTop="0"/>
+    <field name="shelter" labelOnTop="0"/>
+    <field name="source:name:oc" labelOnTop="0"/>
+    <field name="species:fr" labelOnTop="0"/>
+    <field name="species:la" labelOnTop="0"/>
+    <field name="sport" labelOnTop="0"/>
+    <field name="stile" labelOnTop="0"/>
+    <field name="survey:date" labelOnTop="0"/>
+    <field name="swing_gate:type" labelOnTop="0"/>
+    <field name="tactile_paving" labelOnTop="0"/>
+    <field name="toilets:disposal" labelOnTop="0"/>
+    <field name="toilets:position" labelOnTop="0"/>
+    <field name="tourism" labelOnTop="0"/>
+    <field name="traffic_calming" labelOnTop="0"/>
+    <field name="traffic_sign" labelOnTop="0"/>
+    <field name="traffic_sign:backward" labelOnTop="0"/>
+    <field name="traffic_signals" labelOnTop="0"/>
+    <field name="waste" labelOnTop="0"/>
+    <field name="wheelchair" labelOnTop="0"/>
+    <field name="wikidata" labelOnTop="0"/>
+    <field name="wikipedia" labelOnTop="0"/>
   </labelOnTop>
+  <dataDefinedFieldProperties/>
   <widgets/>
   <previewExpression>description:fr</previewExpression>
   <mapTip></mapTip>