diff --git a/style_caliec/styles/linestring.qml b/style_caliec/styles/linestring.qml
index 600fc0d..8818270 100644
--- a/style_caliec/styles/linestring.qml
+++ b/style_caliec/styles/linestring.qml
@@ -1,42 +1,42 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis simplifyMaxScale="1" version="3.10.4-A Coruña" maxScale="0" simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" labelsEnabled="1" styleCategories="AllStyleCategories" simplifyDrawingTol="1" simplifyLocal="1">
+<qgis hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" simplifyLocal="1" simplifyAlgorithm="0" styleCategories="AllStyleCategories" maxScale="0" labelsEnabled="1" version="3.10.4-A Coruña" simplifyDrawingTol="1" minScale="1e+08">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
+  <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
     <rules key="{129f6cf8-aa75-48cf-b691-24d3444e2b54}">
-      <rule label="clôture" symbol="0" filter="&quot;barrier&quot;='fence'" key="{1a510d65-0068-471e-9308-7459cd087491}"/>
-      <rule label="mur" symbol="1" filter="&quot;barrier&quot;='wall' or &quot;barrier&quot;='retaining_wall'" key="{a6e99132-537a-4948-86b5-8a65f769f21c}"/>
-      <rule label="haie" symbol="2" filter="&quot;barrier&quot;='hedge'" key="{5fd61f11-9766-4c13-8461-46cbfde5e90f}"/>
-      <rule label="digue" symbol="3" filter="&quot;man_made&quot;='dyke'" key="{9350847a-7763-4cd4-a9d0-4b1336c3aa67}"/>
-      <rule label="rivière" symbol="4" filter="&quot;waterway&quot;='river' or &quot;waterway&quot;='stream'" key="{3067fb57-79a9-4ed2-880a-2d91943ce66a}"/>
-      <rule label="escalier" symbol="5" filter="&quot;highway&quot;='steps'" key="{6eb81f3c-bc99-41b9-b35a-afdee5606037}"/>
-      <rule label="rue, route" symbol="6" 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' or&quot;highway&quot;='unclassified'" key="{2577b237-e0ad-418e-91e5-b30104eccaba}"/>
-      <rule label="sentier, chemin piéton" symbol="7" filter="&quot;highway&quot;='path' or &quot;highway&quot;='footway'" key="{9f9b2742-9499-437e-bee3-ec35588d9c75}"/>
-      <rule label="piste" symbol="8" filter="&quot;highway&quot;='track'" key="{32ab4ffd-6eb5-4497-81c0-c07bf261fca9}"/>
-      <rule label="canal" symbol="9" filter="&quot;waterway&quot;='canal'" key="{0819eb16-d95f-4f3f-9dd2-a5a7f989d83d}"/>
+      <rule label="clôture" key="{1a510d65-0068-471e-9308-7459cd087491}" symbol="0" filter="&quot;barrier&quot;='fence'"/>
+      <rule label="mur" key="{a6e99132-537a-4948-86b5-8a65f769f21c}" symbol="1" filter="&quot;barrier&quot;='wall' or &quot;barrier&quot;='retaining_wall' or &quot;barrier&quot;='city_wall'"/>
+      <rule label="haie" key="{5fd61f11-9766-4c13-8461-46cbfde5e90f}" symbol="2" filter="&quot;barrier&quot;='hedge'"/>
+      <rule label="digue" key="{9350847a-7763-4cd4-a9d0-4b1336c3aa67}" symbol="3" filter="&quot;man_made&quot;='dyke'"/>
+      <rule label="rivière" key="{3067fb57-79a9-4ed2-880a-2d91943ce66a}" symbol="4" filter="&quot;waterway&quot;='river' or &quot;waterway&quot;='stream'"/>
+      <rule label="escalier" key="{6eb81f3c-bc99-41b9-b35a-afdee5606037}" symbol="5" filter="&quot;highway&quot;='steps'"/>
+      <rule label="rue, route" key="{2577b237-e0ad-418e-91e5-b30104eccaba}" symbol="6" 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' or&quot;highway&quot;='unclassified'"/>
+      <rule label="sentier, chemin piéton" key="{9f9b2742-9499-437e-bee3-ec35588d9c75}" symbol="7" filter="&quot;highway&quot;='path' or &quot;highway&quot;='footway'"/>
+      <rule label="piste" key="{32ab4ffd-6eb5-4497-81c0-c07bf261fca9}" symbol="8" filter="&quot;highway&quot;='track'"/>
+      <rule label="canal" key="{0819eb16-d95f-4f3f-9dd2-a5a7f989d83d}" symbol="9" filter="&quot;waterway&quot;='canal'"/>
     </rules>
     <symbols>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="0" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="1">
-          <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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="0">
+        <layer class="SimpleLine" pass="0" locked="1" enabled="1">
+          <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="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="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" name="name" value=""/>
@@ -45,22 +45,22 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="MarkerLine" pass="0" enabled="1" locked="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="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="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="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" name="name" value=""/>
@@ -68,26 +68,26 @@
               <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@0@1" force_rhr="0">
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="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="1" 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 type="marker" alpha="1" force_rhr="0" clip_to_extent="1" name="@0@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="1"/>
+              <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=""/>
@@ -99,24 +99,24 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="1" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="164,164,164,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="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="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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="1">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <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="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="164,164,164,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="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="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -125,23 +125,23 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="0.66;2.5" 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="round" k="joinstyle"/>
-          <prop v="224,224,224,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="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="MapUnit" 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"/>
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="0.66;2.5"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="224,224,224,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="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="MapUnit"/>
+          <prop k="ring_filter" 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" name="name" value=""/>
@@ -151,98 +151,98 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="2" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="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="2" 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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="2">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <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="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="2"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <effect type="effectStack" enabled="0">
             <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>
@@ -254,24 +254,24 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="3" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="3">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.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="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" name="name" value=""/>
@@ -281,24 +281,24 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="4" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="4">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="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="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" name="name" value=""/>
@@ -308,23 +308,23 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="5" force_rhr="0">
-        <layer class="MarkerLine" pass="0" enabled="1" locked="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="2" 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="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="interval" k="placement"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="1" k="rotate"/>
+      <symbol type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="5">
+        <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="2"/>
+          <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="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="interval"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="rotate" v="1"/>
           <data_defined_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -332,26 +332,26 @@
               <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@5@0" force_rhr="0">
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="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="MapUnit" k="offset_unit"/>
-              <prop v="124,124,124,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.6" 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="area" k="scale_method"/>
-              <prop v="1" 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 type="marker" alpha="1" force_rhr="0" clip_to_extent="1" name="@5@0">
+            <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="MapUnit"/>
+              <prop k="outline_color" v="124,124,124,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.6"/>
+              <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="area"/>
+              <prop k="size" v="1"/>
+              <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=""/>
@@ -363,24 +363,24 @@
           </symbol>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="6" force_rhr="0">
-        <layer class="SimpleLine" pass="5" enabled="1" locked="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="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="35,35,35,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="5" 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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="6">
+        <layer class="SimpleLine" pass="5" locked="0" enabled="1">
+          <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="MapUnit"/>
+          <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="5"/>
+          <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="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" name="name" value=""/>
@@ -389,23 +389,23 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="SimpleLine" pass="6" enabled="1" locked="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="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="255,255,255,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="4.16667" 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"/>
+        <layer class="SimpleLine" pass="6" locked="0" enabled="1">
+          <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="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="255,255,255,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="4.16667"/>
+          <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="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" name="name" value=""/>
@@ -415,24 +415,24 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="7" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="7">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <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="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="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" name="name" value=""/>
@@ -442,94 +442,94 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="8" force_rhr="0">
-        <layer class="SimpleLine" pass="4" enabled="1" locked="1">
-          <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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="8">
+        <layer class="SimpleLine" pass="4" locked="1" enabled="1">
+          <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="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="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>
@@ -540,23 +540,23 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="SimpleLine" pass="4" enabled="1" locked="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="4" locked="0" enabled="1">
+          <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="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="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" name="name" value=""/>
@@ -566,24 +566,24 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="line" clip_to_extent="1" alpha="1" name="9" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <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 type="line" alpha="1" force_rhr="0" clip_to_extent="1" name="9">
+        <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+          <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="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="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" name="name" value=""/>
@@ -596,32 +596,32 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{d20e95bf-b246-4092-b3d5-19618102fa1f}">
-      <rule filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'" key="{64f8b166-584c-4656-a0ac-03491239a77f}">
+    <rules key="{4e695a07-949c-4ccd-a71d-ee5889ef821e}">
+      <rule key="{e999f67c-e939-46e2-8d57-f443d4b31999}" filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontFamily="Liberation Sans" fieldName="name" namedStyle="Regular" fontSize="10" textColor="0,0,0,255" isExpression="0" blendMode="0" useSubstitutions="0" fontUnderline="0" fontSizeUnit="Point" multilineHeight="1" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontStrikeout="0" fontKerning="1" textOpacity="1" fontItalic="0" fontWeight="50">
-            <text-buffer bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferDraw="1"/>
-            <background shapeOffsetY="0" shapeRotationType="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiY="0" shapeOpacity="1" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeBorderWidth="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBlendMode="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM">
-              <symbol type="marker" clip_to_extent="1" alpha="1" name="markerSymbol" force_rhr="0">
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="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 textOpacity="1" fontWeight="50" fontSize="10" fontItalic="0" multilineHeight="1" fontKerning="1" previewBkgrdColor="255,255,255,255" isExpression="0" fontWordSpacing="0" fontSizeUnit="Point" fontCapitals="0" fieldName="name" useSubstitutions="0" fontFamily="Liberation Sans" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" textColor="0,0,0,255" blendMode="0">
+            <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1"/>
+            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeType="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeSizeX="0" shapeDraw="0" shapeRotation="0" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeOffsetY="0" shapeSizeY="0" shapeFillColor="255,255,255,255">
+              <symbol type="marker" alpha="1" force_rhr="0" clip_to_extent="1" name="markerSymbol">
+                <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" name="name" value=""/>
@@ -632,7 +632,7 @@
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetAngle="135" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowBlendMode="6"/>
+            <shadow shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
                 <Option type="QString" name="name" value=""/>
@@ -642,9 +642,9 @@
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" placeDirectionSymbol="0" decimals="3" formatNumbers="0"/>
-          <placement centroidWhole="0" repeatDistance="0" geometryGeneratorEnabled="0" placementFlags="9" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" overrunDistance="0" centroidInside="0" offsetType="0" repeatDistanceUnits="MM" placement="3" rotationAngle="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" maxCurvedCharAngleIn="25" layerType="LineGeometry" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceUnit="MM" priority="5" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGenerator=""/>
-          <rendering minFeatureSize="0" limitNumLabels="0" drawLabels="1" scaleVisibility="0" mergeLines="0" fontLimitPixelSize="0" obstacleType="0" maxNumLabels="2000" scaleMax="0" fontMinPixelSize="3" obstacle="1" labelPerPart="0" scaleMin="0" obstacleFactor="1" zIndex="0" upsidedownLabels="0" fontMaxPixelSize="10000" displayAll="0"/>
+          <text-format formatNumbers="0" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" layerType="LineGeometry" placementFlags="9" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" offsetType="0" geometryGeneratorEnabled="0" offsetUnits="MM" distUnits="MM" rotationAngle="0" maxCurvedCharAngleIn="25" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" repeatDistance="0" maxCurvedCharAngleOut="-25" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" centroidWhole="0" dist="0" repeatDistanceUnits="MM" centroidInside="0" quadOffset="4" xOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" placement="3" yOffset="0" overrunDistanceUnit="MM" geometryGeneratorType="PointGeometry"/>
+          <rendering scaleVisibility="0" obstacleFactor="1" scaleMin="0" displayAll="0" zIndex="0" maxNumLabels="2000" labelPerPart="0" obstacleType="0" scaleMax="0" fontLimitPixelSize="0" drawLabels="1" obstacle="1" fontMaxPixelSize="10000" limitNumLabels="0" upsidedownLabels="0" fontMinPixelSize="3" mergeLines="0" minFeatureSize="0"/>
           <dd_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -662,7 +662,7 @@
               </Option>
               <Option type="bool" name="drawToAllParts" value="false"/>
               <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="lineSymbol" 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 class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
               <Option type="double" name="minLength" value="0"/>
               <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
               <Option type="QString" name="minLengthUnit" value="MM"/>
@@ -676,31 +676,31 @@
           </callout>
         </settings>
       </rule>
-      <rule filter="&quot;highway&quot; is not null and &quot;name&quot; is not null" key="{f1549d78-e0ae-489b-9186-3d01b3bfab8a}">
+      <rule key="{9f64c6e8-ea8b-44aa-ba32-ad62139fef79}" filter="&quot;highway&quot; is not null and &quot;name&quot; is not null">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontFamily="Liberation Sans" fieldName="name" namedStyle="Regular" fontSize="10" textColor="0,0,0,255" isExpression="0" blendMode="0" useSubstitutions="0" fontUnderline="0" fontSizeUnit="Point" multilineHeight="1" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontStrikeout="0" fontKerning="1" textOpacity="1" fontItalic="0" fontWeight="50">
-            <text-buffer bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferDraw="1"/>
-            <background shapeOffsetY="0" shapeRotationType="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiY="0" shapeOpacity="1" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeBorderWidth="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBlendMode="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM">
-              <symbol type="marker" clip_to_extent="1" alpha="1" name="markerSymbol" force_rhr="0">
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="114,155,111,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 textOpacity="1" fontWeight="50" fontSize="10" fontItalic="0" multilineHeight="1" fontKerning="1" previewBkgrdColor="255,255,255,255" isExpression="0" fontWordSpacing="0" fontSizeUnit="Point" fontCapitals="0" fieldName="name" useSubstitutions="0" fontFamily="Liberation Sans" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" textColor="0,0,0,255" blendMode="0">
+            <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1"/>
+            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeRadiiY="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeType="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeSizeX="0" shapeDraw="0" shapeRotation="0" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeOffsetY="0" shapeSizeY="0" shapeFillColor="255,255,255,255">
+              <symbol type="marker" alpha="1" force_rhr="0" clip_to_extent="1" name="markerSymbol">
+                <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="114,155,111,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" name="name" value=""/>
@@ -711,7 +711,7 @@
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetAngle="135" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowBlendMode="6"/>
+            <shadow shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
                 <Option type="QString" name="name" value=""/>
@@ -721,9 +721,9 @@
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" placeDirectionSymbol="0" decimals="3" formatNumbers="0"/>
-          <placement centroidWhole="0" repeatDistance="0" geometryGeneratorEnabled="0" placementFlags="9" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" overrunDistance="0" centroidInside="0" offsetType="0" repeatDistanceUnits="MM" placement="3" rotationAngle="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" maxCurvedCharAngleIn="25" layerType="LineGeometry" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceUnit="MM" priority="5" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGenerator=""/>
-          <rendering minFeatureSize="0" limitNumLabels="0" drawLabels="1" scaleVisibility="0" mergeLines="0" fontLimitPixelSize="0" obstacleType="0" maxNumLabels="2000" scaleMax="0" fontMinPixelSize="3" obstacle="1" labelPerPart="0" scaleMin="0" obstacleFactor="1" zIndex="0" upsidedownLabels="0" fontMaxPixelSize="10000" displayAll="0"/>
+          <text-format formatNumbers="0" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" layerType="LineGeometry" placementFlags="9" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" offsetType="0" geometryGeneratorEnabled="0" offsetUnits="MM" distUnits="MM" rotationAngle="0" maxCurvedCharAngleIn="25" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" repeatDistance="0" maxCurvedCharAngleOut="-25" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" centroidWhole="0" dist="0" repeatDistanceUnits="MM" centroidInside="0" quadOffset="4" xOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" placement="3" yOffset="0" overrunDistanceUnit="MM" geometryGeneratorType="PointGeometry"/>
+          <rendering scaleVisibility="0" obstacleFactor="1" scaleMin="0" displayAll="0" zIndex="0" maxNumLabels="2000" labelPerPart="0" obstacleType="0" scaleMax="0" fontLimitPixelSize="0" drawLabels="1" obstacle="1" fontMaxPixelSize="10000" limitNumLabels="0" upsidedownLabels="0" fontMinPixelSize="3" mergeLines="0" minFeatureSize="0"/>
           <dd_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -741,7 +741,7 @@
               </Option>
               <Option type="bool" name="drawToAllParts" value="false"/>
               <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="lineSymbol" 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 class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
               <Option type="double" name="minLength" value="0"/>
               <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
               <Option type="QString" name="minLengthUnit" value="MM"/>
@@ -766,13 +766,13 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory rotationOffset="270" penWidth="0" width="15" minimumSize="0" backgroundColor="#ffffff" height="15" sizeType="MM" penColor="#000000" opacity="1" labelPlacementMethod="XHeight" backgroundAlpha="255" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" penAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" maxScaleDenominator="1e+08" diagramOrientation="Up">
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory minScaleDenominator="0" scaleDependency="Area" height="15" rotationOffset="270" enabled="0" penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0" labelPlacementMethod="XHeight" width="15" minimumSize="0" backgroundAlpha="255" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" opacity="1" barWidth="5" sizeType="MM" diagramOrientation="Up">
       <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-      <attribute label="" field="" color="#000000"/>
+      <attribute label="" color="#000000" field=""/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" zIndex="0" placement="2" obstacle="0" dist="0">
+  <DiagramLayerSettings zIndex="0" dist="0" priority="0" obstacle="0" showAll="1" linePlacementFlags="18" placement="2">
     <properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -856,6 +856,27 @@
         </config>
       </editWidget>
     </field>
+    <field name="wheelchair">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="tunnel">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="layer">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
     <field name="width">
       <editWidget type="TextEdit">
         <config>
@@ -1012,202 +1033,217 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <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"/>
-    <alias name="" field="width" index="10"/>
-    <alias name="" field="step_count" index="11"/>
-    <alias name="" field="incline" index="12"/>
-    <alias name="" field="handrail" index="13"/>
-    <alias name="" field="access" index="14"/>
-    <alias name="" field="material" index="15"/>
-    <alias name="" field="height" index="16"/>
-    <alias name="" field="fence_type" index="17"/>
-    <alias name="" field="natural" index="18"/>
-    <alias name="" field="service" index="19"/>
-    <alias name="" field="footway" index="20"/>
-    <alias name="" field="cycleway:both" index="21"/>
-    <alias name="" field="name:etymology:wikidata" index="22"/>
-    <alias name="" field="surface" index="23"/>
-    <alias name="" field="sidewalk" index="24"/>
-    <alias name="" field="oneway" index="25"/>
-    <alias name="" field="maxspeed:type" index="26"/>
-    <alias name="" field="maxspeed" index="27"/>
-    <alias name="" field="lit" index="28"/>
-    <alias name="" field="cycleway:right:segregated" index="29"/>
-    <alias name="" field="cycleway:right" index="30"/>
-    <alias name="" field="cycleway:left" index="31"/>
+    <alias index="0" name="" field="fid"/>
+    <alias index="1" name="" field="osm_id"/>
+    <alias index="2" name="" field="name"/>
+    <alias index="3" name="" field="highway"/>
+    <alias index="4" name="" field="waterway"/>
+    <alias index="5" name="" field="aerialway"/>
+    <alias index="6" name="" field="barrier"/>
+    <alias index="7" name="" field="man_made"/>
+    <alias index="8" name="" field="z_order"/>
+    <alias index="9" name="" field="other_tags"/>
+    <alias index="10" name="" field="wheelchair"/>
+    <alias index="11" name="" field="tunnel"/>
+    <alias index="12" name="" field="layer"/>
+    <alias index="13" name="" field="width"/>
+    <alias index="14" name="" field="step_count"/>
+    <alias index="15" name="" field="incline"/>
+    <alias index="16" name="" field="handrail"/>
+    <alias index="17" name="" field="access"/>
+    <alias index="18" name="" field="material"/>
+    <alias index="19" name="" field="height"/>
+    <alias index="20" name="" field="fence_type"/>
+    <alias index="21" name="" field="natural"/>
+    <alias index="22" name="" field="service"/>
+    <alias index="23" name="" field="footway"/>
+    <alias index="24" name="" field="cycleway:both"/>
+    <alias index="25" name="" field="name:etymology:wikidata"/>
+    <alias index="26" name="" field="surface"/>
+    <alias index="27" name="" field="sidewalk"/>
+    <alias index="28" name="" field="oneway"/>
+    <alias index="29" name="" field="maxspeed:type"/>
+    <alias index="30" name="" field="maxspeed"/>
+    <alias index="31" name="" field="lit"/>
+    <alias index="32" name="" field="cycleway:right:segregated"/>
+    <alias index="33" name="" field="cycleway:right"/>
+    <alias index="34" name="" field="cycleway:left"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
   <defaults>
-    <default expression="" field="fid" applyOnUpdate="0"/>
-    <default expression="" field="osm_id" applyOnUpdate="0"/>
-    <default expression="" field="name" applyOnUpdate="0"/>
-    <default expression="" field="highway" applyOnUpdate="0"/>
-    <default expression="" field="waterway" applyOnUpdate="0"/>
-    <default expression="" field="aerialway" applyOnUpdate="0"/>
-    <default expression="" field="barrier" applyOnUpdate="0"/>
-    <default expression="" field="man_made" applyOnUpdate="0"/>
-    <default expression="" field="z_order" applyOnUpdate="0"/>
-    <default expression="" field="other_tags" applyOnUpdate="0"/>
-    <default expression="" field="width" applyOnUpdate="0"/>
-    <default expression="" field="step_count" applyOnUpdate="0"/>
-    <default expression="" field="incline" applyOnUpdate="0"/>
-    <default expression="" field="handrail" applyOnUpdate="0"/>
-    <default expression="" field="access" applyOnUpdate="0"/>
-    <default expression="" field="material" applyOnUpdate="0"/>
-    <default expression="" field="height" applyOnUpdate="0"/>
-    <default expression="" field="fence_type" applyOnUpdate="0"/>
-    <default expression="" field="natural" applyOnUpdate="0"/>
-    <default expression="" field="service" applyOnUpdate="0"/>
-    <default expression="" field="footway" applyOnUpdate="0"/>
-    <default expression="" field="cycleway:both" applyOnUpdate="0"/>
-    <default expression="" field="name:etymology:wikidata" applyOnUpdate="0"/>
-    <default expression="" field="surface" applyOnUpdate="0"/>
-    <default expression="" field="sidewalk" applyOnUpdate="0"/>
-    <default expression="" field="oneway" applyOnUpdate="0"/>
-    <default expression="" field="maxspeed:type" applyOnUpdate="0"/>
-    <default expression="" field="maxspeed" applyOnUpdate="0"/>
-    <default expression="" field="lit" applyOnUpdate="0"/>
-    <default expression="" field="cycleway:right:segregated" applyOnUpdate="0"/>
-    <default expression="" field="cycleway:right" applyOnUpdate="0"/>
-    <default expression="" field="cycleway:left" 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"/>
+    <default applyOnUpdate="0" expression="" field="wheelchair"/>
+    <default applyOnUpdate="0" expression="" field="tunnel"/>
+    <default applyOnUpdate="0" expression="" field="layer"/>
+    <default applyOnUpdate="0" expression="" field="width"/>
+    <default applyOnUpdate="0" expression="" field="step_count"/>
+    <default applyOnUpdate="0" expression="" field="incline"/>
+    <default applyOnUpdate="0" expression="" field="handrail"/>
+    <default applyOnUpdate="0" expression="" field="access"/>
+    <default applyOnUpdate="0" expression="" field="material"/>
+    <default applyOnUpdate="0" expression="" field="height"/>
+    <default applyOnUpdate="0" expression="" field="fence_type"/>
+    <default applyOnUpdate="0" expression="" field="natural"/>
+    <default applyOnUpdate="0" expression="" field="service"/>
+    <default applyOnUpdate="0" expression="" field="footway"/>
+    <default applyOnUpdate="0" expression="" field="cycleway:both"/>
+    <default applyOnUpdate="0" expression="" field="name:etymology:wikidata"/>
+    <default applyOnUpdate="0" expression="" field="surface"/>
+    <default applyOnUpdate="0" expression="" field="sidewalk"/>
+    <default applyOnUpdate="0" expression="" field="oneway"/>
+    <default applyOnUpdate="0" expression="" field="maxspeed:type"/>
+    <default applyOnUpdate="0" expression="" field="maxspeed"/>
+    <default applyOnUpdate="0" expression="" field="lit"/>
+    <default applyOnUpdate="0" expression="" field="cycleway:right:segregated"/>
+    <default applyOnUpdate="0" expression="" field="cycleway:right"/>
+    <default applyOnUpdate="0" expression="" field="cycleway:left"/>
   </defaults>
   <constraints>
-    <constraint unique_strength="1" exp_strength="0" field="fid" constraints="3" notnull_strength="1"/>
-    <constraint unique_strength="0" exp_strength="0" field="osm_id" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="name" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="highway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="waterway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="aerialway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="barrier" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="man_made" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="z_order" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="other_tags" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="width" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="step_count" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="incline" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="handrail" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="access" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="material" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="height" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="fence_type" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="natural" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="service" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="footway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway:both" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="name:etymology:wikidata" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="surface" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="sidewalk" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="oneway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="maxspeed:type" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="maxspeed" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="lit" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway:right:segregated" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway:right" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway:left" constraints="0" notnull_strength="0"/>
+    <constraint exp_strength="0" unique_strength="1" field="fid" notnull_strength="1" constraints="3"/>
+    <constraint exp_strength="0" unique_strength="0" field="osm_id" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="name" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="highway" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="waterway" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="aerialway" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="barrier" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="man_made" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="z_order" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="other_tags" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="wheelchair" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="tunnel" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="layer" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="width" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="step_count" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="incline" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="handrail" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="access" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="material" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="height" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="fence_type" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="natural" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="service" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="footway" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="cycleway:both" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="name:etymology:wikidata" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="surface" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="sidewalk" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="oneway" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="maxspeed:type" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="maxspeed" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="lit" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="cycleway:right:segregated" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="cycleway:right" notnull_strength="0" constraints="0"/>
+    <constraint exp_strength="0" unique_strength="0" field="cycleway:left" notnull_strength="0" constraints="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint desc="" exp="" field="fid"/>
-    <constraint desc="" exp="" field="osm_id"/>
-    <constraint desc="" exp="" field="name"/>
-    <constraint desc="" exp="" field="highway"/>
-    <constraint desc="" exp="" field="waterway"/>
-    <constraint desc="" exp="" field="aerialway"/>
-    <constraint desc="" exp="" field="barrier"/>
-    <constraint desc="" exp="" field="man_made"/>
-    <constraint desc="" exp="" field="z_order"/>
-    <constraint desc="" exp="" field="other_tags"/>
-    <constraint desc="" exp="" field="width"/>
-    <constraint desc="" exp="" field="step_count"/>
-    <constraint desc="" exp="" field="incline"/>
-    <constraint desc="" exp="" field="handrail"/>
-    <constraint desc="" exp="" field="access"/>
-    <constraint desc="" exp="" field="material"/>
-    <constraint desc="" exp="" field="height"/>
-    <constraint desc="" exp="" field="fence_type"/>
-    <constraint desc="" exp="" field="natural"/>
-    <constraint desc="" exp="" field="service"/>
-    <constraint desc="" exp="" field="footway"/>
-    <constraint desc="" exp="" field="cycleway:both"/>
-    <constraint desc="" exp="" field="name:etymology:wikidata"/>
-    <constraint desc="" exp="" field="surface"/>
-    <constraint desc="" exp="" field="sidewalk"/>
-    <constraint desc="" exp="" field="oneway"/>
-    <constraint desc="" exp="" field="maxspeed:type"/>
-    <constraint desc="" exp="" field="maxspeed"/>
-    <constraint desc="" exp="" field="lit"/>
-    <constraint desc="" exp="" field="cycleway:right:segregated"/>
-    <constraint desc="" exp="" field="cycleway:right"/>
-    <constraint desc="" exp="" field="cycleway:left"/>
+    <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"/>
+    <constraint exp="" desc="" field="wheelchair"/>
+    <constraint exp="" desc="" field="tunnel"/>
+    <constraint exp="" desc="" field="layer"/>
+    <constraint exp="" desc="" field="width"/>
+    <constraint exp="" desc="" field="step_count"/>
+    <constraint exp="" desc="" field="incline"/>
+    <constraint exp="" desc="" field="handrail"/>
+    <constraint exp="" desc="" field="access"/>
+    <constraint exp="" desc="" field="material"/>
+    <constraint exp="" desc="" field="height"/>
+    <constraint exp="" desc="" field="fence_type"/>
+    <constraint exp="" desc="" field="natural"/>
+    <constraint exp="" desc="" field="service"/>
+    <constraint exp="" desc="" field="footway"/>
+    <constraint exp="" desc="" field="cycleway:both"/>
+    <constraint exp="" desc="" field="name:etymology:wikidata"/>
+    <constraint exp="" desc="" field="surface"/>
+    <constraint exp="" desc="" field="sidewalk"/>
+    <constraint exp="" desc="" field="oneway"/>
+    <constraint exp="" desc="" field="maxspeed:type"/>
+    <constraint exp="" desc="" field="maxspeed"/>
+    <constraint exp="" desc="" field="lit"/>
+    <constraint exp="" desc="" field="cycleway:right:segregated"/>
+    <constraint exp="" desc="" field="cycleway:right"/>
+    <constraint exp="" desc="" field="cycleway:left"/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-    <actionsetting type="5" notificationMessage="" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{91b36696-6bd3-49a8-a62e-116a09eef79a}" shortTitle="OpenStreetMap Browser">
+    <actionsetting action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" type="5" notificationMessage="" capture="0" icon="" name="OpenStreetMap Browser" shortTitle="OpenStreetMap Browser" isEnabledOnlyWhenEditable="0" id="{cc897468-354f-4486-b110-87e59c223bf5}">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="1" notificationMessage="" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" capture="0" id="{5e2e732d-ffd6-43c4-a286-98f801cfaf36}" shortTitle="Mapillary">
+    <actionsetting action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" type="1" notificationMessage="" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" name="Mapillary" shortTitle="Mapillary" isEnabledOnlyWhenEditable="0" id="{ebf4bf94-d00c-403a-bb53-ac502b388954}">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="1" notificationMessage="" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" capture="0" id="{d1d51242-a425-425b-8b1a-e2b708f50df4}" shortTitle="JOSM">
+    <actionsetting action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" type="1" notificationMessage="" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" name="JOSM" shortTitle="JOSM" isEnabledOnlyWhenEditable="0" id="{724b7304-2764-4160-94b3-d51ceaa2395a}">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="5" notificationMessage="" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{4bac628d-6f46-4850-b909-f1f823a37930}" shortTitle="User default editor">
+    <actionsetting action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" type="5" notificationMessage="" capture="0" icon="" name="User default editor" shortTitle="User default editor" isEnabledOnlyWhenEditable="0" id="{2f105c50-3a9c-4dd3-91a6-e7c9a38b5ddc}">
+      <actionScope id="Canvas"/>
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
-      <actionScope id="Canvas"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
     <columns>
-      <column type="field" name="osm_id" width="-1" hidden="0"/>
+      <column type="field" width="-1" name="osm_id" hidden="0"/>
       <column type="actions" width="-1" hidden="1"/>
-      <column type="field" name="name" width="-1" hidden="0"/>
-      <column type="field" name="waterway" width="-1" hidden="0"/>
-      <column type="field" name="highway" width="-1" hidden="0"/>
-      <column type="field" name="barrier" width="-1" hidden="0"/>
-      <column type="field" name="man_made" width="-1" hidden="0"/>
-      <column type="field" name="fid" width="-1" hidden="0"/>
-      <column type="field" name="aerialway" width="-1" hidden="0"/>
-      <column type="field" name="z_order" width="-1" hidden="0"/>
-      <column type="field" name="other_tags" width="406" hidden="0"/>
-      <column type="field" name="sidewalk" width="-1" hidden="0"/>
-      <column type="field" name="footway" width="-1" hidden="0"/>
-      <column type="field" name="service" width="-1" hidden="0"/>
-      <column type="field" name="access" width="-1" hidden="0"/>
-      <column type="field" name="width" width="-1" hidden="0"/>
-      <column type="field" name="cycleway:both" width="-1" hidden="0"/>
-      <column type="field" name="maxspeed:type" width="-1" hidden="0"/>
-      <column type="field" name="lit" width="-1" hidden="0"/>
-      <column type="field" name="cycleway:right" width="-1" hidden="0"/>
-      <column type="field" name="oneway" width="-1" hidden="0"/>
-      <column type="field" name="surface" width="-1" hidden="0"/>
-      <column type="field" name="maxspeed" width="-1" hidden="0"/>
-      <column type="field" name="height" width="-1" hidden="0"/>
-      <column type="field" name="cycleway:left" width="-1" hidden="0"/>
-      <column type="field" name="incline" width="-1" hidden="0"/>
-      <column type="field" name="step_count" width="-1" hidden="0"/>
-      <column type="field" name="handrail" width="-1" hidden="0"/>
-      <column type="field" name="material" width="-1" hidden="0"/>
-      <column type="field" name="fence_type" width="-1" hidden="0"/>
-      <column type="field" name="natural" width="-1" hidden="0"/>
-      <column type="field" name="name:etymology:wikidata" width="-1" hidden="0"/>
-      <column type="field" name="cycleway:right:segregated" width="-1" hidden="0"/>
+      <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="barrier" hidden="0"/>
+      <column type="field" width="-1" name="man_made" hidden="0"/>
+      <column type="field" width="-1" name="fid" hidden="0"/>
+      <column type="field" width="-1" name="aerialway" hidden="0"/>
+      <column type="field" width="-1" name="z_order" hidden="0"/>
+      <column type="field" width="406" name="other_tags" hidden="0"/>
+      <column type="field" width="-1" name="sidewalk" hidden="0"/>
+      <column type="field" width="-1" name="footway" hidden="0"/>
+      <column type="field" width="-1" name="service" hidden="0"/>
+      <column type="field" width="-1" name="access" hidden="0"/>
+      <column type="field" width="-1" name="width" 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="lit" hidden="0"/>
+      <column type="field" width="-1" name="cycleway:right" hidden="0"/>
+      <column type="field" width="-1" name="oneway" hidden="0"/>
+      <column type="field" width="-1" name="surface" hidden="0"/>
+      <column type="field" width="-1" name="maxspeed" hidden="0"/>
+      <column type="field" width="-1" name="height" hidden="0"/>
+      <column type="field" width="-1" name="cycleway:left" hidden="0"/>
+      <column type="field" width="-1" name="incline" hidden="0"/>
+      <column type="field" width="-1" name="step_count" hidden="0"/>
+      <column type="field" width="-1" name="handrail" hidden="0"/>
+      <column type="field" width="-1" name="material" hidden="0"/>
+      <column type="field" width="-1" name="fence_type" hidden="0"/>
+      <column type="field" width="-1" name="natural" hidden="0"/>
+      <column type="field" width="-1" name="name:etymology:wikidata" hidden="0"/>
+      <column type="field" width="-1" name="cycleway:right:segregated" hidden="0"/>
+      <column type="field" width="-1" name="wheelchair" hidden="0"/>
+      <column type="field" width="-1" name="tunnel" hidden="0"/>
+      <column type="field" width="-1" name="layer" hidden="0"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1238,468 +1274,468 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field name="access" editable="1"/>
-    <field name="access:conditional" editable="1"/>
-    <field name="access:lanes" editable="1"/>
-    <field name="access:lanes:backward" editable="1"/>
-    <field name="admin_level" editable="1"/>
-    <field name="aerialway" editable="1"/>
-    <field name="aerialway_2" editable="1"/>
-    <field name="alt_name" editable="1"/>
-    <field name="barrier" editable="1"/>
-    <field name="barrier_2" editable="1"/>
-    <field name="bicycle" editable="1"/>
-    <field name="boundary" editable="1"/>
-    <field name="bridge" editable="1"/>
-    <field name="bridge:name" editable="1"/>
-    <field name="bridge:structure" editable="1"/>
-    <field name="bus" editable="1"/>
-    <field name="bus:forward" editable="1"/>
-    <field name="bus_bay" editable="1"/>
-    <field name="busway:right" editable="1"/>
-    <field name="cables" editable="1"/>
-    <field name="change:lanes" editable="1"/>
-    <field name="covered" editable="1"/>
-    <field name="crossing" editable="1"/>
-    <field name="cutting" editable="1"/>
-    <field name="cycleway" editable="1"/>
-    <field name="cycleway:both" editable="1"/>
-    <field name="cycleway:both:lane" editable="1"/>
-    <field name="cycleway:lane" editable="1"/>
-    <field name="cycleway:left" editable="1"/>
-    <field name="cycleway:right" editable="1"/>
-    <field name="cycleway:right:lane" editable="1"/>
-    <field name="cycleway:right:segregated" editable="1"/>
-    <field name="departures_board" editable="1"/>
-    <field name="description" editable="1"/>
-    <field name="description:covid19" editable="1"/>
-    <field name="destination" editable="1"/>
-    <field name="destination:backward" editable="1"/>
-    <field name="destination:colour" editable="1"/>
-    <field name="destination:colour:lanes" editable="1"/>
-    <field name="destination:forward" editable="1"/>
-    <field name="destination:lanes" editable="1"/>
-    <field name="destination:ref" editable="1"/>
-    <field name="destination:ref:lanes" editable="1"/>
-    <field name="destination:symbol" editable="1"/>
-    <field name="destination:symbol:lanes" editable="1"/>
-    <field name="destroyed:railway" editable="1"/>
-    <field name="distance" editable="1"/>
-    <field name="electrified" editable="1"/>
-    <field name="embankment" editable="1"/>
-    <field name="end_date" editable="1"/>
-    <field name="excellent" editable="1"/>
-    <field name="fence_type" editable="1"/>
-    <field name="fid" editable="1"/>
-    <field name="foot" editable="1"/>
-    <field name="footway" editable="1"/>
-    <field name="ford" editable="1"/>
-    <field name="full_id" editable="1"/>
-    <field name="gauge" editable="1"/>
-    <field name="guard_rail" editable="1"/>
-    <field name="guard_rail:material" editable="1"/>
-    <field name="handrail" editable="1"/>
-    <field name="height" editable="1"/>
-    <field name="hgv" editable="1"/>
-    <field name="highway" editable="1"/>
-    <field name="highway_2" editable="1"/>
-    <field name="history" editable="1"/>
-    <field name="horse" editable="1"/>
-    <field name="incline" editable="1"/>
-    <field name="informal" editable="1"/>
-    <field name="int_ref" editable="1"/>
-    <field name="intermittent" editable="1"/>
-    <field name="junction" editable="1"/>
-    <field name="lane_markings" editable="1"/>
-    <field name="lanes" editable="1"/>
-    <field name="lanes:backward" editable="1"/>
-    <field name="lanes:both_ways" editable="1"/>
-    <field name="lanes:bus" editable="1"/>
-    <field name="lanes:bus:backward" editable="1"/>
-    <field name="lanes:bus:forward" editable="1"/>
-    <field name="lanes:bus:right" editable="1"/>
-    <field name="lanes:forward" editable="1"/>
-    <field name="lanes:hgv" editable="1"/>
-    <field name="lanes:psv" editable="1"/>
-    <field name="lanes:psv:backward" editable="1"/>
-    <field name="layer" editable="1"/>
-    <field name="leisure" editable="1"/>
-    <field name="level" editable="1"/>
-    <field name="lit" editable="1"/>
-    <field name="living_street" editable="1"/>
-    <field name="local_name" editable="1"/>
-    <field name="local_ref" editable="1"/>
-    <field name="lock" editable="1"/>
-    <field name="man_made" editable="1"/>
-    <field name="man_made_2" editable="1"/>
-    <field name="mapillary" editable="1"/>
-    <field name="marked_trail" editable="1"/>
-    <field name="material" editable="1"/>
-    <field name="maxheight" editable="1"/>
-    <field name="maxheight:forward" editable="1"/>
-    <field name="maxspeed" editable="1"/>
-    <field name="maxspeed:advisory" editable="1"/>
-    <field name="maxspeed:backward" editable="1"/>
-    <field name="maxspeed:backward:conditional" editable="1"/>
-    <field name="maxspeed:conditional" editable="1"/>
-    <field name="maxspeed:forward" editable="1"/>
-    <field name="maxspeed:forward:conditional" editable="1"/>
-    <field name="maxspeed:hazmat" editable="1"/>
-    <field name="maxspeed:hgv" editable="1"/>
-    <field name="maxspeed:lanes" editable="1"/>
-    <field name="maxspeed:source" editable="1"/>
-    <field name="maxspeed:type" editable="1"/>
-    <field name="maxspeed:variable" editable="1"/>
-    <field name="maxweight" editable="1"/>
-    <field name="maxweight:forward" editable="1"/>
-    <field name="maxweight:signed" editable="1"/>
-    <field name="maxwidth" editable="1"/>
-    <field name="motor_vehicle" editable="1"/>
-    <field name="motorcar" editable="1"/>
-    <field name="motorcycle" editable="1"/>
-    <field name="motorcycle_protection" editable="1"/>
-    <field name="motorroad" editable="1"/>
-    <field name="motorway" editable="1"/>
-    <field name="mtb" editable="1"/>
-    <field name="mtb:description" editable="1"/>
-    <field name="mtb:scale" editable="1"/>
-    <field name="mtb:scale:imba" editable="1"/>
-    <field name="mtb:scale:uphill" editable="1"/>
-    <field name="name" editable="1"/>
-    <field name="name:etymology:wikidata" editable="1"/>
-    <field name="name:fr" editable="1"/>
-    <field name="name:oc" editable="1"/>
-    <field name="name:ru" editable="1"/>
-    <field name="name:wikidata" editable="1"/>
-    <field name="name_2" editable="1"/>
-    <field name="natural" editable="1"/>
-    <field name="network" editable="1"/>
-    <field name="noname" editable="1"/>
-    <field name="note:railway" editable="1"/>
-    <field name="old_name" editable="1"/>
-    <field name="old_ref" editable="1"/>
-    <field name="oneway" editable="1"/>
-    <field name="oneway:bicycle" editable="1"/>
-    <field name="operator" editable="1"/>
-    <field name="osm_id" editable="1"/>
-    <field name="osm_id_2" editable="1"/>
-    <field name="osm_type" editable="1"/>
-    <field name="other_tags" editable="1"/>
-    <field name="other_tags_2" editable="1"/>
-    <field name="parking:condition:right" editable="1"/>
-    <field name="parking:lane:both" editable="1"/>
-    <field name="parking:lane:left" editable="1"/>
-    <field name="parking:lane:right" editable="1"/>
-    <field name="passenger_lines" editable="1"/>
-    <field name="paved" editable="1"/>
-    <field name="piste:difficulty" editable="1"/>
-    <field name="piste:type" editable="1"/>
-    <field name="placement" editable="1"/>
-    <field name="political_division" editable="1"/>
-    <field name="power" editable="1"/>
-    <field name="psv" editable="1"/>
-    <field name="psv:forward" editable="1"/>
-    <field name="psv:lanes:backward" editable="1"/>
-    <field name="public_transport" editable="1"/>
-    <field name="railway" editable="1"/>
-    <field name="railway:bidirectional" editable="1"/>
-    <field name="railway:end_date" editable="1"/>
-    <field name="railway:etcs" editable="1"/>
-    <field name="railway:kvb" editable="1"/>
-    <field name="railway:lzb" editable="1"/>
-    <field name="railway:preferred_direction" editable="1"/>
-    <field name="railway:pzb" editable="1"/>
-    <field name="railway:start_date" editable="1"/>
-    <field name="railway:traffic_mode" editable="1"/>
-    <field name="railway:tvm" editable="1"/>
-    <field name="ramp" editable="1"/>
-    <field name="ref" editable="1"/>
-    <field name="ref:FR:FANTOIR" editable="1"/>
-    <field name="ref:sandre" editable="1"/>
-    <field name="route" editable="1"/>
-    <field name="sac_scale" editable="1"/>
-    <field name="sac_scale_ref" editable="1"/>
-    <field name="segregated" editable="1"/>
-    <field name="service" editable="1"/>
-    <field name="sidewalk" editable="1"/>
-    <field name="smoothness" editable="1"/>
-    <field name="smoothness:date" editable="1"/>
-    <field name="snowmobile" editable="1"/>
-    <field name="source:description" editable="1"/>
-    <field name="source:maxheight" editable="1"/>
-    <field name="source:maxspeed" editable="1"/>
-    <field name="source:maxspeed:backward" editable="1"/>
-    <field name="source:maxspeed:forward" editable="1"/>
-    <field name="source:name" editable="1"/>
-    <field name="source:name:oc" editable="1"/>
-    <field name="source:url" editable="1"/>
-    <field name="source:width" editable="1"/>
-    <field name="start_date" editable="1"/>
-    <field name="step_count" editable="1"/>
-    <field name="surface" editable="1"/>
-    <field name="survey:date" editable="1"/>
-    <field name="survey_date" editable="1"/>
-    <field name="tactile_paving" editable="1"/>
-    <field name="taxi" editable="1"/>
-    <field name="toll" editable="1"/>
-    <field name="tourism" editable="1"/>
-    <field name="tracktype" editable="1"/>
-    <field name="traffic_calming" editable="1"/>
-    <field name="trail_visibility" editable="1"/>
-    <field name="trailblazed" editable="1"/>
-    <field name="trailblazed:mtb" editable="1"/>
-    <field name="train" editable="1"/>
-    <field name="transit:lanes" editable="1"/>
-    <field name="tunnel" editable="1"/>
-    <field name="tunnel:name" editable="1"/>
-    <field name="turn" editable="1"/>
-    <field name="turn:lanes" editable="1"/>
-    <field name="turn:lanes:backward" editable="1"/>
-    <field name="turn:lanes:forward" editable="1"/>
-    <field name="type" editable="1"/>
-    <field name="usage" editable="1"/>
-    <field name="voltage" editable="1"/>
-    <field name="waterway" editable="1"/>
-    <field name="waterway_2" editable="1"/>
-    <field name="weight" editable="1"/>
-    <field name="wheelchair" editable="1"/>
-    <field name="width" editable="1"/>
-    <field name="wikidata" editable="1"/>
-    <field name="wikipedia" editable="1"/>
-    <field name="z_order" editable="1"/>
-    <field name="z_order_2" editable="1"/>
+    <field editable="1" name="access"/>
+    <field editable="1" name="access:conditional"/>
+    <field editable="1" name="access:lanes"/>
+    <field editable="1" name="access:lanes:backward"/>
+    <field editable="1" name="admin_level"/>
+    <field editable="1" name="aerialway"/>
+    <field editable="1" name="aerialway_2"/>
+    <field editable="1" name="alt_name"/>
+    <field editable="1" name="barrier"/>
+    <field editable="1" name="barrier_2"/>
+    <field editable="1" name="bicycle"/>
+    <field editable="1" name="boundary"/>
+    <field editable="1" name="bridge"/>
+    <field editable="1" name="bridge:name"/>
+    <field editable="1" name="bridge:structure"/>
+    <field editable="1" name="bus"/>
+    <field editable="1" name="bus:forward"/>
+    <field editable="1" name="bus_bay"/>
+    <field editable="1" name="busway:right"/>
+    <field editable="1" name="cables"/>
+    <field editable="1" name="change:lanes"/>
+    <field editable="1" name="covered"/>
+    <field editable="1" name="crossing"/>
+    <field editable="1" name="cutting"/>
+    <field editable="1" name="cycleway"/>
+    <field editable="1" name="cycleway:both"/>
+    <field editable="1" name="cycleway:both:lane"/>
+    <field editable="1" name="cycleway:lane"/>
+    <field editable="1" name="cycleway:left"/>
+    <field editable="1" name="cycleway:right"/>
+    <field editable="1" name="cycleway:right:lane"/>
+    <field editable="1" name="cycleway:right:segregated"/>
+    <field editable="1" name="departures_board"/>
+    <field editable="1" name="description"/>
+    <field editable="1" name="description:covid19"/>
+    <field editable="1" name="destination"/>
+    <field editable="1" name="destination:backward"/>
+    <field editable="1" name="destination:colour"/>
+    <field editable="1" name="destination:colour:lanes"/>
+    <field editable="1" name="destination:forward"/>
+    <field editable="1" name="destination:lanes"/>
+    <field editable="1" name="destination:ref"/>
+    <field editable="1" name="destination:ref:lanes"/>
+    <field editable="1" name="destination:symbol"/>
+    <field editable="1" name="destination:symbol:lanes"/>
+    <field editable="1" name="destroyed:railway"/>
+    <field editable="1" name="distance"/>
+    <field editable="1" name="electrified"/>
+    <field editable="1" name="embankment"/>
+    <field editable="1" name="end_date"/>
+    <field editable="1" name="excellent"/>
+    <field editable="1" name="fence_type"/>
+    <field editable="1" name="fid"/>
+    <field editable="1" name="foot"/>
+    <field editable="1" name="footway"/>
+    <field editable="1" name="ford"/>
+    <field editable="1" name="full_id"/>
+    <field editable="1" name="gauge"/>
+    <field editable="1" name="guard_rail"/>
+    <field editable="1" name="guard_rail:material"/>
+    <field editable="1" name="handrail"/>
+    <field editable="1" name="height"/>
+    <field editable="1" name="hgv"/>
+    <field editable="1" name="highway"/>
+    <field editable="1" name="highway_2"/>
+    <field editable="1" name="history"/>
+    <field editable="1" name="horse"/>
+    <field editable="1" name="incline"/>
+    <field editable="1" name="informal"/>
+    <field editable="1" name="int_ref"/>
+    <field editable="1" name="intermittent"/>
+    <field editable="1" name="junction"/>
+    <field editable="1" name="lane_markings"/>
+    <field editable="1" name="lanes"/>
+    <field editable="1" name="lanes:backward"/>
+    <field editable="1" name="lanes:both_ways"/>
+    <field editable="1" name="lanes:bus"/>
+    <field editable="1" name="lanes:bus:backward"/>
+    <field editable="1" name="lanes:bus:forward"/>
+    <field editable="1" name="lanes:bus:right"/>
+    <field editable="1" name="lanes:forward"/>
+    <field editable="1" name="lanes:hgv"/>
+    <field editable="1" name="lanes:psv"/>
+    <field editable="1" name="lanes:psv:backward"/>
+    <field editable="1" name="layer"/>
+    <field editable="1" name="leisure"/>
+    <field editable="1" name="level"/>
+    <field editable="1" name="lit"/>
+    <field editable="1" name="living_street"/>
+    <field editable="1" name="local_name"/>
+    <field editable="1" name="local_ref"/>
+    <field editable="1" name="lock"/>
+    <field editable="1" name="man_made"/>
+    <field editable="1" name="man_made_2"/>
+    <field editable="1" name="mapillary"/>
+    <field editable="1" name="marked_trail"/>
+    <field editable="1" name="material"/>
+    <field editable="1" name="maxheight"/>
+    <field editable="1" name="maxheight:forward"/>
+    <field editable="1" name="maxspeed"/>
+    <field editable="1" name="maxspeed:advisory"/>
+    <field editable="1" name="maxspeed:backward"/>
+    <field editable="1" name="maxspeed:backward:conditional"/>
+    <field editable="1" name="maxspeed:conditional"/>
+    <field editable="1" name="maxspeed:forward"/>
+    <field editable="1" name="maxspeed:forward:conditional"/>
+    <field editable="1" name="maxspeed:hazmat"/>
+    <field editable="1" name="maxspeed:hgv"/>
+    <field editable="1" name="maxspeed:lanes"/>
+    <field editable="1" name="maxspeed:source"/>
+    <field editable="1" name="maxspeed:type"/>
+    <field editable="1" name="maxspeed:variable"/>
+    <field editable="1" name="maxweight"/>
+    <field editable="1" name="maxweight:forward"/>
+    <field editable="1" name="maxweight:signed"/>
+    <field editable="1" name="maxwidth"/>
+    <field editable="1" name="motor_vehicle"/>
+    <field editable="1" name="motorcar"/>
+    <field editable="1" name="motorcycle"/>
+    <field editable="1" name="motorcycle_protection"/>
+    <field editable="1" name="motorroad"/>
+    <field editable="1" name="motorway"/>
+    <field editable="1" name="mtb"/>
+    <field editable="1" name="mtb:description"/>
+    <field editable="1" name="mtb:scale"/>
+    <field editable="1" name="mtb:scale:imba"/>
+    <field editable="1" name="mtb:scale:uphill"/>
+    <field editable="1" name="name"/>
+    <field editable="1" name="name:etymology:wikidata"/>
+    <field editable="1" name="name:fr"/>
+    <field editable="1" name="name:oc"/>
+    <field editable="1" name="name:ru"/>
+    <field editable="1" name="name:wikidata"/>
+    <field editable="1" name="name_2"/>
+    <field editable="1" name="natural"/>
+    <field editable="1" name="network"/>
+    <field editable="1" name="noname"/>
+    <field editable="1" name="note:railway"/>
+    <field editable="1" name="old_name"/>
+    <field editable="1" name="old_ref"/>
+    <field editable="1" name="oneway"/>
+    <field editable="1" name="oneway:bicycle"/>
+    <field editable="1" name="operator"/>
+    <field editable="1" name="osm_id"/>
+    <field editable="1" name="osm_id_2"/>
+    <field editable="1" name="osm_type"/>
+    <field editable="1" name="other_tags"/>
+    <field editable="1" name="other_tags_2"/>
+    <field editable="1" name="parking:condition:right"/>
+    <field editable="1" name="parking:lane:both"/>
+    <field editable="1" name="parking:lane:left"/>
+    <field editable="1" name="parking:lane:right"/>
+    <field editable="1" name="passenger_lines"/>
+    <field editable="1" name="paved"/>
+    <field editable="1" name="piste:difficulty"/>
+    <field editable="1" name="piste:type"/>
+    <field editable="1" name="placement"/>
+    <field editable="1" name="political_division"/>
+    <field editable="1" name="power"/>
+    <field editable="1" name="psv"/>
+    <field editable="1" name="psv:forward"/>
+    <field editable="1" name="psv:lanes:backward"/>
+    <field editable="1" name="public_transport"/>
+    <field editable="1" name="railway"/>
+    <field editable="1" name="railway:bidirectional"/>
+    <field editable="1" name="railway:end_date"/>
+    <field editable="1" name="railway:etcs"/>
+    <field editable="1" name="railway:kvb"/>
+    <field editable="1" name="railway:lzb"/>
+    <field editable="1" name="railway:preferred_direction"/>
+    <field editable="1" name="railway:pzb"/>
+    <field editable="1" name="railway:start_date"/>
+    <field editable="1" name="railway:traffic_mode"/>
+    <field editable="1" name="railway:tvm"/>
+    <field editable="1" name="ramp"/>
+    <field editable="1" name="ref"/>
+    <field editable="1" name="ref:FR:FANTOIR"/>
+    <field editable="1" name="ref:sandre"/>
+    <field editable="1" name="route"/>
+    <field editable="1" name="sac_scale"/>
+    <field editable="1" name="sac_scale_ref"/>
+    <field editable="1" name="segregated"/>
+    <field editable="1" name="service"/>
+    <field editable="1" name="sidewalk"/>
+    <field editable="1" name="smoothness"/>
+    <field editable="1" name="smoothness:date"/>
+    <field editable="1" name="snowmobile"/>
+    <field editable="1" name="source:description"/>
+    <field editable="1" name="source:maxheight"/>
+    <field editable="1" name="source:maxspeed"/>
+    <field editable="1" name="source:maxspeed:backward"/>
+    <field editable="1" name="source:maxspeed:forward"/>
+    <field editable="1" name="source:name"/>
+    <field editable="1" name="source:name:oc"/>
+    <field editable="1" name="source:url"/>
+    <field editable="1" name="source:width"/>
+    <field editable="1" name="start_date"/>
+    <field editable="1" name="step_count"/>
+    <field editable="1" name="surface"/>
+    <field editable="1" name="survey:date"/>
+    <field editable="1" name="survey_date"/>
+    <field editable="1" name="tactile_paving"/>
+    <field editable="1" name="taxi"/>
+    <field editable="1" name="toll"/>
+    <field editable="1" name="tourism"/>
+    <field editable="1" name="tracktype"/>
+    <field editable="1" name="traffic_calming"/>
+    <field editable="1" name="trail_visibility"/>
+    <field editable="1" name="trailblazed"/>
+    <field editable="1" name="trailblazed:mtb"/>
+    <field editable="1" name="train"/>
+    <field editable="1" name="transit:lanes"/>
+    <field editable="1" name="tunnel"/>
+    <field editable="1" name="tunnel:name"/>
+    <field editable="1" name="turn"/>
+    <field editable="1" name="turn:lanes"/>
+    <field editable="1" name="turn:lanes:backward"/>
+    <field editable="1" name="turn:lanes:forward"/>
+    <field editable="1" name="type"/>
+    <field editable="1" name="usage"/>
+    <field editable="1" name="voltage"/>
+    <field editable="1" name="waterway"/>
+    <field editable="1" name="waterway_2"/>
+    <field editable="1" name="weight"/>
+    <field editable="1" name="wheelchair"/>
+    <field editable="1" name="width"/>
+    <field editable="1" name="wikidata"/>
+    <field editable="1" name="wikipedia"/>
+    <field editable="1" name="z_order"/>
+    <field editable="1" name="z_order_2"/>
   </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="admin_level"/>
-    <field labelOnTop="0" name="aerialway"/>
-    <field labelOnTop="0" name="aerialway_2"/>
-    <field labelOnTop="0" name="alt_name"/>
-    <field labelOnTop="0" name="barrier"/>
-    <field labelOnTop="0" name="barrier_2"/>
-    <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="cables"/>
-    <field labelOnTop="0" name="change:lanes"/>
-    <field labelOnTop="0" name="covered"/>
-    <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:both:lane"/>
-    <field labelOnTop="0" name="cycleway:lane"/>
-    <field labelOnTop="0" name="cycleway:left"/>
-    <field labelOnTop="0" name="cycleway:right"/>
-    <field labelOnTop="0" name="cycleway:right:lane"/>
-    <field labelOnTop="0" name="cycleway:right:segregated"/>
-    <field labelOnTop="0" name="departures_board"/>
-    <field labelOnTop="0" name="description"/>
-    <field labelOnTop="0" name="description:covid19"/>
-    <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="destroyed:railway"/>
-    <field labelOnTop="0" name="distance"/>
-    <field labelOnTop="0" name="electrified"/>
-    <field labelOnTop="0" name="embankment"/>
-    <field labelOnTop="0" name="end_date"/>
-    <field labelOnTop="0" name="excellent"/>
-    <field labelOnTop="0" name="fence_type"/>
-    <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="gauge"/>
-    <field labelOnTop="0" name="guard_rail"/>
-    <field labelOnTop="0" name="guard_rail:material"/>
-    <field labelOnTop="0" name="handrail"/>
-    <field labelOnTop="0" name="height"/>
-    <field labelOnTop="0" name="hgv"/>
-    <field labelOnTop="0" name="highway"/>
-    <field labelOnTop="0" name="highway_2"/>
-    <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:bus"/>
-    <field labelOnTop="0" name="lanes:bus:backward"/>
-    <field labelOnTop="0" name="lanes:bus:forward"/>
-    <field labelOnTop="0" name="lanes:bus:right"/>
-    <field labelOnTop="0" name="lanes:forward"/>
-    <field labelOnTop="0" name="lanes:hgv"/>
-    <field labelOnTop="0" name="lanes:psv"/>
-    <field labelOnTop="0" name="lanes:psv:backward"/>
-    <field labelOnTop="0" name="layer"/>
-    <field labelOnTop="0" name="leisure"/>
-    <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="lock"/>
-    <field labelOnTop="0" name="man_made"/>
-    <field labelOnTop="0" name="man_made_2"/>
-    <field labelOnTop="0" name="mapillary"/>
-    <field labelOnTop="0" name="marked_trail"/>
-    <field labelOnTop="0" name="material"/>
-    <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="maxspeed:variable"/>
-    <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="motorcycle_protection"/>
-    <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:imba"/>
-    <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="name_2"/>
-    <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_id_2"/>
-    <field labelOnTop="0" name="osm_type"/>
-    <field labelOnTop="0" name="other_tags"/>
-    <field labelOnTop="0" name="other_tags_2"/>
-    <field labelOnTop="0" name="parking:condition:right"/>
-    <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="passenger_lines"/>
-    <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="power"/>
-    <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:bidirectional"/>
-    <field labelOnTop="0" name="railway:end_date"/>
-    <field labelOnTop="0" name="railway:etcs"/>
-    <field labelOnTop="0" name="railway:kvb"/>
-    <field labelOnTop="0" name="railway:lzb"/>
-    <field labelOnTop="0" name="railway:preferred_direction"/>
-    <field labelOnTop="0" name="railway:pzb"/>
-    <field labelOnTop="0" name="railway:start_date"/>
-    <field labelOnTop="0" name="railway:traffic_mode"/>
-    <field labelOnTop="0" name="railway:tvm"/>
-    <field labelOnTop="0" name="ramp"/>
-    <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:description"/>
-    <field labelOnTop="0" name="source:maxheight"/>
-    <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:url"/>
-    <field labelOnTop="0" name="source:width"/>
-    <field labelOnTop="0" name="start_date"/>
-    <field labelOnTop="0" name="step_count"/>
-    <field labelOnTop="0" name="surface"/>
-    <field labelOnTop="0" name="survey:date"/>
-    <field labelOnTop="0" name="survey_date"/>
-    <field labelOnTop="0" name="tactile_paving"/>
-    <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="trailblazed:mtb"/>
-    <field labelOnTop="0" name="train"/>
-    <field labelOnTop="0" name="transit:lanes"/>
-    <field labelOnTop="0" name="tunnel"/>
-    <field labelOnTop="0" name="tunnel:name"/>
-    <field labelOnTop="0" name="turn"/>
-    <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="usage"/>
-    <field labelOnTop="0" name="voltage"/>
-    <field labelOnTop="0" name="waterway"/>
-    <field labelOnTop="0" name="waterway_2"/>
-    <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 labelOnTop="0" name="z_order"/>
-    <field labelOnTop="0" name="z_order_2"/>
+    <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="admin_level" labelOnTop="0"/>
+    <field name="aerialway" labelOnTop="0"/>
+    <field name="aerialway_2" labelOnTop="0"/>
+    <field name="alt_name" labelOnTop="0"/>
+    <field name="barrier" labelOnTop="0"/>
+    <field name="barrier_2" 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="cables" labelOnTop="0"/>
+    <field name="change:lanes" labelOnTop="0"/>
+    <field name="covered" 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:both:lane" labelOnTop="0"/>
+    <field name="cycleway:lane" labelOnTop="0"/>
+    <field name="cycleway:left" labelOnTop="0"/>
+    <field name="cycleway:right" labelOnTop="0"/>
+    <field name="cycleway:right:lane" labelOnTop="0"/>
+    <field name="cycleway:right:segregated" labelOnTop="0"/>
+    <field name="departures_board" labelOnTop="0"/>
+    <field name="description" labelOnTop="0"/>
+    <field name="description:covid19" 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="destroyed:railway" labelOnTop="0"/>
+    <field name="distance" labelOnTop="0"/>
+    <field name="electrified" labelOnTop="0"/>
+    <field name="embankment" labelOnTop="0"/>
+    <field name="end_date" labelOnTop="0"/>
+    <field name="excellent" labelOnTop="0"/>
+    <field name="fence_type" 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="gauge" labelOnTop="0"/>
+    <field name="guard_rail" labelOnTop="0"/>
+    <field name="guard_rail:material" labelOnTop="0"/>
+    <field name="handrail" labelOnTop="0"/>
+    <field name="height" labelOnTop="0"/>
+    <field name="hgv" labelOnTop="0"/>
+    <field name="highway" labelOnTop="0"/>
+    <field name="highway_2" 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:bus" labelOnTop="0"/>
+    <field name="lanes:bus:backward" labelOnTop="0"/>
+    <field name="lanes:bus:forward" labelOnTop="0"/>
+    <field name="lanes:bus:right" labelOnTop="0"/>
+    <field name="lanes:forward" labelOnTop="0"/>
+    <field name="lanes:hgv" labelOnTop="0"/>
+    <field name="lanes:psv" labelOnTop="0"/>
+    <field name="lanes:psv:backward" labelOnTop="0"/>
+    <field name="layer" labelOnTop="0"/>
+    <field name="leisure" 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="lock" labelOnTop="0"/>
+    <field name="man_made" labelOnTop="0"/>
+    <field name="man_made_2" labelOnTop="0"/>
+    <field name="mapillary" labelOnTop="0"/>
+    <field name="marked_trail" labelOnTop="0"/>
+    <field name="material" 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="maxspeed:variable" 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="motorcycle_protection" 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:imba" 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="name_2" 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_id_2" labelOnTop="0"/>
+    <field name="osm_type" labelOnTop="0"/>
+    <field name="other_tags" labelOnTop="0"/>
+    <field name="other_tags_2" labelOnTop="0"/>
+    <field name="parking:condition:right" 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="passenger_lines" 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="power" 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:bidirectional" labelOnTop="0"/>
+    <field name="railway:end_date" labelOnTop="0"/>
+    <field name="railway:etcs" labelOnTop="0"/>
+    <field name="railway:kvb" labelOnTop="0"/>
+    <field name="railway:lzb" labelOnTop="0"/>
+    <field name="railway:preferred_direction" labelOnTop="0"/>
+    <field name="railway:pzb" labelOnTop="0"/>
+    <field name="railway:start_date" labelOnTop="0"/>
+    <field name="railway:traffic_mode" labelOnTop="0"/>
+    <field name="railway:tvm" labelOnTop="0"/>
+    <field name="ramp" 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:description" labelOnTop="0"/>
+    <field name="source:maxheight" 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:url" labelOnTop="0"/>
+    <field name="source:width" labelOnTop="0"/>
+    <field name="start_date" labelOnTop="0"/>
+    <field name="step_count" labelOnTop="0"/>
+    <field name="surface" labelOnTop="0"/>
+    <field name="survey:date" labelOnTop="0"/>
+    <field name="survey_date" labelOnTop="0"/>
+    <field name="tactile_paving" 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="trailblazed:mtb" labelOnTop="0"/>
+    <field name="train" labelOnTop="0"/>
+    <field name="transit:lanes" labelOnTop="0"/>
+    <field name="tunnel" labelOnTop="0"/>
+    <field name="tunnel:name" labelOnTop="0"/>
+    <field name="turn" 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="usage" labelOnTop="0"/>
+    <field name="voltage" labelOnTop="0"/>
+    <field name="waterway" labelOnTop="0"/>
+    <field name="waterway_2" 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"/>
+    <field name="z_order_2" labelOnTop="0"/>
   </labelOnTop>
   <widgets/>
   <previewExpression>full_id</previewExpression>
diff --git a/style_caliec/styles/multipolygon.qml b/style_caliec/styles/multipolygon.qml
index d73ee88..4ce00f9 100644
--- a/style_caliec/styles/multipolygon.qml
+++ b/style_caliec/styles/multipolygon.qml
@@ -1,389 +1,390 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis simplifyMaxScale="1" version="3.10.4-A Coruña" maxScale="0" simplifyDrawingHints="1" readOnly="0" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" labelsEnabled="1" styleCategories="AllStyleCategories" simplifyDrawingTol="1" simplifyLocal="1">
+<qgis maxScale="0" labelsEnabled="1" minScale="1e+08" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" readOnly="0" simplifyDrawingHints="1" simplifyLocal="1" version="3.10.4-A Coruña">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
+  <renderer-v2 forceraster="0" type="RuleRenderer" enableorderby="0" symbollevels="1">
     <rules key="{235a67ea-a656-47c2-91a1-3c94e2926f62}">
-      <rule label="bâtiment" symbol="0" filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" key="{f69f1a82-2331-4139-9487-e27714a58a63}"/>
-      <rule label="toit,auvent,préau" symbol="1" filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}"/>
-      <rule label="bâtiment scolaire" symbol="2" filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}"/>
-      <rule label="cabanon" symbol="3" filter="&quot;building&quot;='shed'" key="{bc2342be-b587-40e8-8c25-1043595b314d}"/>
-      <rule label="terrain" symbol="4" filter="&quot;leisure&quot;='pitch'" key="{50526ad5-7812-4a78-835b-68082204e6ac}"/>
-      <rule label="terrain de basket" symbol="5" scalemaxdenom="3000" filter="&quot;leisure&quot;='pitch' and &quot;sport&quot;~'basketball'" scalemindenom="1" key="{37c906be-b2ec-4cc7-aefc-9eb829be9a07}"/>
-      <rule label="herbe" symbol="6" 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'" key="{af8ca696-fc2e-4142-945a-24b6a15acc48}"/>
-      <rule label="eau" symbol="7" filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" key="{933821c2-969e-44c3-ac11-8153737ba71a}"/>
-      <rule label="lit de rivière" symbol="8" filter="&quot;natural&quot;='shingle'" key="{e91700e9-45b0-4885-8be1-33970cf2f64c}"/>
-      <rule label="zone boisée" symbol="9" filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}"/>
-      <rule label="jeux" symbol="10" filter="&quot;leisure&quot;='playground'" key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}"/>
-      <rule label="parking" symbol="11" filter="&quot;amenity&quot;='parking'" key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}"/>
-      <rule label="champ" symbol="12" filter="&quot;landuse&quot;='farmland'" key="{b908d622-4193-4ced-8781-7bb5b8930e60}"/>
-      <rule label="sable compact" symbol="13" filter="&quot;surface&quot;='compacted'" key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}"/>
-      <rule label="jardin" symbol="14" filter="&quot;leisure&quot;='garden'" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}"/>
-      <rule label="chemin" symbol="15" filter="&quot;area:highway&quot;='path'" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}"/>
-      <rule label="sable" symbol="16" filter="&quot;surface&quot;='sand'" key="{c2d5ee3a-b2f3-4d9d-beea-539050495632}"/>
-      <rule label="terrain de tennis" symbol="17" scalemaxdenom="3000" filter="&quot;leisure&quot;='pitch' and &quot;sport&quot;~'tennisl'" scalemindenom="1" key="{c2564818-a4cb-4f7a-a4ff-2cb0787426c7}"/>
+      <rule filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" symbol="0" label="bâtiment" key="{f69f1a82-2331-4139-9487-e27714a58a63}"/>
+      <rule filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" symbol="1" label="toit,auvent,préau" key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}"/>
+      <rule filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" 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;leisure&quot;='pitch'" symbol="4" label="terrain" key="{50526ad5-7812-4a78-835b-68082204e6ac}"/>
+      <rule filter="&quot;leisure&quot;='pitch' and &quot;sport&quot;~'basketball'" scalemaxdenom="3000" symbol="5" label="terrain de basket" key="{37c906be-b2ec-4cc7-aefc-9eb829be9a07}" scalemindenom="1"/>
+      <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="6" label="herbe" key="{af8ca696-fc2e-4142-945a-24b6a15acc48}"/>
+      <rule filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" symbol="7" label="eau" key="{933821c2-969e-44c3-ac11-8153737ba71a}"/>
+      <rule filter="&quot;natural&quot;='shingle'" symbol="8" label="lit de rivière" key="{e91700e9-45b0-4885-8be1-33970cf2f64c}"/>
+      <rule filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" symbol="9" label="zone boisée" key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}"/>
+      <rule filter="&quot;leisure&quot;='playground'" symbol="10" label="jeux" key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}"/>
+      <rule filter="&quot;amenity&quot;='parking'" symbol="11" label="parking" key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}"/>
+      <rule filter="&quot;landuse&quot;='farmland'" symbol="12" label="champ" key="{b908d622-4193-4ced-8781-7bb5b8930e60}"/>
+      <rule filter="&quot;surface&quot;='compacted'" symbol="13" label="sable compact" key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}"/>
+      <rule filter="&quot;leisure&quot;='garden'" symbol="14" label="jardin" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}"/>
+      <rule filter="&quot;area:highway&quot;='path'" symbol="15" label="chemin" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}"/>
+      <rule filter="&quot;surface&quot;='sand'" symbol="16" label="sable" key="{c2d5ee3a-b2f3-4d9d-beea-539050495632}"/>
+      <rule filter="&quot;leisure&quot;='pitch' and &quot;sport&quot;~'tennisl'" scalemaxdenom="3000" symbol="17" label="terrain de tennis" key="{c2564818-a4cb-4f7a-a4ff-2cb0787426c7}" scalemindenom="1"/>
+      <rule filter="&quot;amenity&quot;='toilets'" symbol="18" label="toilettes" key="{2dc0fa40-d387-4c10-922d-64c83cdf66ae}"/>
     </rules>
     <symbols>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="0" force_rhr="0">
-        <layer class="SimpleFill" pass="20" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="209,209,209,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="0" alpha="1" clip_to_extent="1">
+        <layer pass="20" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="209,209,209,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="LinePatternFill" pass="20" enabled="1" locked="0">
-          <prop v="45" k="angle"/>
-          <prop v="0,0,255,255" k="color"/>
-          <prop v="1" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+        <layer pass="20" class="LinePatternFill" enabled="1" locked="0">
+          <prop k="angle" v="45"/>
+          <prop k="color" v="0,0,255,255"/>
+          <prop k="distance" v="1"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" clip_to_extent="1" alpha="1" name="@0@1" force_rhr="0">
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol force_rhr="0" type="line" name="@0@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="0.5" name="1" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="229,229,229,128" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="1" alpha="0.5" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="229,229,229,128"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
-          <prop v="45" k="angle"/>
-          <prop v="0,0,0,255" k="color"/>
-          <prop v="3" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.5" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+        <layer pass="0" class="LinePatternFill" enabled="1" locked="0">
+          <prop k="angle" v="45"/>
+          <prop k="color" v="0,0,0,255"/>
+          <prop k="distance" v="3"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.5"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" clip_to_extent="1" alpha="1" name="@1@1" force_rhr="0">
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol force_rhr="0" type="line" name="@1@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="10" force_rhr="0">
-        <layer class="SimpleFill" pass="10" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="127,255,211,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="10" alpha="1" clip_to_extent="1">
+        <layer pass="10" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="127,255,211,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="PointPatternFill" pass="10" enabled="1" locked="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="2.4" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="2.4" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+        <layer pass="10" class="PointPatternFill" enabled="1" locked="0">
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="2.4"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="2.4"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@10@1" force_rhr="0">
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="77,175,74,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="77,175,74,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol force_rhr="0" type="marker" name="@10@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="77,175,74,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="77,175,74,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer class="SimpleLine" pass="10" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="77,175,74,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.36" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+        <layer pass="10" class="SimpleLine" enabled="1" locked="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="77,175,74,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.36"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="11" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="232,234,234,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="11" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="232,234,234,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="12" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="198,230,90,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="12" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="198,230,90,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="PointPatternFill" pass="0" enabled="1" locked="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="2.4" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="2.4" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+        <layer pass="0" class="PointPatternFill" enabled="1" locked="0">
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="2.4"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="2.4"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@12@1" force_rhr="0">
-            <layer class="FilledMarker" pass="0" enabled="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,255,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <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="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"/>
+          <symbol force_rhr="0" type="marker" name="@12@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="FilledMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,255,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <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="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" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="fill" clip_to_extent="1" alpha="1" name="@@12@1@0" force_rhr="0">
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                  <prop v="0,0,255,255" k="color"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.26" k="outline_width"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="solid" k="style"/>
+              <symbol force_rhr="0" type="fill" name="@@12@1@0" alpha="1" clip_to_extent="1">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+                  <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"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.26"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -391,862 +392,903 @@
             </layer>
           </symbol>
         </layer>
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.36" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+        <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.36"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="13" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="255,255,255,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="13" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,255,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="SVGFill" pass="0" enabled="1" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="183,72,75,255" k="color"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="pattern_width_map_unit_scale"/>
-          <prop v="MM" k="pattern_width_unit"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/sable.svg" k="svgFile"/>
-          <prop v="3x:0,0,0,0,0,0" k="svg_outline_width_map_unit_scale"/>
-          <prop v="MM" k="svg_outline_width_unit"/>
-          <prop v="20" k="width"/>
+        <layer pass="0" class="SVGFill" enabled="1" locked="0">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="183,72,75,255"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="pattern_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="pattern_width_unit" v="MM"/>
+          <prop k="svgFile" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/sable.svg"/>
+          <prop k="svg_outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="svg_outline_width_unit" v="MM"/>
+          <prop k="width" v="20"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" clip_to_extent="1" alpha="1" name="@13@1" force_rhr="0">
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="35,35,35,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol force_rhr="0" type="line" name="@13@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="35,35,35,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="14" force_rhr="0">
-        <layer class="PointPatternFill" pass="0" enabled="1" locked="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="2.4" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="2.4" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+      <symbol force_rhr="0" type="fill" name="14" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="PointPatternFill" enabled="1" locked="0">
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="2.4"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="2.4"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@14@0" force_rhr="0">
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="77,175,74,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="77,175,74,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol force_rhr="0" type="marker" name="@14@0" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="77,175,74,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="77,175,74,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="77,175,74,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.36" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+        <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="77,175,74,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.36"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="15" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="179,90,42,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="102,51,24,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="15" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="179,90,42,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="102,51,24,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="16" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="255,251,119,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="16" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,251,119,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="SVGFill" pass="0" enabled="1" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="183,72,75,255" k="color"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="pattern_width_map_unit_scale"/>
-          <prop v="MM" k="pattern_width_unit"/>
-          <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/sable.svg" k="svgFile"/>
-          <prop v="3x:0,0,0,0,0,0" k="svg_outline_width_map_unit_scale"/>
-          <prop v="MM" k="svg_outline_width_unit"/>
-          <prop v="20" k="width"/>
+        <layer pass="0" class="SVGFill" enabled="1" locked="0">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="183,72,75,255"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="pattern_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="pattern_width_unit" v="MM"/>
+          <prop k="svgFile" v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/sable.svg"/>
+          <prop k="svg_outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="svg_outline_width_unit" v="MM"/>
+          <prop k="width" v="20"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" clip_to_extent="1" alpha="1" name="@16@1" force_rhr="0">
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="35,35,35,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol force_rhr="0" type="line" name="@16@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="35,35,35,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="17" force_rhr="0">
-        <layer class="SimpleFill" pass="10" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="222,236,255,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.3" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="17" alpha="1" clip_to_extent="1">
+        <layer pass="10" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="222,236,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.3"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="CentroidFill" pass="11" enabled="1" locked="0">
-          <prop v="1" k="point_on_all_parts"/>
-          <prop v="0" k="point_on_surface"/>
+        <layer pass="11" class="CentroidFill" enabled="1" locked="0">
+          <prop k="point_on_all_parts" v="1"/>
+          <prop k="point_on_surface" v="0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@17@1" force_rhr="0">
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="255,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/style_caliec/symboles/tennis.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 force_rhr="0" type="marker" name="@17@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,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/style_caliec/symboles/tennis.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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="2" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="231,229,183,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="18" alpha="1" clip_to_extent="1">
+        <layer pass="21" class="CentroidFill" enabled="1" locked="0">
+          <prop k="point_on_all_parts" v="1"/>
+          <prop k="point_on_surface" v="0"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-        </layer>
-        <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
-          <prop v="45" k="angle"/>
-          <prop v="0,0,255,255" k="color"/>
-          <prop v="1" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <symbol type="line" clip_to_extent="1" alpha="1" name="@2@1" force_rhr="0">
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol force_rhr="0" type="marker" name="@18@0" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,255,255,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/style_caliec/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="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.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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="3" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="187,169,2,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="2" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="231,229,183,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
-          <prop v="45" k="angle"/>
-          <prop v="55,126,184,255" k="color"/>
-          <prop v="2" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+        <layer pass="0" class="LinePatternFill" enabled="1" locked="0">
+          <prop k="angle" v="45"/>
+          <prop k="color" v="0,0,255,255"/>
+          <prop k="distance" v="1"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" clip_to_extent="1" alpha="1" name="@3@1" force_rhr="0">
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol force_rhr="0" type="line" name="@2@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </layer>
-        <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
-          <prop v="0" k="angle"/>
-          <prop v="55,126,184,255" k="color"/>
-          <prop v="2" k="distance"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-          <prop v="MM" k="distance_unit"/>
-          <prop v="0.26" k="line_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <symbol type="line" clip_to_extent="1" alpha="1" name="@3@2" force_rhr="0">
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.3" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </layer>
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.46" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="4" force_rhr="0">
-        <layer class="SimpleFill" pass="10" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="255,255,255,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.3" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="no" k="style"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="5" force_rhr="0">
-        <layer class="SimpleFill" pass="10" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="222,236,255,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.3" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-        <layer class="CentroidFill" pass="11" enabled="1" locked="0">
-          <prop v="1" k="point_on_all_parts"/>
-          <prop v="0" k="point_on_surface"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@5@1" force_rhr="0">
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="255,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/style_caliec/symboles/basket.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"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="6" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="95,255,95,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="no" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="3" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="187,169,2,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-      </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="7" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="25,140,255,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="no" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+        <layer pass="0" class="LinePatternFill" enabled="1" locked="0">
+          <prop k="angle" v="45"/>
+          <prop k="color" v="55,126,184,255"/>
+          <prop k="distance" v="2"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="8" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="255,246,205,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-        <layer class="PointPatternFill" pass="0" enabled="1" locked="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="1.7" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="1.7" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@8@1" force_rhr="0">
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol force_rhr="0" type="line" name="@3@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.3"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.36" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+        <layer pass="0" class="LinePatternFill" enabled="1" locked="0">
+          <prop k="angle" v="0"/>
+          <prop k="color" v="55,126,184,255"/>
+          <prop k="distance" v="2"/>
+          <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_unit" v="MM"/>
+          <prop k="line_width" v="0.26"/>
+          <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="line" name="@3@2" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.3"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+        <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.46"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" clip_to_extent="1" alpha="1" name="9" force_rhr="0">
-        <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-          <prop v="0,142,54,255" k="color"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="35,35,35,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0.26" k="outline_width"/>
-          <prop v="MM" k="outline_width_unit"/>
-          <prop v="solid" k="style"/>
+      <symbol force_rhr="0" type="fill" name="4" alpha="1" clip_to_extent="1">
+        <layer pass="10" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,255,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.3"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="no"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer class="PointPatternFill" pass="0" enabled="1" locked="0">
-          <prop v="1.2" k="displacement_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
-          <prop v="MM" k="displacement_x_unit"/>
-          <prop v="0" k="displacement_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="displacement_y_map_unit_scale"/>
-          <prop v="MM" k="displacement_y_unit"/>
-          <prop v="2.4" k="distance_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_x_map_unit_scale"/>
-          <prop v="MM" k="distance_x_unit"/>
-          <prop v="2.4" k="distance_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="distance_y_map_unit_scale"/>
-          <prop v="MM" k="distance_y_unit"/>
-          <prop v="0" k="offset_x"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_x_map_unit_scale"/>
-          <prop v="MM" k="offset_x_unit"/>
-          <prop v="0" k="offset_y"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_y_map_unit_scale"/>
-          <prop v="MM" k="offset_y_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="MM" k="outline_width_unit"/>
+      </symbol>
+      <symbol force_rhr="0" type="fill" name="5" alpha="1" clip_to_extent="1">
+        <layer pass="10" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="222,236,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.3"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@9@1" force_rhr="0">
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="77,175,74,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="77,175,74,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+        </layer>
+        <layer pass="11" class="CentroidFill" enabled="1" locked="0">
+          <prop k="point_on_all_parts" v="1"/>
+          <prop k="point_on_surface" v="0"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="marker" name="@5@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,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/style_caliec/symboles/basket.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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" name="6" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="95,255,95,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="no"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" name="7" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="25,140,255,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="no"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" name="8" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="255,246,205,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+        <layer pass="0" class="PointPatternFill" enabled="1" locked="0">
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="1.7"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="1.7"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="marker" name="@8@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+        <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.36"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol force_rhr="0" type="fill" name="9" alpha="1" clip_to_extent="1">
+        <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+          <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="color" v="0,142,54,255"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="outline_color" v="35,35,35,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0.26"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <prop k="style" v="solid"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+        <layer pass="0" class="PointPatternFill" enabled="1" locked="0">
+          <prop k="displacement_x" v="1.2"/>
+          <prop k="displacement_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_x_unit" v="MM"/>
+          <prop k="displacement_y" v="0"/>
+          <prop k="displacement_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="displacement_y_unit" v="MM"/>
+          <prop k="distance_x" v="2.4"/>
+          <prop k="distance_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_x_unit" v="MM"/>
+          <prop k="distance_y" v="2.4"/>
+          <prop k="distance_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="distance_y_unit" v="MM"/>
+          <prop k="offset_x" v="0"/>
+          <prop k="offset_x_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_x_unit" v="MM"/>
+          <prop k="offset_y" v="0"/>
+          <prop k="offset_y_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_y_unit" v="MM"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="MM"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <symbol force_rhr="0" type="marker" name="@9@1" alpha="1" clip_to_extent="1">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="77,175,74,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="77,175,74,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1256,161 +1298,161 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{d1ef34ca-0fe5-421f-a1e8-e26e6085f17d}">
-      <rule description="parking" filter="&quot;amenity&quot;='parking'" key="{14e23eeb-1d34-404c-8daf-7faeaa99cd38}">
+    <rules key="{8ef2e754-3612-42e7-b5e9-ab55674f1cc4}">
+      <rule filter="&quot;amenity&quot;='parking'" key="{b53437de-4c4b-4531-84cb-2aa57286c45c}" description="parking">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontFamily="Liberation Sans" fieldName="'P'" namedStyle="Bold" fontSize="10" textColor="0,149,255,255" isExpression="1" blendMode="0" useSubstitutions="0" fontUnderline="0" fontSizeUnit="MapUnit" multilineHeight="1" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontStrikeout="0" fontKerning="1" textOpacity="1" fontItalic="0" fontWeight="75">
-            <text-buffer bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferDraw="0"/>
-            <background shapeOffsetY="0" shapeRotationType="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiY="0" shapeOpacity="1" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeBorderWidth="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBlendMode="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM">
-              <symbol type="marker" clip_to_extent="1" alpha="1" name="markerSymbol" force_rhr="0">
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="164,113,88,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+          <text-style useSubstitutions="0" fontKerning="1" fontLetterSpacing="0" fontFamily="Liberation Sans" namedStyle="Bold" blendMode="0" fontCapitals="0" fontSizeUnit="MapUnit" fieldName="'P'" fontWeight="75" isExpression="1" fontSize="10" previewBkgrdColor="255,255,255,255" fontItalic="0" textColor="0,149,255,255" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" textOpacity="1" multilineHeight="1" textOrientation="horizontal" fontWordSpacing="0">
+            <text-buffer bufferSizeUnits="MM" bufferSize="1" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <background shapeJoinStyle="64" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSizeY="0" shapeSizeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeOffsetUnit="MM" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeBlendMode="0" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0">
+              <symbol force_rhr="0" type="marker" name="markerSymbol" alpha="1" clip_to_extent="1">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="164,113,88,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetAngle="135" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowBlendMode="6"/>
+            <shadow shadowColor="0,0,0,255" shadowOffsetDist="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" placeDirectionSymbol="0" decimals="3" formatNumbers="0"/>
-          <placement centroidWhole="0" repeatDistance="0" geometryGeneratorEnabled="0" placementFlags="10" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" overrunDistance="0" centroidInside="0" offsetType="0" repeatDistanceUnits="MM" placement="0" rotationAngle="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" maxCurvedCharAngleIn="25" layerType="PolygonGeometry" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceUnit="MM" priority="5" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGenerator=""/>
-          <rendering minFeatureSize="0" limitNumLabels="0" drawLabels="1" scaleVisibility="0" mergeLines="0" fontLimitPixelSize="0" obstacleType="0" maxNumLabels="2000" scaleMax="0" fontMinPixelSize="3" obstacle="1" labelPerPart="0" scaleMin="0" obstacleFactor="1" zIndex="0" upsidedownLabels="0" fontMaxPixelSize="10000" displayAll="0"/>
+          <text-format formatNumbers="0" placeDirectionSymbol="0" autoWrapLength="0" wrapChar="" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" addDirectionSymbol="0" reverseDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" dist="0" rotationAngle="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" quadOffset="4" overrunDistanceUnit="MM" xOffset="0" geometryGeneratorEnabled="0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" geometryGenerator="" fitInPolygonOnly="0" placementFlags="10" maxCurvedCharAngleIn="25" priority="5" offsetType="0" yOffset="0" distUnits="MM" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" layerType="PolygonGeometry" maxCurvedCharAngleOut="-25" repeatDistance="0" placement="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0"/>
+          <rendering maxNumLabels="2000" limitNumLabels="0" obstacleFactor="1" obstacleType="0" mergeLines="0" displayAll="0" obstacle="1" scaleVisibility="0" minFeatureSize="0" upsidedownLabels="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="lineSymbol" 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 class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot;>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </rule>
-      <rule description="jeux" filter="&quot;leisure&quot;='playground'" key="{af3c674f-155f-461e-b300-0fe613093c75}">
+      <rule filter="&quot;leisure&quot;='playground'" key="{2e43d15a-eb15-4d12-be19-46e26c2653fb}" description="jeux">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontFamily="Liberation Sans" fieldName="'parc à jeux'" namedStyle="Regular" fontSize="10" textColor="0,0,0,255" isExpression="1" blendMode="0" useSubstitutions="0" fontUnderline="0" fontSizeUnit="Point" multilineHeight="1" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontStrikeout="0" fontKerning="1" textOpacity="1" fontItalic="0" fontWeight="50">
-            <text-buffer bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferDraw="1"/>
-            <background shapeOffsetY="0" shapeRotationType="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiY="0" shapeOpacity="1" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeBorderWidth="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBlendMode="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM">
-              <symbol type="marker" clip_to_extent="1" alpha="1" name="markerSymbol" force_rhr="0">
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="225,89,137,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 useSubstitutions="0" fontKerning="1" fontLetterSpacing="0" fontFamily="Liberation Sans" namedStyle="Regular" blendMode="0" fontCapitals="0" fontSizeUnit="Point" fieldName="'parc à jeux'" fontWeight="50" isExpression="1" fontSize="10" previewBkgrdColor="255,255,255,255" fontItalic="0" textColor="0,0,0,255" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" textOpacity="1" multilineHeight="1" textOrientation="horizontal" fontWordSpacing="0">
+            <text-buffer bufferSizeUnits="MM" bufferSize="1" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <background shapeJoinStyle="64" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSizeY="0" shapeSizeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeOffsetUnit="MM" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeBlendMode="0" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0">
+              <symbol force_rhr="0" type="marker" name="markerSymbol" alpha="1" clip_to_extent="1">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="225,89,137,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" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetAngle="135" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowBlendMode="6"/>
+            <shadow shadowColor="0,0,0,255" shadowOffsetDist="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format wrapChar="" autoWrapLength="5" useMaxLineLengthForAutoWrap="1" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" placeDirectionSymbol="0" decimals="3" formatNumbers="0"/>
-          <placement centroidWhole="0" repeatDistance="0" geometryGeneratorEnabled="0" placementFlags="10" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" overrunDistance="0" centroidInside="0" offsetType="0" repeatDistanceUnits="MM" placement="0" rotationAngle="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" dist="0" maxCurvedCharAngleIn="25" layerType="PolygonGeometry" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceUnit="MM" priority="5" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGenerator=""/>
-          <rendering minFeatureSize="0" limitNumLabels="0" drawLabels="1" scaleVisibility="0" mergeLines="0" fontLimitPixelSize="0" obstacleType="0" maxNumLabels="2000" scaleMax="0" fontMinPixelSize="3" obstacle="1" labelPerPart="0" scaleMin="0" obstacleFactor="1" zIndex="0" upsidedownLabels="0" fontMaxPixelSize="10000" displayAll="0"/>
+          <text-format formatNumbers="0" placeDirectionSymbol="0" autoWrapLength="5" wrapChar="" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" addDirectionSymbol="0" reverseDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" dist="0" rotationAngle="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" quadOffset="4" overrunDistanceUnit="MM" xOffset="0" geometryGeneratorEnabled="0" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" geometryGenerator="" fitInPolygonOnly="0" placementFlags="10" maxCurvedCharAngleIn="25" priority="5" offsetType="0" yOffset="0" distUnits="MM" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" layerType="PolygonGeometry" maxCurvedCharAngleOut="-25" repeatDistance="0" placement="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0"/>
+          <rendering maxNumLabels="2000" limitNumLabels="0" obstacleFactor="1" obstacleType="0" mergeLines="0" displayAll="0" obstacle="1" scaleVisibility="0" minFeatureSize="0" upsidedownLabels="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMin="0" fontLimitPixelSize="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="lineSymbol" 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 class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot;>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
@@ -1477,27 +1519,27 @@
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
   <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory rotationOffset="270" penWidth="0" width="15" minimumSize="0" backgroundColor="#ffffff" height="15" sizeType="MM" penColor="#000000" opacity="1" labelPlacementMethod="XHeight" backgroundAlpha="255" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" penAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" maxScaleDenominator="1e+08" diagramOrientation="Up">
+    <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" height="15" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" maxScaleDenominator="1e+08" minimumSize="0" backgroundAlpha="255" opacity="1" penWidth="0" width="15" minScaleDenominator="0" penAlpha="255" labelPlacementMethod="XHeight" rotationOffset="270" penColor="#000000" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" diagramOrientation="Up" barWidth="5" lineSizeType="MM">
       <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
       <attribute label="" field="" color="#000000"/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" zIndex="0" placement="1" obstacle="0" dist="0">
+  <DiagramLayerSettings priority="0" linePlacementFlags="18" placement="1" dist="0" showAll="1" zIndex="0" obstacle="0">
     <properties>
       <Option type="Map">
-        <Option type="QString" name="name" value=""/>
+        <Option value="" type="QString" name="name"/>
         <Option name="properties"/>
-        <Option type="QString" name="type" value="collection"/>
+        <Option value="collection" type="QString" name="type"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
-  <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+  <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
     <activeChecks/>
     <checkConfiguration type="Map">
       <Option type="Map" name="QgsGeometryGapCheck">
-        <Option type="double" name="allowedGapsBuffer" value="0"/>
-        <Option type="bool" name="allowedGapsEnabled" value="false"/>
-        <Option type="QString" name="allowedGapsLayer" value=""/>
+        <Option value="0" type="double" name="allowedGapsBuffer"/>
+        <Option value="false" type="bool" name="allowedGapsEnabled"/>
+        <Option value="" type="QString" name="allowedGapsLayer"/>
       </Option>
     </checkConfiguration>
   </geometryOptions>
@@ -1698,13 +1740,6 @@
         </config>
       </editWidget>
     </field>
-    <field name="phone">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
     <field name="operator:type">
       <editWidget type="TextEdit">
         <config>
@@ -1719,112 +1754,14 @@
         </config>
       </editWidget>
     </field>
-    <field name="contact:street">
+    <field name="contact:phone">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="contact:housenumber">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="check_date:opening_hours">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:street">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:postcode">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:housenumber">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:city">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="fee">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="operator">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="surface">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="highway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wall">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="roof:shape">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="roof:levels">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="description">
+    <field name="layer">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1838,70 +1775,49 @@
         </config>
       </editWidget>
     </field>
-    <field name="leaf_type">
+    <field name="changing_table">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="CLC:year">
+    <field name="access">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="CLC:id">
+    <field name="short_name">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="CLC:code">
+    <field name="government">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wikipedia">
+    <field name="wall">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wikidata">
+    <field name="wheelchair">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="start_date">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:url">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="ref:INSEE">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="political_division">
+    <field name="addr:street">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1910,64 +1826,46 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias name="" field="fid" index="0"/>
-    <alias name="" field="osm_id" index="1"/>
-    <alias name="" field="osm_way_id" index="2"/>
-    <alias name="" field="name" index="3"/>
-    <alias name="" field="type" index="4"/>
-    <alias name="" field="aeroway" index="5"/>
-    <alias name="" field="amenity" index="6"/>
-    <alias name="" field="admin_level" index="7"/>
-    <alias name="" field="barrier" index="8"/>
-    <alias name="" field="boundary" index="9"/>
-    <alias name="" field="building" index="10"/>
-    <alias name="" field="craft" index="11"/>
-    <alias name="" field="geological" index="12"/>
-    <alias name="" field="historic" index="13"/>
-    <alias name="" field="land_area" index="14"/>
-    <alias name="" field="landuse" index="15"/>
-    <alias name="" field="leisure" index="16"/>
-    <alias name="" field="man_made" index="17"/>
-    <alias name="" field="military" index="18"/>
-    <alias name="" field="natural" index="19"/>
-    <alias name="" field="office" index="20"/>
-    <alias name="" field="place" index="21"/>
-    <alias name="" field="shop" index="22"/>
-    <alias name="" field="sport" index="23"/>
-    <alias name="" field="tourism" index="24"/>
-    <alias name="" field="other_tags" index="25"/>
-    <alias name="" field="school:FR" index="26"/>
-    <alias name="" field="ref:UAI" index="27"/>
-    <alias name="" field="phone" index="28"/>
-    <alias name="" field="operator:type" index="29"/>
-    <alias name="" field="opening_hours" index="30"/>
-    <alias name="" field="contact:street" index="31"/>
-    <alias name="" field="contact:housenumber" index="32"/>
-    <alias name="" field="check_date:opening_hours" index="33"/>
-    <alias name="" field="addr:street" index="34"/>
-    <alias name="" field="addr:postcode" index="35"/>
-    <alias name="" field="addr:housenumber" index="36"/>
-    <alias name="" field="addr:city" index="37"/>
-    <alias name="" field="fee" index="38"/>
-    <alias name="" field="access" index="39"/>
-    <alias name="" field="operator" index="40"/>
-    <alias name="" field="surface" index="41"/>
-    <alias name="" field="highway" index="42"/>
-    <alias name="" field="wall" index="43"/>
-    <alias name="" field="roof:shape" index="44"/>
-    <alias name="" field="roof:levels" index="45"/>
-    <alias name="" field="description" index="46"/>
-    <alias name="" field="building:levels" index="47"/>
-    <alias name="" field="leaf_type" index="48"/>
-    <alias name="" field="CLC:year" index="49"/>
-    <alias name="" field="CLC:id" index="50"/>
-    <alias name="" field="CLC:code" index="51"/>
-    <alias name="" field="wikipedia" index="52"/>
-    <alias name="" field="wikidata" index="53"/>
-    <alias name="" field="start_date" index="54"/>
-    <alias name="" field="source:url" index="55"/>
-    <alias name="" field="ref:INSEE" index="56"/>
-    <alias name="" field="political_division" index="57"/>
+    <alias field="fid" name="" index="0"/>
+    <alias field="osm_id" name="" index="1"/>
+    <alias field="osm_way_id" name="" index="2"/>
+    <alias field="name" name="" index="3"/>
+    <alias field="type" name="" index="4"/>
+    <alias field="aeroway" name="" index="5"/>
+    <alias field="amenity" name="" index="6"/>
+    <alias field="admin_level" name="" index="7"/>
+    <alias field="barrier" name="" index="8"/>
+    <alias field="boundary" name="" index="9"/>
+    <alias field="building" name="" index="10"/>
+    <alias field="craft" name="" index="11"/>
+    <alias field="geological" name="" index="12"/>
+    <alias field="historic" name="" index="13"/>
+    <alias field="land_area" name="" index="14"/>
+    <alias field="landuse" name="" index="15"/>
+    <alias field="leisure" name="" index="16"/>
+    <alias field="man_made" name="" index="17"/>
+    <alias field="military" name="" index="18"/>
+    <alias field="natural" name="" index="19"/>
+    <alias field="office" name="" index="20"/>
+    <alias field="place" name="" index="21"/>
+    <alias field="shop" name="" index="22"/>
+    <alias field="sport" name="" index="23"/>
+    <alias field="tourism" name="" index="24"/>
+    <alias field="other_tags" name="" index="25"/>
+    <alias field="school:FR" name="" index="26"/>
+    <alias field="ref:UAI" name="" index="27"/>
+    <alias field="operator:type" name="" index="28"/>
+    <alias field="opening_hours" name="" index="29"/>
+    <alias field="contact:phone" name="" index="30"/>
+    <alias field="layer" name="" index="31"/>
+    <alias field="building:levels" name="" index="32"/>
+    <alias field="changing_table" name="" index="33"/>
+    <alias field="access" name="" index="34"/>
+    <alias field="short_name" name="" index="35"/>
+    <alias field="government" name="" index="36"/>
+    <alias field="wall" name="" index="37"/>
+    <alias field="wheelchair" name="" index="38"/>
+    <alias field="addr:street" name="" index="39"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
@@ -2000,242 +1898,170 @@
     <default expression="" field="other_tags" applyOnUpdate="0"/>
     <default expression="" field="school:FR" applyOnUpdate="0"/>
     <default expression="" field="ref:UAI" applyOnUpdate="0"/>
-    <default expression="" field="phone" applyOnUpdate="0"/>
     <default expression="" field="operator:type" applyOnUpdate="0"/>
     <default expression="" field="opening_hours" applyOnUpdate="0"/>
-    <default expression="" field="contact:street" applyOnUpdate="0"/>
-    <default expression="" field="contact:housenumber" applyOnUpdate="0"/>
-    <default expression="" field="check_date:opening_hours" applyOnUpdate="0"/>
-    <default expression="" field="addr:street" applyOnUpdate="0"/>
-    <default expression="" field="addr:postcode" applyOnUpdate="0"/>
-    <default expression="" field="addr:housenumber" applyOnUpdate="0"/>
-    <default expression="" field="addr:city" applyOnUpdate="0"/>
-    <default expression="" field="fee" applyOnUpdate="0"/>
-    <default expression="" field="access" applyOnUpdate="0"/>
-    <default expression="" field="operator" applyOnUpdate="0"/>
-    <default expression="" field="surface" applyOnUpdate="0"/>
-    <default expression="" field="highway" applyOnUpdate="0"/>
-    <default expression="" field="wall" applyOnUpdate="0"/>
-    <default expression="" field="roof:shape" applyOnUpdate="0"/>
-    <default expression="" field="roof:levels" applyOnUpdate="0"/>
-    <default expression="" field="description" applyOnUpdate="0"/>
+    <default expression="" field="contact:phone" applyOnUpdate="0"/>
+    <default expression="" field="layer" applyOnUpdate="0"/>
     <default expression="" field="building:levels" applyOnUpdate="0"/>
-    <default expression="" field="leaf_type" applyOnUpdate="0"/>
-    <default expression="" field="CLC:year" applyOnUpdate="0"/>
-    <default expression="" field="CLC:id" applyOnUpdate="0"/>
-    <default expression="" field="CLC:code" applyOnUpdate="0"/>
-    <default expression="" field="wikipedia" applyOnUpdate="0"/>
-    <default expression="" field="wikidata" applyOnUpdate="0"/>
-    <default expression="" field="start_date" applyOnUpdate="0"/>
-    <default expression="" field="source:url" applyOnUpdate="0"/>
-    <default expression="" field="ref:INSEE" applyOnUpdate="0"/>
-    <default expression="" field="political_division" applyOnUpdate="0"/>
+    <default expression="" field="changing_table" applyOnUpdate="0"/>
+    <default expression="" field="access" applyOnUpdate="0"/>
+    <default expression="" field="short_name" applyOnUpdate="0"/>
+    <default expression="" field="government" applyOnUpdate="0"/>
+    <default expression="" field="wall" applyOnUpdate="0"/>
+    <default expression="" field="wheelchair" applyOnUpdate="0"/>
+    <default expression="" field="addr:street" applyOnUpdate="0"/>
   </defaults>
   <constraints>
-    <constraint unique_strength="1" exp_strength="0" field="fid" constraints="3" notnull_strength="1"/>
-    <constraint unique_strength="0" exp_strength="0" field="osm_id" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="osm_way_id" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="name" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="type" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="aeroway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="amenity" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="admin_level" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="barrier" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="boundary" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="building" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="craft" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="geological" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="historic" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="land_area" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="landuse" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="leisure" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="man_made" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="military" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="natural" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="office" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="place" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="shop" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="sport" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="tourism" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="other_tags" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="school:FR" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="ref:UAI" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="phone" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="operator:type" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="opening_hours" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="contact:street" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="contact:housenumber" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="check_date:opening_hours" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="addr:street" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="addr:postcode" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="addr:housenumber" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="addr:city" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="fee" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="access" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="operator" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="surface" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="highway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="wall" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="roof:shape" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="roof:levels" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="description" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="building:levels" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="leaf_type" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="CLC:year" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="CLC:id" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="CLC:code" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="wikipedia" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="wikidata" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="start_date" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="source:url" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="ref:INSEE" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="political_division" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="1" notnull_strength="1" constraints="3" field="fid" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_way_id" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="aeroway" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="amenity" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="admin_level" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="barrier" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="boundary" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="craft" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="geological" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="historic" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="land_area" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="landuse" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="leisure" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="man_made" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="military" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="natural" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="office" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="place" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="shop" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="sport" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="tourism" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="other_tags" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="school:FR" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="ref:UAI" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="operator:type" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="opening_hours" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="contact:phone" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="layer" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building:levels" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="changing_table" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="access" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="short_name" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="government" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="wall" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="wheelchair" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="addr:street" exp_strength="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint desc="" exp="" field="fid"/>
-    <constraint desc="" exp="" field="osm_id"/>
-    <constraint desc="" exp="" field="osm_way_id"/>
-    <constraint desc="" exp="" field="name"/>
-    <constraint desc="" exp="" field="type"/>
-    <constraint desc="" exp="" field="aeroway"/>
-    <constraint desc="" exp="" field="amenity"/>
-    <constraint desc="" exp="" field="admin_level"/>
-    <constraint desc="" exp="" field="barrier"/>
-    <constraint desc="" exp="" field="boundary"/>
-    <constraint desc="" exp="" field="building"/>
-    <constraint desc="" exp="" field="craft"/>
-    <constraint desc="" exp="" field="geological"/>
-    <constraint desc="" exp="" field="historic"/>
-    <constraint desc="" exp="" field="land_area"/>
-    <constraint desc="" exp="" field="landuse"/>
-    <constraint desc="" exp="" field="leisure"/>
-    <constraint desc="" exp="" field="man_made"/>
-    <constraint desc="" exp="" field="military"/>
-    <constraint desc="" exp="" field="natural"/>
-    <constraint desc="" exp="" field="office"/>
-    <constraint desc="" exp="" field="place"/>
-    <constraint desc="" exp="" field="shop"/>
-    <constraint desc="" exp="" field="sport"/>
-    <constraint desc="" exp="" field="tourism"/>
-    <constraint desc="" exp="" field="other_tags"/>
-    <constraint desc="" exp="" field="school:FR"/>
-    <constraint desc="" exp="" field="ref:UAI"/>
-    <constraint desc="" exp="" field="phone"/>
-    <constraint desc="" exp="" field="operator:type"/>
-    <constraint desc="" exp="" field="opening_hours"/>
-    <constraint desc="" exp="" field="contact:street"/>
-    <constraint desc="" exp="" field="contact:housenumber"/>
-    <constraint desc="" exp="" field="check_date:opening_hours"/>
-    <constraint desc="" exp="" field="addr:street"/>
-    <constraint desc="" exp="" field="addr:postcode"/>
-    <constraint desc="" exp="" field="addr:housenumber"/>
-    <constraint desc="" exp="" field="addr:city"/>
-    <constraint desc="" exp="" field="fee"/>
-    <constraint desc="" exp="" field="access"/>
-    <constraint desc="" exp="" field="operator"/>
-    <constraint desc="" exp="" field="surface"/>
-    <constraint desc="" exp="" field="highway"/>
-    <constraint desc="" exp="" field="wall"/>
-    <constraint desc="" exp="" field="roof:shape"/>
-    <constraint desc="" exp="" field="roof:levels"/>
-    <constraint desc="" exp="" field="description"/>
-    <constraint desc="" exp="" field="building:levels"/>
-    <constraint desc="" exp="" field="leaf_type"/>
-    <constraint desc="" exp="" field="CLC:year"/>
-    <constraint desc="" exp="" field="CLC:id"/>
-    <constraint desc="" exp="" field="CLC:code"/>
-    <constraint desc="" exp="" field="wikipedia"/>
-    <constraint desc="" exp="" field="wikidata"/>
-    <constraint desc="" exp="" field="start_date"/>
-    <constraint desc="" exp="" field="source:url"/>
-    <constraint desc="" exp="" field="ref:INSEE"/>
-    <constraint desc="" exp="" field="political_division"/>
+    <constraint exp="" field="fid" desc=""/>
+    <constraint exp="" field="osm_id" desc=""/>
+    <constraint exp="" field="osm_way_id" desc=""/>
+    <constraint exp="" field="name" desc=""/>
+    <constraint exp="" field="type" desc=""/>
+    <constraint exp="" field="aeroway" desc=""/>
+    <constraint exp="" field="amenity" desc=""/>
+    <constraint exp="" field="admin_level" desc=""/>
+    <constraint exp="" field="barrier" desc=""/>
+    <constraint exp="" field="boundary" desc=""/>
+    <constraint exp="" field="building" desc=""/>
+    <constraint exp="" field="craft" desc=""/>
+    <constraint exp="" field="geological" desc=""/>
+    <constraint exp="" field="historic" desc=""/>
+    <constraint exp="" field="land_area" desc=""/>
+    <constraint exp="" field="landuse" desc=""/>
+    <constraint exp="" field="leisure" desc=""/>
+    <constraint exp="" field="man_made" desc=""/>
+    <constraint exp="" field="military" desc=""/>
+    <constraint exp="" field="natural" desc=""/>
+    <constraint exp="" field="office" desc=""/>
+    <constraint exp="" field="place" desc=""/>
+    <constraint exp="" field="shop" desc=""/>
+    <constraint exp="" field="sport" desc=""/>
+    <constraint exp="" field="tourism" desc=""/>
+    <constraint exp="" field="other_tags" desc=""/>
+    <constraint exp="" field="school:FR" desc=""/>
+    <constraint exp="" field="ref:UAI" desc=""/>
+    <constraint exp="" field="operator:type" desc=""/>
+    <constraint exp="" field="opening_hours" desc=""/>
+    <constraint exp="" field="contact:phone" desc=""/>
+    <constraint exp="" field="layer" desc=""/>
+    <constraint exp="" field="building:levels" desc=""/>
+    <constraint exp="" field="changing_table" desc=""/>
+    <constraint exp="" field="access" desc=""/>
+    <constraint exp="" field="short_name" desc=""/>
+    <constraint exp="" field="government" desc=""/>
+    <constraint exp="" field="wall" desc=""/>
+    <constraint exp="" field="wheelchair" desc=""/>
+    <constraint exp="" field="addr:street" desc=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-    <actionsetting type="5" notificationMessage="" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{676f6083-041f-42af-bc64-0405fcdee5b3}" shortTitle="OpenStreetMap Browser">
+    <actionsetting icon="" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" shortTitle="OpenStreetMap Browser" capture="0" type="5" name="OpenStreetMap Browser" id="{82d5ba10-7fd0-4ff1-9b8d-35280ddeda75}" notificationMessage="" isEnabledOnlyWhenEditable="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="1" notificationMessage="" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" capture="0" id="{2daae3df-ae06-4780-820c-26e471e2bec6}" shortTitle="Mapillary">
+    <actionsetting icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" shortTitle="Mapillary" capture="0" type="1" name="Mapillary" id="{9673d501-5220-4234-827e-0423eb7c8e95}" notificationMessage="" isEnabledOnlyWhenEditable="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="1" notificationMessage="" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" capture="0" id="{99cae611-3fc2-431c-8fbd-6f17a718966c}" shortTitle="JOSM">
+    <actionsetting icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" shortTitle="JOSM" capture="0" type="1" name="JOSM" id="{ad56e380-7e93-43b4-bf36-0de70a915a0d}" notificationMessage="" isEnabledOnlyWhenEditable="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="5" notificationMessage="" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{b978bc1b-6c81-4c26-9edc-b299047bbd7e}" shortTitle="User default editor">
+    <actionsetting icon="" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" shortTitle="User default editor" capture="0" type="5" name="User default editor" id="{5dd75d23-fee2-4862-a0d4-ffec881709f9}" notificationMessage="" isEnabledOnlyWhenEditable="0">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
     <columns>
-      <column type="field" name="osm_id" width="-1" hidden="0"/>
-      <column type="field" name="building" width="-1" hidden="0"/>
-      <column type="actions" width="-1" hidden="1"/>
-      <column type="field" name="name" width="-1" hidden="0"/>
-      <column type="field" name="leisure" width="-1" hidden="0"/>
-      <column type="field" name="fid" width="-1" hidden="0"/>
-      <column type="field" name="landuse" width="-1" hidden="0"/>
-      <column type="field" name="natural" width="-1" hidden="0"/>
-      <column type="field" name="boundary" width="-1" hidden="0"/>
-      <column type="field" name="type" width="-1" hidden="0"/>
-      <column type="field" name="osm_way_id" width="-1" hidden="0"/>
-      <column type="field" name="aeroway" width="-1" hidden="0"/>
-      <column type="field" name="amenity" width="-1" hidden="0"/>
-      <column type="field" name="admin_level" width="-1" hidden="0"/>
-      <column type="field" name="barrier" width="-1" hidden="0"/>
-      <column type="field" name="craft" width="-1" hidden="0"/>
-      <column type="field" name="geological" width="-1" hidden="0"/>
-      <column type="field" name="historic" width="-1" hidden="0"/>
-      <column type="field" name="land_area" width="-1" hidden="0"/>
-      <column type="field" name="man_made" width="-1" hidden="0"/>
-      <column type="field" name="military" width="-1" hidden="0"/>
-      <column type="field" name="office" width="-1" hidden="0"/>
-      <column type="field" name="place" width="-1" hidden="0"/>
-      <column type="field" name="shop" width="-1" hidden="0"/>
-      <column type="field" name="sport" width="-1" hidden="0"/>
-      <column type="field" name="tourism" width="-1" hidden="0"/>
-      <column type="field" name="other_tags" width="-1" hidden="0"/>
-      <column type="field" name="wall" width="-1" hidden="0"/>
-      <column type="field" name="CLC:year" width="-1" hidden="0"/>
-      <column type="field" name="CLC:id" width="-1" hidden="0"/>
-      <column type="field" name="CLC:code" width="-1" hidden="0"/>
-      <column type="field" name="school:FR" width="-1" hidden="0"/>
-      <column type="field" name="surface" width="-1" hidden="0"/>
-      <column type="field" name="ref:UAI" width="-1" hidden="0"/>
-      <column type="field" name="phone" width="-1" hidden="0"/>
-      <column type="field" name="operator:type" width="-1" hidden="0"/>
-      <column type="field" name="opening_hours" width="-1" hidden="0"/>
-      <column type="field" name="contact:street" width="-1" hidden="0"/>
-      <column type="field" name="contact:housenumber" width="-1" hidden="0"/>
-      <column type="field" name="check_date:opening_hours" width="-1" hidden="0"/>
-      <column type="field" name="addr:street" width="-1" hidden="0"/>
-      <column type="field" name="addr:postcode" width="-1" hidden="0"/>
-      <column type="field" name="addr:housenumber" width="-1" hidden="0"/>
-      <column type="field" name="addr:city" width="-1" hidden="0"/>
-      <column type="field" name="fee" width="-1" hidden="0"/>
-      <column type="field" name="access" width="-1" hidden="0"/>
-      <column type="field" name="operator" width="-1" hidden="0"/>
-      <column type="field" name="highway" width="-1" hidden="0"/>
-      <column type="field" name="roof:shape" width="-1" hidden="0"/>
-      <column type="field" name="roof:levels" width="-1" hidden="0"/>
-      <column type="field" name="description" width="-1" hidden="0"/>
-      <column type="field" name="building:levels" width="-1" hidden="0"/>
-      <column type="field" name="leaf_type" width="-1" hidden="0"/>
-      <column type="field" name="wikipedia" width="-1" hidden="0"/>
-      <column type="field" name="wikidata" width="-1" hidden="0"/>
-      <column type="field" name="start_date" width="-1" hidden="0"/>
-      <column type="field" name="source:url" width="-1" hidden="0"/>
-      <column type="field" name="ref:INSEE" width="-1" hidden="0"/>
-      <column type="field" name="political_division" width="-1" hidden="0"/>
+      <column width="-1" type="field" name="osm_id" hidden="0"/>
+      <column width="-1" type="field" name="building" hidden="0"/>
+      <column width="-1" type="actions" hidden="1"/>
+      <column width="-1" type="field" name="name" hidden="0"/>
+      <column width="-1" type="field" name="leisure" hidden="0"/>
+      <column width="-1" type="field" name="fid" hidden="0"/>
+      <column width="-1" type="field" name="landuse" hidden="0"/>
+      <column width="-1" type="field" name="natural" hidden="0"/>
+      <column width="-1" type="field" name="boundary" hidden="0"/>
+      <column width="-1" type="field" name="type" hidden="0"/>
+      <column width="-1" type="field" name="osm_way_id" hidden="0"/>
+      <column width="-1" type="field" name="aeroway" hidden="0"/>
+      <column width="-1" type="field" name="amenity" hidden="0"/>
+      <column width="-1" type="field" name="admin_level" hidden="0"/>
+      <column width="-1" type="field" name="barrier" hidden="0"/>
+      <column width="-1" type="field" name="craft" hidden="0"/>
+      <column width="-1" type="field" name="geological" hidden="0"/>
+      <column width="-1" type="field" name="historic" hidden="0"/>
+      <column width="-1" type="field" name="land_area" hidden="0"/>
+      <column width="-1" type="field" name="man_made" hidden="0"/>
+      <column width="-1" type="field" name="military" hidden="0"/>
+      <column width="-1" type="field" name="office" hidden="0"/>
+      <column width="-1" type="field" name="place" hidden="0"/>
+      <column width="-1" type="field" name="shop" hidden="0"/>
+      <column width="-1" type="field" name="sport" hidden="0"/>
+      <column width="-1" type="field" name="tourism" hidden="0"/>
+      <column width="-1" type="field" name="other_tags" hidden="0"/>
+      <column width="-1" type="field" name="wall" hidden="0"/>
+      <column width="-1" type="field" name="school:FR" hidden="0"/>
+      <column width="-1" type="field" name="ref:UAI" hidden="0"/>
+      <column width="-1" type="field" name="operator:type" hidden="0"/>
+      <column width="-1" type="field" name="opening_hours" hidden="0"/>
+      <column width="-1" type="field" name="addr:street" hidden="0"/>
+      <column width="-1" type="field" name="access" hidden="0"/>
+      <column width="-1" type="field" name="building:levels" hidden="0"/>
+      <column width="-1" type="field" name="contact:phone" hidden="0"/>
+      <column width="-1" type="field" name="layer" hidden="0"/>
+      <column width="-1" type="field" name="changing_table" hidden="0"/>
+      <column width="-1" type="field" name="short_name" hidden="0"/>
+      <column width="-1" type="field" name="government" hidden="0"/>
+      <column width="-1" type="field" name="wheelchair" hidden="0"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -2266,128 +2092,131 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field name="CLC:code" editable="1"/>
-    <field name="CLC:id" editable="1"/>
-    <field name="CLC:year" editable="1"/>
-    <field name="access" editable="1"/>
-    <field name="addr:city" editable="1"/>
-    <field name="addr:housenumber" editable="1"/>
-    <field name="addr:postcode" editable="1"/>
-    <field name="addr:street" editable="1"/>
-    <field name="admin_level" editable="1"/>
-    <field name="admin_level_2" editable="1"/>
-    <field name="aeroway" editable="1"/>
-    <field name="aeroway_2" editable="1"/>
-    <field name="alt_name" editable="1"/>
-    <field name="amenity" editable="1"/>
-    <field name="amenity_2" editable="1"/>
-    <field name="barrier" editable="1"/>
-    <field name="barrier_2" editable="1"/>
-    <field name="blind" editable="1"/>
-    <field name="boundary" editable="1"/>
-    <field name="boundary_2" editable="1"/>
-    <field name="building" editable="1"/>
-    <field name="building:levels" editable="1"/>
-    <field name="building:min_level" editable="1"/>
-    <field name="building_2" editable="1"/>
-    <field name="capacity" editable="1"/>
-    <field name="check_date:opening_hours" editable="1"/>
-    <field name="contact:housenumber" editable="1"/>
-    <field name="contact:phone" editable="1"/>
-    <field name="contact:street" editable="1"/>
-    <field name="craft" editable="1"/>
-    <field name="craft_2" editable="1"/>
-    <field name="crop" editable="1"/>
-    <field name="denomination" editable="1"/>
-    <field name="description" editable="1"/>
-    <field name="disused:amenity" editable="1"/>
-    <field name="emergency" editable="1"/>
-    <field name="fee" editable="1"/>
-    <field name="female" editable="1"/>
-    <field name="fence_type" editable="1"/>
-    <field name="fid" editable="1"/>
-    <field name="full_id" editable="1"/>
-    <field name="garden:style" editable="1"/>
-    <field name="garden:type" editable="1"/>
-    <field name="geological" editable="1"/>
-    <field name="geological_2" editable="1"/>
-    <field name="height" editable="1"/>
-    <field name="highway" editable="1"/>
-    <field name="historic" editable="1"/>
-    <field name="historic_2" editable="1"/>
-    <field name="land_area" editable="1"/>
-    <field name="land_area_2" editable="1"/>
-    <field name="landuse" editable="1"/>
-    <field name="landuse_2" editable="1"/>
-    <field name="leaf_type" editable="1"/>
-    <field name="leisure" editable="1"/>
-    <field name="leisure_2" editable="1"/>
-    <field name="male" editable="1"/>
-    <field name="man_made" editable="1"/>
-    <field name="man_made_2" editable="1"/>
-    <field name="material" editable="1"/>
-    <field name="max_age" editable="1"/>
-    <field name="military" editable="1"/>
-    <field name="military_2" editable="1"/>
-    <field name="min_age" editable="1"/>
-    <field name="name" editable="1"/>
-    <field name="name:oc" editable="1"/>
-    <field name="name_2" editable="1"/>
-    <field name="natural" editable="1"/>
-    <field name="natural_2" editable="1"/>
-    <field name="office" editable="1"/>
-    <field name="office_2" editable="1"/>
-    <field name="opening_hours" editable="1"/>
-    <field name="operator" editable="1"/>
-    <field name="operator:type" editable="1"/>
-    <field name="operator_type" editable="1"/>
-    <field name="osm_id" editable="1"/>
-    <field name="osm_id_2" editable="1"/>
-    <field name="osm_type" editable="1"/>
-    <field name="osm_way_id" editable="1"/>
-    <field name="osm_way_id_2" editable="1"/>
-    <field name="other_tags" editable="1"/>
-    <field name="other_tags_2" editable="1"/>
-    <field name="parking" editable="1"/>
-    <field name="phone" editable="1"/>
-    <field name="place" editable="1"/>
-    <field name="place_2" editable="1"/>
-    <field name="political_division" editable="1"/>
-    <field name="population" editable="1"/>
-    <field name="postal_code" editable="1"/>
-    <field name="ref:FR:FINESS" editable="1"/>
-    <field name="ref:FR:SIRET" editable="1"/>
-    <field name="ref:INSEE" editable="1"/>
-    <field name="ref:UAI" editable="1"/>
-    <field name="religion" editable="1"/>
-    <field name="roof:levels" editable="1"/>
-    <field name="roof:material" editable="1"/>
-    <field name="roof:shape" editable="1"/>
-    <field name="school:FR" editable="1"/>
-    <field name="shop" editable="1"/>
-    <field name="shop_2" editable="1"/>
-    <field name="short_name" editable="1"/>
-    <field name="social_facility" editable="1"/>
-    <field name="social_facility:for" editable="1"/>
-    <field name="source:name:oc" editable="1"/>
-    <field name="source:population" editable="1"/>
-    <field name="source:url" editable="1"/>
-    <field name="sport" editable="1"/>
-    <field name="sport_2" editable="1"/>
-    <field name="start_date" editable="1"/>
-    <field name="street_cabinet" editable="1"/>
-    <field name="supervised" editable="1"/>
-    <field name="surface" editable="1"/>
-    <field name="tourism" editable="1"/>
-    <field name="tourism_2" editable="1"/>
-    <field name="type" editable="1"/>
-    <field name="type_2" editable="1"/>
-    <field name="wall" editable="1"/>
-    <field name="water" editable="1"/>
-    <field name="waterway" editable="1"/>
-    <field name="wheelchair" editable="1"/>
-    <field name="wikidata" editable="1"/>
-    <field name="wikipedia" editable="1"/>
+    <field editable="1" name="CLC:code"/>
+    <field editable="1" name="CLC:id"/>
+    <field editable="1" name="CLC:year"/>
+    <field editable="1" name="access"/>
+    <field editable="1" name="addr:city"/>
+    <field editable="1" name="addr:housenumber"/>
+    <field editable="1" name="addr:postcode"/>
+    <field editable="1" name="addr:street"/>
+    <field editable="1" name="admin_level"/>
+    <field editable="1" name="admin_level_2"/>
+    <field editable="1" name="aeroway"/>
+    <field editable="1" name="aeroway_2"/>
+    <field editable="1" name="alt_name"/>
+    <field editable="1" name="amenity"/>
+    <field editable="1" name="amenity_2"/>
+    <field editable="1" name="barrier"/>
+    <field editable="1" name="barrier_2"/>
+    <field editable="1" name="blind"/>
+    <field editable="1" name="boundary"/>
+    <field editable="1" name="boundary_2"/>
+    <field editable="1" name="building"/>
+    <field editable="1" name="building:levels"/>
+    <field editable="1" name="building:min_level"/>
+    <field editable="1" name="building_2"/>
+    <field editable="1" name="capacity"/>
+    <field editable="1" name="changing_table"/>
+    <field editable="1" name="check_date:opening_hours"/>
+    <field editable="1" name="contact:housenumber"/>
+    <field editable="1" name="contact:phone"/>
+    <field editable="1" name="contact:street"/>
+    <field editable="1" name="craft"/>
+    <field editable="1" name="craft_2"/>
+    <field editable="1" name="crop"/>
+    <field editable="1" name="denomination"/>
+    <field editable="1" name="description"/>
+    <field editable="1" name="disused:amenity"/>
+    <field editable="1" name="emergency"/>
+    <field editable="1" name="fee"/>
+    <field editable="1" name="female"/>
+    <field editable="1" name="fence_type"/>
+    <field editable="1" name="fid"/>
+    <field editable="1" name="full_id"/>
+    <field editable="1" name="garden:style"/>
+    <field editable="1" name="garden:type"/>
+    <field editable="1" name="geological"/>
+    <field editable="1" name="geological_2"/>
+    <field editable="1" name="government"/>
+    <field editable="1" name="height"/>
+    <field editable="1" name="highway"/>
+    <field editable="1" name="historic"/>
+    <field editable="1" name="historic_2"/>
+    <field editable="1" name="land_area"/>
+    <field editable="1" name="land_area_2"/>
+    <field editable="1" name="landuse"/>
+    <field editable="1" name="landuse_2"/>
+    <field editable="1" name="layer"/>
+    <field editable="1" name="leaf_type"/>
+    <field editable="1" name="leisure"/>
+    <field editable="1" name="leisure_2"/>
+    <field editable="1" name="male"/>
+    <field editable="1" name="man_made"/>
+    <field editable="1" name="man_made_2"/>
+    <field editable="1" name="material"/>
+    <field editable="1" name="max_age"/>
+    <field editable="1" name="military"/>
+    <field editable="1" name="military_2"/>
+    <field editable="1" name="min_age"/>
+    <field editable="1" name="name"/>
+    <field editable="1" name="name:oc"/>
+    <field editable="1" name="name_2"/>
+    <field editable="1" name="natural"/>
+    <field editable="1" name="natural_2"/>
+    <field editable="1" name="office"/>
+    <field editable="1" name="office_2"/>
+    <field editable="1" name="opening_hours"/>
+    <field editable="1" name="operator"/>
+    <field editable="1" name="operator:type"/>
+    <field editable="1" name="operator_type"/>
+    <field editable="1" name="osm_id"/>
+    <field editable="1" name="osm_id_2"/>
+    <field editable="1" name="osm_type"/>
+    <field editable="1" name="osm_way_id"/>
+    <field editable="1" name="osm_way_id_2"/>
+    <field editable="1" name="other_tags"/>
+    <field editable="1" name="other_tags_2"/>
+    <field editable="1" name="parking"/>
+    <field editable="1" name="phone"/>
+    <field editable="1" name="place"/>
+    <field editable="1" name="place_2"/>
+    <field editable="1" name="political_division"/>
+    <field editable="1" name="population"/>
+    <field editable="1" name="postal_code"/>
+    <field editable="1" name="ref:FR:FINESS"/>
+    <field editable="1" name="ref:FR:SIRET"/>
+    <field editable="1" name="ref:INSEE"/>
+    <field editable="1" name="ref:UAI"/>
+    <field editable="1" name="religion"/>
+    <field editable="1" name="roof:levels"/>
+    <field editable="1" name="roof:material"/>
+    <field editable="1" name="roof:shape"/>
+    <field editable="1" name="school:FR"/>
+    <field editable="1" name="shop"/>
+    <field editable="1" name="shop_2"/>
+    <field editable="1" name="short_name"/>
+    <field editable="1" name="social_facility"/>
+    <field editable="1" name="social_facility:for"/>
+    <field editable="1" name="source:name:oc"/>
+    <field editable="1" name="source:population"/>
+    <field editable="1" name="source:url"/>
+    <field editable="1" name="sport"/>
+    <field editable="1" name="sport_2"/>
+    <field editable="1" name="start_date"/>
+    <field editable="1" name="street_cabinet"/>
+    <field editable="1" name="supervised"/>
+    <field editable="1" name="surface"/>
+    <field editable="1" name="tourism"/>
+    <field editable="1" name="tourism_2"/>
+    <field editable="1" name="type"/>
+    <field editable="1" name="type_2"/>
+    <field editable="1" name="wall"/>
+    <field editable="1" name="water"/>
+    <field editable="1" name="waterway"/>
+    <field editable="1" name="wheelchair"/>
+    <field editable="1" name="wikidata"/>
+    <field editable="1" name="wikipedia"/>
   </editable>
   <labelOnTop>
     <field labelOnTop="0" name="CLC:code"/>
@@ -2415,6 +2244,7 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="building:min_level"/>
     <field labelOnTop="0" name="building_2"/>
     <field labelOnTop="0" name="capacity"/>
+    <field labelOnTop="0" name="changing_table"/>
     <field labelOnTop="0" name="check_date:opening_hours"/>
     <field labelOnTop="0" name="contact:housenumber"/>
     <field labelOnTop="0" name="contact:phone"/>
@@ -2435,6 +2265,7 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="garden:type"/>
     <field labelOnTop="0" name="geological"/>
     <field labelOnTop="0" name="geological_2"/>
+    <field labelOnTop="0" name="government"/>
     <field labelOnTop="0" name="height"/>
     <field labelOnTop="0" name="highway"/>
     <field labelOnTop="0" name="historic"/>
@@ -2443,6 +2274,7 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="land_area_2"/>
     <field labelOnTop="0" name="landuse"/>
     <field labelOnTop="0" name="landuse_2"/>
+    <field labelOnTop="0" name="layer"/>
     <field labelOnTop="0" name="leaf_type"/>
     <field labelOnTop="0" name="leisure"/>
     <field labelOnTop="0" name="leisure_2"/>