From 1feb971dafed95e499ce6ed2b4cca73eb4eb8a60 Mon Sep 17 00:00:00 2001
From: Thibault Coupin <thibault.coupin@gmail.com>
Date: Thu, 26 Jul 2018 21:51:25 +0200
Subject: [PATCH] [WMSServer] Fix QgsServerWMS and remove absolute path in qgs
 files

---
 .../testdata/qgis_server/getcapabilities.txt  |   10 +-
 tests/testdata/qgis_server/getcontext.txt     |    8 +-
 .../qgis_server/getprojectsettings.txt        |   16 +-
 .../qgis_server/wms_getcapabilities_1_1_1.txt |   10 +-
 .../qgis_server/wms_getcapabilities_1_3_0.txt |   10 +-
 .../project_groups.qgs                        | 1720 +++++++++--------
 .../testdata/qgis_server_project/project.qgs  |   16 +-
 7 files changed, 902 insertions(+), 888 deletions(-)

diff --git a/tests/testdata/qgis_server/getcapabilities.txt b/tests/testdata/qgis_server/getcapabilities.txt
index bae809b7fc5..1ed30e2ad84 100644
--- a/tests/testdata/qgis_server/getcapabilities.txt
+++ b/tests/testdata/qgis_server/getcapabilities.txt
@@ -180,8 +180,8 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Layer queryable="1">
-      <Name>testlayer</Name>
-      <Title>testlayer</Title>
+      <Name>testlayer2</Name>
+      <Title>testlayer2</Title>
       <CRS>CRS:84</CRS>
       <CRS>EPSG:4326</CRS>
       <CRS>EPSG:3857</CRS>
@@ -217,9 +217,9 @@ Content-Type: text/xml; charset=utf-8
     </EX_GeographicBoundingBox>
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-    <Layer queryable="1">
-      <Name>testlayer</Name>
-      <Title>testlayer</Title>
+    <Layer queryable="0">
+      <Name>testlayer3</Name>
+      <Title>testlayer3</Title>
       <CRS>CRS:84</CRS>
       <CRS>EPSG:4326</CRS>
       <CRS>EPSG:3857</CRS>
diff --git a/tests/testdata/qgis_server/getcontext.txt b/tests/testdata/qgis_server/getcontext.txt
index f5cbba5ab24..154e4ecf415 100644
--- a/tests/testdata/qgis_server/getcontext.txt
+++ b/tests/testdata/qgis_server/getcontext.txt
@@ -13,8 +13,8 @@ Content-Type: text/xml; charset=utf-8
   </ows:BoundingBox>
  </General>
  <ResourceList>
-  <Layer group="groupwithoutshortname" hidden="true" queryable="true" id="testlayer" name="testlayer" opacity="1">
-   <ows:Title>testlayer</ows:Title>
+  <Layer group="groupwithoutshortname" hidden="true" queryable="false" id="testlayer3" name="testlayer3" opacity="1">
+   <ows:Title>testlayer3</ows:Title>
    <ows:OutputFormat>image/png</ows:OutputFormat>
    <Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
     <OnlineResource xlink:href="https://www.qgis.org/?*****"/>
@@ -26,8 +26,8 @@ Content-Type: text/xml; charset=utf-8
     </Style>
    </StyleList>
   </Layer>
-  <Layer group="groupwithshortname" hidden="true" queryable="true" id="testlayer" name="testlayer" opacity="1">
-   <ows:Title>testlayer</ows:Title>
+  <Layer group="groupwithshortname" hidden="true" queryable="true" id="testlayer2" name="testlayer2" opacity="1">
+   <ows:Title>testlayer2</ows:Title>
    <ows:OutputFormat>image/png</ows:OutputFormat>
    <Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
     <OnlineResource xlink:href="https://www.qgis.org/?*****"/>
diff --git a/tests/testdata/qgis_server/getprojectsettings.txt b/tests/testdata/qgis_server/getprojectsettings.txt
index c774dd090c7..af32153105e 100644
--- a/tests/testdata/qgis_server/getprojectsettings.txt
+++ b/tests/testdata/qgis_server/getprojectsettings.txt
@@ -215,8 +215,8 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <TreeName>groupwithshortname</TreeName>
     <Layer geometryType="Point" queryable="1" displayField="id" visible="1">
-     <Name>testlayer</Name>
-     <Title>testlayer</Title>
+     <Name>testlayer2</Name>
+     <Title>testlayer2</Title>
      <CRS>CRS:84</CRS>
      <CRS>EPSG:4326</CRS>
      <CRS>EPSG:3857</CRS>
@@ -236,7 +236,7 @@ Content-Type: text/xml; charset=utf-8
        <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
       </LegendURL>
      </Style>
-     <TreeName>testlayer</TreeName>
+     <TreeName>testlayer2</TreeName>
      <Attributes>
       <Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" name="id" comment="" length="10"/>
       <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="name" comment="" length="10"/>
@@ -259,9 +259,9 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <TreeName>groupwithoutshortname</TreeName>
-    <Layer geometryType="Point" queryable="1" displayField="id" visible="1">
-     <Name>testlayer</Name>
-     <Title>testlayer</Title>
+    <Layer geometryType="Point" queryable="0" displayField="id" visible="1">
+     <Name>testlayer3</Name>
+     <Title>testlayer3</Title>
      <CRS>CRS:84</CRS>
      <CRS>EPSG:4326</CRS>
      <CRS>EPSG:3857</CRS>
@@ -281,7 +281,7 @@ Content-Type: text/xml; charset=utf-8
        <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
       </LegendURL>
      </Style>
-     <TreeName>testlayer</TreeName>
+     <TreeName>testlayer3</TreeName>
      <Attributes>
       <Attribute precision="0" type="qlonglong" editType="" typeName="Integer64" name="id" comment="" length="10"/>
       <Attribute precision="0" type="QString" editType="" typeName="String" name="name" comment="" length="10"/>
@@ -290,6 +290,6 @@ Content-Type: text/xml; charset=utf-8
     </Layer>
    </Layer>
   </Layer>
-  <LayerDrawingOrder>testlayer,testlayer,testlayer èé,layer_with_short_name</LayerDrawingOrder>
+  <LayerDrawingOrder>testlayer3,testlayer2,testlayer èé,layer_with_short_name</LayerDrawingOrder>
  </Capability>
 </WMS_Capabilities>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt b/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
index f035294010a..45f3772ac9b 100644
--- a/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
+++ b/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
@@ -160,8 +160,8 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
     <BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
     <Layer queryable="1">
-     <Name>testlayer</Name>
-     <Title>testlayer</Title>
+     <Name>testlayer2</Name>
+     <Title>testlayer2</Title>
      <SRS>CRS:84</SRS>
      <SRS>EPSG:4326</SRS>
      <SRS>EPSG:3857</SRS>
@@ -187,9 +187,9 @@ Content-Type: text/xml; charset=utf-8
     <LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
     <BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
     <BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
-    <Layer queryable="1">
-     <Name>testlayer</Name>
-     <Title>testlayer</Title>
+    <Layer queryable="0">
+     <Name>testlayer3</Name>
+     <Title>testlayer3</Title>
      <SRS>CRS:84</SRS>
      <SRS>EPSG:4326</SRS>
      <SRS>EPSG:3857</SRS>
diff --git a/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt b/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt
index bae809b7fc5..1ed30e2ad84 100644
--- a/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt
+++ b/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt
@@ -180,8 +180,8 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Layer queryable="1">
-      <Name>testlayer</Name>
-      <Title>testlayer</Title>
+      <Name>testlayer2</Name>
+      <Title>testlayer2</Title>
       <CRS>CRS:84</CRS>
       <CRS>EPSG:4326</CRS>
       <CRS>EPSG:3857</CRS>
@@ -217,9 +217,9 @@ Content-Type: text/xml; charset=utf-8
     </EX_GeographicBoundingBox>
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-    <Layer queryable="1">
-      <Name>testlayer</Name>
-      <Title>testlayer</Title>
+    <Layer queryable="0">
+      <Name>testlayer3</Name>
+      <Title>testlayer3</Title>
       <CRS>CRS:84</CRS>
       <CRS>EPSG:4326</CRS>
       <CRS>EPSG:3857</CRS>
diff --git a/tests/testdata/qgis_server_accesscontrol/project_groups.qgs b/tests/testdata/qgis_server_accesscontrol/project_groups.qgs
index 3f4ceba5378..bd1f6ee625d 100644
--- a/tests/testdata/qgis_server_accesscontrol/project_groups.qgs
+++ b/tests/testdata/qgis_server_accesscontrol/project_groups.qgs
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.2.0-Bonn" projectname="QGIS Server Hello World">
+<qgis projectname="QGIS Server Hello World" version="3.2.0-Bonn">
   <homePath path=""/>
   <title>QGIS Server Hello World</title>
   <autotransaction active="0"/>
@@ -7,61 +7,61 @@
   <trust active="0"/>
   <projectCrs>
     <spatialrefsys>
-      <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs</proj4>
-      <srsid>100035</srsid>
-      <srid>0</srid>
-      <authid>USER:100035</authid>
-      <description> * SCR généré (+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs)</description>
+      <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs</proj4>
+      <srsid>3857</srsid>
+      <srid>3857</srid>
+      <authid>EPSG:3857</authid>
+      <description>WGS 84 / Pseudo-Mercator</description>
       <projectionacronym>merc</projectionacronym>
-      <ellipsoidacronym></ellipsoidacronym>
+      <ellipsoidacronym>WGS84</ellipsoidacronym>
       <geographicflag>false</geographicflag>
     </spatialrefsys>
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;points&quot; (geom) sql=" providerKey="spatialite" id="points20150803121107046" expanded="1" name="db_point" checked="Qt::Checked">
+    <layer-tree-layer name="db_point" id="points20150803121107046" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;points&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Checked">
       <customproperties/>
     </layer-tree-layer>
-    <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" providerKey="spatialite" id="hello20131022151106574" expanded="1" name="Hello" checked="Qt::Checked">
+    <layer-tree-layer name="Hello" id="hello20131022151106574" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Checked">
       <customproperties/>
     </layer-tree-layer>
-    <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" providerKey="spatialite" id="Hello_copy20150804164427541" expanded="1" name="Hello_SubsetString" checked="Qt::Checked">
+    <layer-tree-layer name="Hello_SubsetString" id="Hello_copy20150804164427541" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Checked">
       <customproperties/>
     </layer-tree-layer>
-    <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=&quot;pkuid&quot; in ( 7, 8 )" providerKey="spatialite" id="Hello_SubsetString_copy20160222085231770" expanded="1" name="Hello_Project_SubsetString" checked="Qt::Checked">
+    <layer-tree-layer name="Hello_Project_SubsetString" id="Hello_SubsetString_copy20160222085231770" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=&quot;pkuid&quot; in ( 7, 8 )" expanded="1" providerKey="spatialite" checked="Qt::Checked">
       <customproperties/>
     </layer-tree-layer>
-    <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" providerKey="spatialite" id="Hello_Project_SubsetString_copy20160223113949592" expanded="1" name="Hello_Filter_SubsetString" checked="Qt::Checked">
+    <layer-tree-layer name="Hello_Filter_SubsetString" id="Hello_Project_SubsetString_copy20160223113949592" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Checked">
       <customproperties/>
     </layer-tree-layer>
-    <layer-tree-layer source="./dem.tif" providerKey="gdal" id="dem20150730091219559" expanded="0" name="dem" checked="Qt::Checked">
+    <layer-tree-layer name="dem" id="dem20150730091219559" source="./dem.tif" expanded="0" providerKey="gdal" checked="Qt::Checked">
       <customproperties/>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" name="CountryGroupWithShortName" checked="Qt::Checked">
+    <layer-tree-group name="CountryGroupWithShortName" expanded="1" checked="Qt::Checked">
       <customproperties>
         <property key="wmsAbstract" value=""/>
         <property key="wmsShortName" value="group_short_name"/>
         <property key="wmsTitle" value=""/>
       </customproperties>
-      <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" providerKey="spatialite" id="Country_07a7a712_8bf3_4cb0_abde_58338f73a4b2" expanded="1" name="Country copier" checked="Qt::Unchecked">
+      <layer-tree-layer name="Country copier" id="Country_07a7a712_8bf3_4cb0_abde_58338f73a4b2" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Unchecked">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" providerKey="spatialite" id="Country_Labels_67649087_4e95_4483_9c32_a9e14b8360db" expanded="1" name="Country_Labels copier" checked="Qt::Unchecked">
+      <layer-tree-layer name="Country_Labels copier" id="Country_Labels_67649087_4e95_4483_9c32_a9e14b8360db" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Unchecked">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" providerKey="spatialite" id="Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d" expanded="1" name="Country_Diagrams copier" checked="Qt::Unchecked">
+      <layer-tree-layer name="Country_Diagrams copier" id="Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Unchecked">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="CountryGroup" checked="Qt::Checked">
+    <layer-tree-group name="CountryGroup" expanded="1" checked="Qt::Checked">
       <customproperties/>
-      <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" providerKey="spatialite" id="country20131022151106556" expanded="1" name="Country" checked="Qt::Checked">
+      <layer-tree-layer name="Country" id="country20131022151106556" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Checked">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" providerKey="spatialite" id="Country_copy20161127151800736" expanded="1" name="Country_Labels" checked="Qt::Checked">
+      <layer-tree-layer name="Country_Labels" id="Country_copy20161127151800736" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" expanded="1" providerKey="spatialite" checked="Qt::Checked">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" providerKey="spatialite" id="country20170328164317226" expanded="0" name="Country_Diagrams" checked="Qt::Checked">
+      <layer-tree-layer name="Country_Diagrams" id="country20170328164317226" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" expanded="0" providerKey="spatialite" checked="Qt::Checked">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
@@ -80,107 +80,107 @@
       <item>Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="1" type="1" tolerance="40" intersection-snapping="0" mode="3" unit="1">
+  <snapping-settings intersection-snapping="0" tolerance="40" unit="1" type="1" mode="3" enabled="1">
     <individual-layer-settings>
-      <layer-setting units="2" enabled="1" type="1" tolerance="0" id="Country_copy20161127151800736"/>
-      <layer-setting units="2" enabled="1" type="1" tolerance="0" id="Hello_copy20150804164427541"/>
-      <layer-setting units="1" enabled="1" type="1" tolerance="12" id="Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d"/>
-      <layer-setting units="1" enabled="1" type="1" tolerance="40" id="hello20131022151106574"/>
-      <layer-setting units="2" enabled="1" type="1" tolerance="0" id="points20150803121107046"/>
-      <layer-setting units="2" enabled="0" type="1" tolerance="0" id="country20170328164317226"/>
-      <layer-setting units="2" enabled="1" type="1" tolerance="0" id="Hello_Project_SubsetString_copy20160223113949592"/>
-      <layer-setting units="1" enabled="1" type="1" tolerance="40" id="country20131022151106556"/>
-      <layer-setting units="1" enabled="1" type="1" tolerance="12" id="Country_07a7a712_8bf3_4cb0_abde_58338f73a4b2"/>
-      <layer-setting units="2" enabled="1" type="1" tolerance="0" id="Hello_SubsetString_copy20160222085231770"/>
-      <layer-setting units="1" enabled="1" type="1" tolerance="12" id="Country_Labels_67649087_4e95_4483_9c32_a9e14b8360db"/>
+      <layer-setting id="Hello_SubsetString_copy20160222085231770" tolerance="0" type="1" enabled="1" units="2"/>
+      <layer-setting id="hello20131022151106574" tolerance="40" type="1" enabled="1" units="1"/>
+      <layer-setting id="Hello_copy20150804164427541" tolerance="0" type="1" enabled="1" units="2"/>
+      <layer-setting id="points20150803121107046" tolerance="0" type="1" enabled="1" units="2"/>
+      <layer-setting id="Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d" tolerance="12" type="1" enabled="1" units="1"/>
+      <layer-setting id="Hello_Project_SubsetString_copy20160223113949592" tolerance="0" type="1" enabled="1" units="2"/>
+      <layer-setting id="Country_copy20161127151800736" tolerance="0" type="1" enabled="1" units="2"/>
+      <layer-setting id="Country_Labels_67649087_4e95_4483_9c32_a9e14b8360db" tolerance="12" type="1" enabled="1" units="1"/>
+      <layer-setting id="Country_07a7a712_8bf3_4cb0_abde_58338f73a4b2" tolerance="12" type="1" enabled="1" units="1"/>
+      <layer-setting id="country20131022151106556" tolerance="40" type="1" enabled="1" units="1"/>
+      <layer-setting id="country20170328164317226" tolerance="0" type="1" enabled="0" units="2"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>meters</units>
     <extent>
-      <xmin>-31805751.35382429882884026</xmin>
-      <ymin>-2319350.10585405677556992</ymin>
-      <xmax>28287238.18803702667355537</xmax>
-      <ymax>23505736.30883011966943741</ymax>
+      <xmin>-19299402.19027414172887802</xmin>
+      <ymin>-18237547.54576336964964867</ymin>
+      <xmax>19536700.87085317820310593</xmax>
+      <ymax>39423933.74873916804790497</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
       <spatialrefsys>
-        <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs</proj4>
-        <srsid>100035</srsid>
-        <srid>0</srid>
-        <authid>USER:100035</authid>
-        <description> * SCR généré (+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs)</description>
+        <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs</proj4>
+        <srsid>3857</srsid>
+        <srid>3857</srid>
+        <authid>EPSG:3857</authid>
+        <description>WGS 84 / Pseudo-Mercator</description>
         <projectionacronym>merc</projectionacronym>
-        <ellipsoidacronym></ellipsoidacronym>
+        <ellipsoidacronym>WGS84</ellipsoidacronym>
         <geographicflag>false</geographicflag>
       </spatialrefsys>
     </destinationsrs>
     <rendermaptile>0</rendermaptile>
   </mapcanvas>
   <legend updateDrawingOrder="true">
-    <legendlayer open="true" drawingOrder="-1" checked="Qt::Checked" name="db_point" showFeatureCount="0">
+    <legendlayer name="db_point" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
       <filegroup open="true" hidden="false">
-        <legendlayerfile isInOverview="0" visible="1" layerid="points20150803121107046"/>
+        <legendlayerfile layerid="points20150803121107046" visible="1" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendlayer open="true" drawingOrder="-1" checked="Qt::Checked" name="Hello" showFeatureCount="0">
+    <legendlayer name="Hello" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
       <filegroup open="true" hidden="false">
-        <legendlayerfile isInOverview="0" visible="1" layerid="hello20131022151106574"/>
+        <legendlayerfile layerid="hello20131022151106574" visible="1" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendlayer open="true" drawingOrder="-1" checked="Qt::Checked" name="Hello_SubsetString" showFeatureCount="0">
+    <legendlayer name="Hello_SubsetString" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
       <filegroup open="true" hidden="false">
-        <legendlayerfile isInOverview="0" visible="1" layerid="Hello_copy20150804164427541"/>
+        <legendlayerfile layerid="Hello_copy20150804164427541" visible="1" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendlayer open="true" drawingOrder="-1" checked="Qt::Checked" name="Hello_Project_SubsetString" showFeatureCount="0">
+    <legendlayer name="Hello_Project_SubsetString" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
       <filegroup open="true" hidden="false">
-        <legendlayerfile isInOverview="0" visible="1" layerid="Hello_SubsetString_copy20160222085231770"/>
+        <legendlayerfile layerid="Hello_SubsetString_copy20160222085231770" visible="1" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendlayer open="true" drawingOrder="-1" checked="Qt::Checked" name="Hello_Filter_SubsetString" showFeatureCount="0">
+    <legendlayer name="Hello_Filter_SubsetString" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
       <filegroup open="true" hidden="false">
-        <legendlayerfile isInOverview="0" visible="1" layerid="Hello_Project_SubsetString_copy20160223113949592"/>
+        <legendlayerfile layerid="Hello_Project_SubsetString_copy20160223113949592" visible="1" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendlayer open="false" drawingOrder="-1" checked="Qt::Checked" name="dem" showFeatureCount="0">
+    <legendlayer name="dem" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Checked">
       <filegroup open="false" hidden="false">
-        <legendlayerfile isInOverview="0" visible="1" layerid="dem20150730091219559"/>
+        <legendlayerfile layerid="dem20150730091219559" visible="1" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="CountryGroupWithShortName" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" checked="Qt::Unchecked" name="Country copier" showFeatureCount="0">
+    <legendgroup name="CountryGroupWithShortName" open="true" checked="Qt::Checked">
+      <legendlayer name="Country copier" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="Country_07a7a712_8bf3_4cb0_abde_58338f73a4b2"/>
+          <legendlayerfile layerid="Country_07a7a712_8bf3_4cb0_abde_58338f73a4b2" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" checked="Qt::Unchecked" name="Country_Labels copier" showFeatureCount="0">
+      <legendlayer name="Country_Labels copier" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="Country_Labels_67649087_4e95_4483_9c32_a9e14b8360db"/>
+          <legendlayerfile layerid="Country_Labels_67649087_4e95_4483_9c32_a9e14b8360db" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" checked="Qt::Unchecked" name="Country_Diagrams copier" showFeatureCount="0">
+      <legendlayer name="Country_Diagrams copier" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d"/>
+          <legendlayerfile layerid="Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="CountryGroup" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" checked="Qt::Checked" name="Country" showFeatureCount="0">
+    <legendgroup name="CountryGroup" open="true" checked="Qt::Checked">
+      <legendlayer name="Country" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="country20131022151106556"/>
+          <legendlayerfile layerid="country20131022151106556" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" checked="Qt::Checked" name="Country_Labels" showFeatureCount="0">
+      <legendlayer name="Country_Labels" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="Country_copy20161127151800736"/>
+          <legendlayerfile layerid="Country_copy20161127151800736" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" checked="Qt::Checked" name="Country_Diagrams" showFeatureCount="0">
+      <legendlayer name="Country_Diagrams" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Checked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="country20170328164317226"/>
+          <legendlayerfile layerid="country20170328164317226" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -188,7 +188,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="-4.65661e-10" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-19619892.68012013286352158</xmin>
         <ymin>-10327100.34232237376272678</ymin>
@@ -243,22 +243,22 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
         <map-layer-style name="origin">
-          <qgis simplifyMaxScale="1" maxLabelScale="1e+08" version="2.9.0-Master" minimumScale="-4.65661e-10" minLabelScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" scaleBasedLabelVisibilityFlag="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" maximumScale="1e+08">
+          <qgis maximumScale="1e+08" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" minLabelScale="1" version="2.9.0-Master" simplifyLocal="1" simplifyDrawingHints="1" scaleBasedLabelVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1">
             <edittypes>
-              <edittype widgetv2type="TextEdit" name="pk">
+              <edittype name="pk" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
-              <edittype widgetv2type="TextEdit" name="name">
+              <edittype name="name" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
             </edittypes>
             <renderer-v2 symbollevels="0" type="singleSymbol">
               <symbols>
-                <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleFill" locked="0" pass="0">
+                <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+                  <layer locked="0" class="SimpleFill" pass="0">
                     <prop v="0,0" k="border_width_map_unit_scale"/>
                     <prop v="186,221,105,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -270,7 +270,7 @@
                     <prop v="0.26" k="outline_width"/>
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
-                    <effect enabled="0" type="effectStack">
+                    <effect type="effectStack" enabled="0">
                       <effect type="drawSource">
                         <prop v="0" k="blend_mode"/>
                         <prop v="2" k="draw_mode"/>
@@ -283,7 +283,7 @@
               </symbols>
               <rotation/>
               <sizescale scalemethod="area"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="drawSource">
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -441,31 +441,31 @@
             <displayfield>name</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Label" fieldname=""/>
-              <family fieldname="" name="DejaVu Sans"/>
-              <size units="pt" value="12" fieldname=""/>
+              <label fieldname="" text="Label"/>
+              <family name="DejaVu Sans" fieldname=""/>
+              <size fieldname="" value="12" units="pt"/>
               <bold fieldname="" on="0"/>
               <italic fieldname="" on="0"/>
               <underline fieldname="" on="0"/>
               <strikeout fieldname="" on="0"/>
-              <color blue="0" fieldname="" green="0" red="0"/>
+              <color green="0" fieldname="" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" fieldname="" green="255" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset xfieldname="" x="0" y="0" yfieldname="" units="pt"/>
+              <angle auto="0" fieldname="" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor green="255" fieldname="" red="255" blue="255"/>
+              <buffersize fieldname="" value="1" units="pt"/>
               <bufferenabled fieldname="" on=""/>
               <multilineenabled fieldname="" on=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="-4.65661e-10" enabled="0" transparency="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+08" width="15" penWidth="0" diagramOrientation="Up" angleOffset="1440" sizeType="MM" scaleDependency="Area" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" penAlpha="255">
-                <attribute field="" label="" color="#000000"/>
+              <DiagramCategory minScaleDenominator="-4.65661e-10" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" enabled="0" scaleDependency="Area" width="15" barWidth="5" labelPlacementMethod="XHeight" scaleBasedVisibility="0" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" backgroundColor="#ffffff" transparency="0" angleOffset="1440" height="15" penColor="#000000" sizeType="MM" maxScaleDenominator="1e+08" penAlpha="255">
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings placement="0" xPosColumn="-1" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" yPosColumn="-1"/>
+            <DiagramLayerSettings obstacle="0" priority="0" dist="0" xPosColumn="-1" linePlacementFlags="10" yPosColumn="-1" showAll="1" placement="0"/>
             <editforminit/>
             <featformsuppress>0</featformsuppress>
             <editorlayout>tablayout</editorlayout>
@@ -478,19 +478,19 @@
           </qgis>
         </map-layer-style>
         <map-layer-style name="test2">
-          <qgis simplifyMaxScale="1" maxLabelScale="1e+08" version="2.9.0-Master" minimumScale="0" minLabelScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" scaleBasedLabelVisibilityFlag="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" maximumScale="1e+08">
+          <qgis maximumScale="1e+08" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" minLabelScale="1" version="2.9.0-Master" simplifyLocal="1" simplifyDrawingHints="1" scaleBasedLabelVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1">
             <edittypes>
-              <edittype widgetv2type="TextEdit" name="pk">
+              <edittype name="pk" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
-              <edittype widgetv2type="TextEdit" name="name">
+              <edittype name="name" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
             </edittypes>
             <renderer-v2 symbollevels="0" type="singleSymbol">
               <symbols>
-                <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleFill" locked="0" pass="0">
+                <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+                  <layer locked="0" class="SimpleFill" pass="0">
                     <prop v="0,0" k="border_width_map_unit_scale"/>
                     <prop v="145,149,158,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -502,7 +502,7 @@
                     <prop v="0.26" k="outline_width"/>
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
-                    <effect enabled="0" type="effectStack">
+                    <effect type="effectStack" enabled="0">
                       <effect type="drawSource">
                         <prop v="0" k="blend_mode"/>
                         <prop v="2" k="draw_mode"/>
@@ -511,7 +511,7 @@
                       </effect>
                     </effect>
                   </layer>
-                  <layer class="SimpleFill" locked="0" pass="0">
+                  <layer locked="0" class="SimpleFill" pass="0">
                     <prop v="0,0" k="border_width_map_unit_scale"/>
                     <prop v="0,0,255,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -523,7 +523,7 @@
                     <prop v="0.26" k="outline_width"/>
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
-                    <effect enabled="0" type="effectStack">
+                    <effect type="effectStack" enabled="0">
                       <effect type="drawSource">
                         <prop v="0" k="blend_mode"/>
                         <prop v="2" k="draw_mode"/>
@@ -536,7 +536,7 @@
               </symbols>
               <rotation/>
               <sizescale scalemethod="area"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="drawSource">
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -694,31 +694,31 @@
             <displayfield>name</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Label" fieldname=""/>
-              <family fieldname="" name="DejaVu Sans"/>
-              <size units="pt" value="12" fieldname=""/>
+              <label fieldname="" text="Label"/>
+              <family name="DejaVu Sans" fieldname=""/>
+              <size fieldname="" value="12" units="pt"/>
               <bold fieldname="" on="0"/>
               <italic fieldname="" on="0"/>
               <underline fieldname="" on="0"/>
               <strikeout fieldname="" on="0"/>
-              <color blue="0" fieldname="" green="0" red="0"/>
+              <color green="0" fieldname="" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" fieldname="" green="255" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset xfieldname="" x="0" y="0" yfieldname="" units="pt"/>
+              <angle auto="0" fieldname="" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor green="255" fieldname="" red="255" blue="255"/>
+              <buffersize fieldname="" value="1" units="pt"/>
               <bufferenabled fieldname="" on=""/>
               <multilineenabled fieldname="" on=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" enabled="0" transparency="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+08" width="15" penWidth="0" diagramOrientation="Up" angleOffset="1440" sizeType="MM" scaleDependency="Area" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" penAlpha="255">
-                <attribute field="" label="" color="#000000"/>
+              <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" enabled="0" scaleDependency="Area" width="15" barWidth="5" labelPlacementMethod="XHeight" scaleBasedVisibility="0" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" backgroundColor="#ffffff" transparency="0" angleOffset="1440" height="15" penColor="#000000" sizeType="MM" maxScaleDenominator="1e+08" penAlpha="255">
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings placement="0" xPosColumn="-1" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" yPosColumn="-1"/>
+            <DiagramLayerSettings obstacle="0" priority="0" dist="0" xPosColumn="-1" linePlacementFlags="10" yPosColumn="-1" showAll="1" placement="0"/>
             <editforminit/>
             <featformsuppress>0</featformsuppress>
             <editorlayout>tablayout</editorlayout>
@@ -732,10 +732,10 @@
         </map-layer-style>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,149,158,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -749,13 +749,13 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="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"/>
@@ -769,9 +769,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -782,20 +782,20 @@
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fontStrikeout="0" textOpacity="1" multilineHeight="1" blendMode="0" isExpression="1" textColor="0,0,0,255" fontLetterSpacing="0" fontWordSpacing="0" fontWeight="50" namedStyle="Normal" fontSizeUnit="Point" fontCapitals="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Sans Serif" fontSize="9" previewBkgrdColor="#ffffff" useSubstitutions="0" fieldName="">
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferOpacity="1"/>
-            <background shapeType="0" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeOffsetY="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeJoinStyle="64" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOpacity="1" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeDraw="0"/>
-            <shadow shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowUnder="0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontWeight="50" namedStyle="Normal" useSubstitutions="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fieldName="" fontCapitals="0" fontSize="9" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" multilineHeight="1" fontFamily="Sans Serif" fontUnderline="0" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferDraw="0" bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiY="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetUnit="MM" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetX="0" shapeOffsetY="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeY="0" shapeSVGFile="" shapeType="0" shapeBorderWidthUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadius="1.5" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" multilineAlign="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement fitInPolygonOnly="0" maxCurvedCharAngleIn="20" distUnits="MM" centroidInside="0" priority="5" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" repeatDistance="0" rotationAngle="0" placement="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" placementFlags="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" repeatDistanceUnits="MM" centroidWhole="0" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering zIndex="0" mergeLines="0" fontMinPixelSize="3" labelPerPart="0" obstacleFactor="1" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" obstacle="1" limitNumLabels="0" scaleMax="10000000" displayAll="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" upsidedownLabels="0" obstacleType="0" maxNumLabels="2000"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" multilineAlign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" wrapChar="" decimals="3"/>
+          <placement preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="0" xOffset="0" offsetType="0" priority="5" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceUnits="MM" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" rotationAngle="0" centroidInside="0" quadOffset="4" offsetUnits="MapUnit" dist="0"/>
+          <rendering obstacleFactor="1" scaleMin="1" upsidedownLabels="0" zIndex="0" limitNumLabels="0" displayAll="0" labelPerPart="0" mergeLines="0" fontMinPixelSize="3" obstacleType="0" fontMaxPixelSize="10000" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" scaleVisibility="0" drawLabels="1" obstacle="1" minFeatureSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -805,17 +805,17 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="-4.65661e-10" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="-4.65661e-10" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -836,27 +836,27 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="name"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="name" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="name"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -867,7 +867,7 @@
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="ttt" visibilityExpressionEnabled="0"/>
+        <attributeEditorContainer name="ttt" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression=""/>
       </attributeEditorForm>
       <editable/>
       <labelOnTop/>
@@ -880,7 +880,7 @@
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-19619892.68012013286352158</xmin>
         <ymin>-10327100.34232237376272678</ymin>
@@ -935,14 +935,14 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="13,126,136,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -956,9 +956,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -976,18 +976,18 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="inf" sizeScale="3x:0,0,0,0,0,0" enabled="1" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="&quot;pk&quot;" label="pk" color="#6fe20e"/>
-          <attribute field=" length( name )" label=" length( name )" color="#38c4c2"/>
+        <DiagramCategory minScaleDenominator="inf" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="1" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#6fe20e" label="pk" field="&quot;pk&quot;"/>
+          <attribute color="#38c4c2" label=" length( name )" field=" length( name )"/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="18" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="18" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -1008,31 +1008,31 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="name"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="name" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="name"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column type="field" hidden="0" width="-1" name="pk"/>
-          <column type="field" hidden="0" width="-1" name="name"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column name="pk" width="-1" type="field" hidden="0"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <editform>.</editform>
@@ -1069,7 +1069,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-19619892.68012013286352158</xmin>
         <ymin>-10327100.34232237376272678</ymin>
@@ -1124,21 +1124,21 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
+      <map-layer-style-manager current="default">
         <map-layer-style name="custom">
-          <qgis readOnly="0" simplifyMaxScale="1" version="2.99.0-Master" minimumScale="0" simplifyAlgorithm="0" simplifyDrawingHints="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" maximumScale="1e+08">
+          <qgis maximumScale="1e+08" simplifyAlgorithm="0" minimumScale="0" hasScaleBasedVisibilityFlag="0" version="2.99.0-Master" simplifyLocal="1" readOnly="0" simplifyDrawingHints="1" simplifyDrawingTol="1" simplifyMaxScale="1">
             <edittypes>
-              <edittype widgetv2type="TextEdit" name="pk">
+              <edittype name="pk" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
-              <edittype widgetv2type="TextEdit" name="name">
+              <edittype name="name" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
+            <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
               <symbols>
-                <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+                  <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                     <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                     <prop v="145,149,158,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -1151,7 +1151,7 @@ def my_form_open(dialog, layer, feature):
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
                   </layer>
-                  <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                  <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                     <prop v="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"/>
@@ -1351,13 +1351,13 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerTransparency>0</layerTransparency>
-            <SingleCategoryDiagramRenderer sizeLegend="0" diagramType="Pie" attributeLegend="1">
-              <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="0,0,0,0,0,0" enabled="0" transparency="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+08" width="15" penWidth="0" diagramOrientation="Up" angleOffset="1440" sizeType="MM" scaleDependency="Area" lineSizeScale="0,0,0,0,0,0" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-                <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute field="" label="" color="#000000"/>
+            <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1" sizeLegend="0">
+              <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" barWidth="5" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundColor="#ffffff" transparency="0" sizeScale="0,0,0,0,0,0" angleOffset="1440" height="15" sizeType="MM" penColor="#000000" lineSizeType="MM" maxScaleDenominator="1e+08" penAlpha="255">
+                <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
-              <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <symbol name="sizeSymbol" alpha="1" type="marker" clip_to_extent="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <prop v="0" k="angle"/>
                   <prop v="255,0,0,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1379,22 +1379,22 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings placement="0" xPosColumn="-1" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" yPosColumn="-1" showColumn="0" zIndex="0"/>
+            <DiagramLayerSettings obstacle="0" priority="0" dist="0" showColumn="0" xPosColumn="-1" linePlacementFlags="10" zIndex="0" yPosColumn="-1" showAll="1" placement="0"/>
             <annotationform>.</annotationform>
             <aliases>
-              <alias field="pk" index="0" name=""/>
-              <alias field="name" index="1" name=""/>
+              <alias name="" index="0" field="pk"/>
+              <alias name="" index="1" field="name"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+            <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
               <columns>
-                <column type="field" hidden="0" width="-1" name="pk"/>
-                <column type="field" hidden="0" width="-1" name="name"/>
-                <column type="actions" hidden="1" width="-1"/>
+                <column name="pk" width="-1" type="field" hidden="0"/>
+                <column name="name" width="-1" type="field" hidden="0"/>
+                <column width="-1" type="actions" hidden="1"/>
               </columns>
             </attributetableconfig>
             <editform>.</editform>
@@ -1421,7 +1421,7 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <attributeEditorForm>
-              <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="ttt" visibilityExpressionEnabled="0"/>
+              <attributeEditorContainer name="ttt" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression=""/>
             </attributeEditorForm>
             <widgets/>
             <conditionalstyles>
@@ -1434,13 +1434,13 @@ def my_form_open(dialog, layer, feature):
             <layerGeometryType>2</layerGeometryType>
           </qgis>
         </map-layer-style>
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,149,158,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -1454,13 +1454,13 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="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"/>
@@ -1474,9 +1474,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1487,20 +1487,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fontStrikeout="0" textOpacity="1" multilineHeight="1" blendMode="0" isExpression="0" textColor="0,0,0,255" fontLetterSpacing="0" fontWordSpacing="0" fontWeight="50" namedStyle="Normal" fontSizeUnit="Point" fontCapitals="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Sans Serif" fontSize="9" previewBkgrdColor="#ffffff" useSubstitutions="0" fieldName="name">
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferOpacity="1"/>
-            <background shapeType="0" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeOffsetY="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MapUnit" shapeBorderWidthUnit="MapUnit" shapeOffsetUnit="MapUnit" shapeSVGFile="" shapeJoinStyle="64" shapeSizeUnit="MapUnit" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOpacity="1" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeDraw="0"/>
-            <shadow shadowOffsetGlobal="1" shadowRadiusUnit="MapUnit" shadowDraw="0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowUnder="0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetUnit="MapUnit" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontWeight="50" namedStyle="Normal" useSubstitutions="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fieldName="name" fontCapitals="0" fontSize="9" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" multilineHeight="1" fontFamily="Sans Serif" fontUnderline="0" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferDraw="0" bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MapUnit" shapeDraw="0" shapeRadiiY="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetUnit="MapUnit" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetX="0" shapeOffsetY="0" shapeRadiiUnit="MapUnit" shapeOpacity="1" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeY="0" shapeSVGFile="" shapeType="0" shapeBorderWidthUnit="MapUnit"/>
+            <shadow shadowOpacity="0.7" shadowOffsetUnit="MapUnit" shadowScale="100" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadius="1.5" shadowRadiusUnit="MapUnit" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" multilineAlign="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement fitInPolygonOnly="0" maxCurvedCharAngleIn="20" distUnits="MM" centroidInside="0" priority="5" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" repeatDistance="0" rotationAngle="0" placement="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" placementFlags="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" repeatDistanceUnits="MM" centroidWhole="0" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering zIndex="0" mergeLines="0" fontMinPixelSize="3" labelPerPart="0" obstacleFactor="1" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" obstacle="1" limitNumLabels="0" scaleMax="10000000" displayAll="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" upsidedownLabels="0" obstacleType="0" maxNumLabels="2000"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" multilineAlign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" wrapChar="" decimals="3"/>
+          <placement preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="0" xOffset="0" offsetType="0" priority="5" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceUnits="MM" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" rotationAngle="0" centroidInside="0" quadOffset="4" offsetUnits="MapUnit" dist="0"/>
+          <rendering obstacleFactor="1" scaleMin="1" upsidedownLabels="0" zIndex="0" limitNumLabels="0" displayAll="0" labelPerPart="0" mergeLines="0" fontMinPixelSize="3" obstacleType="0" fontMaxPixelSize="10000" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" scaleVisibility="0" drawLabels="1" obstacle="1" minFeatureSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -1514,17 +1514,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -1545,31 +1545,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="name"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="name" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="name"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column type="field" hidden="0" width="-1" name="pk"/>
-          <column type="field" hidden="0" width="-1" name="name"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column name="pk" width="-1" type="field" hidden="0"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -1596,7 +1596,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="ttt" visibilityExpressionEnabled="0"/>
+        <attributeEditorContainer name="ttt" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression=""/>
       </attributeEditorForm>
       <editable/>
       <labelOnTop/>
@@ -1609,7 +1609,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-19619892.68012013286352158</xmin>
         <ymin>-10327100.34232237376272678</ymin>
@@ -1664,21 +1664,21 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
+      <map-layer-style-manager current="default">
         <map-layer-style name="custom">
-          <qgis readOnly="0" simplifyMaxScale="1" version="2.99.0-Master" minimumScale="0" simplifyAlgorithm="0" simplifyDrawingHints="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" maximumScale="1e+08">
+          <qgis maximumScale="1e+08" simplifyAlgorithm="0" minimumScale="0" hasScaleBasedVisibilityFlag="0" version="2.99.0-Master" simplifyLocal="1" readOnly="0" simplifyDrawingHints="1" simplifyDrawingTol="1" simplifyMaxScale="1">
             <edittypes>
-              <edittype widgetv2type="TextEdit" name="pk">
+              <edittype name="pk" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
-              <edittype widgetv2type="TextEdit" name="name">
+              <edittype name="name" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
             </edittypes>
-            <renderer-v2 symbollevels="0" type="singleSymbol" enableorderby="0" forceraster="0">
+            <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
               <symbols>
-                <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+                  <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                     <prop v="0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                     <prop v="145,149,158,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -1691,7 +1691,7 @@ def my_form_open(dialog, layer, feature):
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
                   </layer>
-                  <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                  <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                     <prop v="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"/>
@@ -1891,13 +1891,13 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerTransparency>0</layerTransparency>
-            <SingleCategoryDiagramRenderer sizeLegend="0" diagramType="Pie" attributeLegend="1">
-              <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="0,0,0,0,0,0" enabled="0" transparency="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+08" width="15" penWidth="0" diagramOrientation="Up" angleOffset="1440" sizeType="MM" scaleDependency="Area" lineSizeScale="0,0,0,0,0,0" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-                <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute field="" label="" color="#000000"/>
+            <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1" sizeLegend="0">
+              <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" barWidth="5" labelPlacementMethod="XHeight" scaleBasedVisibility="0" backgroundColor="#ffffff" transparency="0" sizeScale="0,0,0,0,0,0" angleOffset="1440" height="15" sizeType="MM" penColor="#000000" lineSizeType="MM" maxScaleDenominator="1e+08" penAlpha="255">
+                <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
-              <symbol type="marker" clip_to_extent="1" alpha="1" name="sizeSymbol">
-                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+              <symbol name="sizeSymbol" alpha="1" type="marker" clip_to_extent="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <prop v="0" k="angle"/>
                   <prop v="255,0,0,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1919,22 +1919,22 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings placement="0" xPosColumn="-1" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" yPosColumn="-1" showColumn="0" zIndex="0"/>
+            <DiagramLayerSettings obstacle="0" priority="0" dist="0" showColumn="0" xPosColumn="-1" linePlacementFlags="10" zIndex="0" yPosColumn="-1" showAll="1" placement="0"/>
             <annotationform>.</annotationform>
             <aliases>
-              <alias field="pk" index="0" name=""/>
-              <alias field="name" index="1" name=""/>
+              <alias name="" index="0" field="pk"/>
+              <alias name="" index="1" field="name"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+            <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
               <columns>
-                <column type="field" hidden="0" width="-1" name="pk"/>
-                <column type="field" hidden="0" width="-1" name="name"/>
-                <column type="actions" hidden="1" width="-1"/>
+                <column name="pk" width="-1" type="field" hidden="0"/>
+                <column name="name" width="-1" type="field" hidden="0"/>
+                <column width="-1" type="actions" hidden="1"/>
               </columns>
             </attributetableconfig>
             <editform>.</editform>
@@ -1961,7 +1961,7 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <attributeEditorForm>
-              <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="ttt" visibilityExpressionEnabled="0"/>
+              <attributeEditorContainer name="ttt" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression=""/>
             </attributeEditorForm>
             <widgets/>
             <conditionalstyles>
@@ -1974,13 +1974,13 @@ def my_form_open(dialog, layer, feature):
             <layerGeometryType>2</layerGeometryType>
           </qgis>
         </map-layer-style>
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,149,158,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -1994,13 +1994,13 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="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"/>
@@ -2014,9 +2014,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2027,20 +2027,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fontStrikeout="0" textOpacity="1" multilineHeight="1" blendMode="0" isExpression="0" textColor="0,0,0,255" fontLetterSpacing="0" fontWordSpacing="0" fontWeight="50" namedStyle="Normal" fontSizeUnit="Point" fontCapitals="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Sans Serif" fontSize="9" previewBkgrdColor="#ffffff" useSubstitutions="0" fieldName="name">
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferOpacity="1"/>
-            <background shapeType="0" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeOffsetY="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MapUnit" shapeBorderWidthUnit="MapUnit" shapeOffsetUnit="MapUnit" shapeSVGFile="" shapeJoinStyle="64" shapeSizeUnit="MapUnit" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOpacity="1" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeDraw="0"/>
-            <shadow shadowOffsetGlobal="1" shadowRadiusUnit="MapUnit" shadowDraw="0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowUnder="0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetUnit="MapUnit" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontWeight="50" namedStyle="Normal" useSubstitutions="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fieldName="name" fontCapitals="0" fontSize="9" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" multilineHeight="1" fontFamily="Sans Serif" fontUnderline="0" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferDraw="0" bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MapUnit" shapeDraw="0" shapeRadiiY="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetUnit="MapUnit" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetX="0" shapeOffsetY="0" shapeRadiiUnit="MapUnit" shapeOpacity="1" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeY="0" shapeSVGFile="" shapeType="0" shapeBorderWidthUnit="MapUnit"/>
+            <shadow shadowOpacity="0.7" shadowOffsetUnit="MapUnit" shadowScale="100" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadius="1.5" shadowRadiusUnit="MapUnit" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" multilineAlign="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement fitInPolygonOnly="0" maxCurvedCharAngleIn="20" distUnits="MM" centroidInside="0" priority="5" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" repeatDistance="0" rotationAngle="0" placement="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" placementFlags="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" repeatDistanceUnits="MM" centroidWhole="0" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering zIndex="0" mergeLines="0" fontMinPixelSize="3" labelPerPart="0" obstacleFactor="1" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" obstacle="1" limitNumLabels="0" scaleMax="10000000" displayAll="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" upsidedownLabels="0" obstacleType="0" maxNumLabels="2000"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" multilineAlign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" wrapChar="" decimals="3"/>
+          <placement preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="0" xOffset="0" offsetType="0" priority="5" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceUnits="MM" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" rotationAngle="0" centroidInside="0" quadOffset="4" offsetUnits="MapUnit" dist="0"/>
+          <rendering obstacleFactor="1" scaleMin="1" upsidedownLabels="0" zIndex="0" limitNumLabels="0" displayAll="0" labelPerPart="0" mergeLines="0" fontMinPixelSize="3" obstacleType="0" fontMaxPixelSize="10000" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" scaleVisibility="0" drawLabels="1" obstacle="1" minFeatureSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -2054,17 +2054,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -2085,31 +2085,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="name"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="name" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="name"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column type="field" hidden="0" width="-1" name="pk"/>
-          <column type="field" hidden="0" width="-1" name="name"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column name="pk" width="-1" type="field" hidden="0"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -2136,7 +2136,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="ttt" visibilityExpressionEnabled="0"/>
+        <attributeEditorContainer name="ttt" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression=""/>
       </attributeEditorForm>
       <editable/>
       <labelOnTop/>
@@ -2149,7 +2149,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-14746250.07513097859919071</xmin>
         <ymin>-112075.42807669920148328</ymin>
@@ -2204,14 +2204,14 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="178,178,178,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2225,13 +2225,13 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="230,85,192,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2245,9 +2245,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2264,17 +2264,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -2302,36 +2302,36 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="pkuid" index="1" name=""/>
-        <alias field="color" index="2" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="pkuid"/>
+        <alias name="" index="2" field="color"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="pkuid" applyOnUpdate="0" expression=""/>
-        <default field="color" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="pkuid"/>
+        <default expression="" applyOnUpdate="0" field="color"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="pkuid" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="color" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="pkuid"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="color"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="pkuid" desc="" exp=""/>
-        <constraint field="color" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="pkuid"/>
+        <constraint desc="" exp="" field="color"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column type="field" hidden="0" width="-1" name="pk"/>
-          <column type="field" hidden="0" width="-1" name="pkuid"/>
-          <column type="field" hidden="0" width="-1" name="color"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column name="pk" width="-1" type="field" hidden="0"/>
+          <column name="pkuid" width="-1" type="field" hidden="0"/>
+          <column name="color" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -2358,12 +2358,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="t" visibilityExpressionEnabled="0">
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c1" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="1" name="pkuid"/>
+        <attributeEditorContainer name="t" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression="">
+          <attributeEditorContainer name="c1" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="pkuid" showLabel="1" index="1"/>
           </attributeEditorContainer>
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c2" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="2" name="color"/>
+          <attributeEditorContainer name="c2" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="color" showLabel="1" index="2"/>
           </attributeEditorContainer>
         </attributeEditorContainer>
       </attributeEditorForm>
@@ -2378,7 +2378,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"pkuid"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="-4.65661e-10" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-2465695.66895584994927049</xmin>
         <ymin>80258.53580146089370828</ymin>
@@ -2433,14 +2433,14 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="178,178,178,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2454,13 +2454,13 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="230,85,192,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2474,9 +2474,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2493,17 +2493,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="-4.65661e-10" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="-4.65661e-10" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -2531,31 +2531,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="pkuid" index="1" name=""/>
-        <alias field="color" index="2" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="pkuid"/>
+        <alias name="" index="2" field="color"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="pkuid" applyOnUpdate="0" expression=""/>
-        <default field="color" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="pkuid"/>
+        <default expression="" applyOnUpdate="0" field="color"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="pkuid" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="color" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="pkuid"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="color"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="pkuid" desc="" exp=""/>
-        <constraint field="color" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="pkuid"/>
+        <constraint desc="" exp="" field="color"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -2582,12 +2582,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="t" visibilityExpressionEnabled="0">
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c1" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="1" name="pkuid"/>
+        <attributeEditorContainer name="t" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression="">
+          <attributeEditorContainer name="c1" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="pkuid" showLabel="1" index="1"/>
           </attributeEditorContainer>
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c2" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="2" name="color"/>
+          <attributeEditorContainer name="c2" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="color" showLabel="1" index="2"/>
           </attributeEditorContainer>
         </attributeEditorContainer>
       </attributeEditorForm>
@@ -2602,7 +2602,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"pkuid"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-14746250.07513097859919071</xmin>
         <ymin>-112075.42807669920148328</ymin>
@@ -2657,14 +2657,14 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="178,178,178,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2678,13 +2678,13 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="230,85,192,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -2698,9 +2698,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2717,17 +2717,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -2755,31 +2755,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="pkuid" index="1" name=""/>
-        <alias field="color" index="2" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="pkuid"/>
+        <alias name="" index="2" field="color"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="pkuid" applyOnUpdate="0" expression=""/>
-        <default field="color" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="pkuid"/>
+        <default expression="" applyOnUpdate="0" field="color"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="pkuid" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="color" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="pkuid"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="color"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="pkuid" desc="" exp=""/>
-        <constraint field="color" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="pkuid"/>
+        <constraint desc="" exp="" field="color"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -2806,12 +2806,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="t" visibilityExpressionEnabled="0">
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c1" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="1" name="pkuid"/>
+        <attributeEditorContainer name="t" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression="">
+          <attributeEditorContainer name="c1" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="pkuid" showLabel="1" index="1"/>
           </attributeEditorContainer>
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c2" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="2" name="color"/>
+          <attributeEditorContainer name="c2" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="color" showLabel="1" index="2"/>
           </attributeEditorContainer>
         </attributeEditorContainer>
       </attributeEditorForm>
@@ -2826,7 +2826,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"pkuid"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="-4.65661e-10" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-19619892.68012013286352158</xmin>
         <ymin>-10327100.34232237376272678</ymin>
@@ -2881,22 +2881,22 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
         <map-layer-style name="origin">
-          <qgis simplifyMaxScale="1" maxLabelScale="1e+08" version="2.9.0-Master" minimumScale="-4.65661e-10" minLabelScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" scaleBasedLabelVisibilityFlag="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" maximumScale="1e+08">
+          <qgis maximumScale="1e+08" minimumScale="-4.65661e-10" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" minLabelScale="1" version="2.9.0-Master" simplifyLocal="1" simplifyDrawingHints="1" scaleBasedLabelVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1">
             <edittypes>
-              <edittype widgetv2type="TextEdit" name="pk">
+              <edittype name="pk" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
-              <edittype widgetv2type="TextEdit" name="name">
+              <edittype name="name" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
             </edittypes>
             <renderer-v2 symbollevels="0" type="singleSymbol">
               <symbols>
-                <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleFill" locked="0" pass="0">
+                <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+                  <layer locked="0" class="SimpleFill" pass="0">
                     <prop v="0,0" k="border_width_map_unit_scale"/>
                     <prop v="186,221,105,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -2908,7 +2908,7 @@ def my_form_open(dialog, layer, feature):
                     <prop v="0.26" k="outline_width"/>
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
-                    <effect enabled="0" type="effectStack">
+                    <effect type="effectStack" enabled="0">
                       <effect type="drawSource">
                         <prop v="0" k="blend_mode"/>
                         <prop v="2" k="draw_mode"/>
@@ -2921,7 +2921,7 @@ def my_form_open(dialog, layer, feature):
               </symbols>
               <rotation/>
               <sizescale scalemethod="area"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="drawSource">
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -3079,31 +3079,31 @@ def my_form_open(dialog, layer, feature):
             <displayfield>name</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Label" fieldname=""/>
-              <family fieldname="" name="DejaVu Sans"/>
-              <size units="pt" value="12" fieldname=""/>
+              <label fieldname="" text="Label"/>
+              <family name="DejaVu Sans" fieldname=""/>
+              <size fieldname="" value="12" units="pt"/>
               <bold fieldname="" on="0"/>
               <italic fieldname="" on="0"/>
               <underline fieldname="" on="0"/>
               <strikeout fieldname="" on="0"/>
-              <color blue="0" fieldname="" green="0" red="0"/>
+              <color green="0" fieldname="" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" fieldname="" green="255" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset xfieldname="" x="0" y="0" yfieldname="" units="pt"/>
+              <angle auto="0" fieldname="" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor green="255" fieldname="" red="255" blue="255"/>
+              <buffersize fieldname="" value="1" units="pt"/>
               <bufferenabled fieldname="" on=""/>
               <multilineenabled fieldname="" on=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="-4.65661e-10" enabled="0" transparency="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+08" width="15" penWidth="0" diagramOrientation="Up" angleOffset="1440" sizeType="MM" scaleDependency="Area" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" penAlpha="255">
-                <attribute field="" label="" color="#000000"/>
+              <DiagramCategory minScaleDenominator="-4.65661e-10" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" enabled="0" scaleDependency="Area" width="15" barWidth="5" labelPlacementMethod="XHeight" scaleBasedVisibility="0" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" backgroundColor="#ffffff" transparency="0" angleOffset="1440" height="15" penColor="#000000" sizeType="MM" maxScaleDenominator="1e+08" penAlpha="255">
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings placement="0" xPosColumn="-1" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" yPosColumn="-1"/>
+            <DiagramLayerSettings obstacle="0" priority="0" dist="0" xPosColumn="-1" linePlacementFlags="10" yPosColumn="-1" showAll="1" placement="0"/>
             <editforminit/>
             <featformsuppress>0</featformsuppress>
             <editorlayout>tablayout</editorlayout>
@@ -3116,19 +3116,19 @@ def my_form_open(dialog, layer, feature):
           </qgis>
         </map-layer-style>
         <map-layer-style name="test2">
-          <qgis simplifyMaxScale="1" maxLabelScale="1e+08" version="2.9.0-Master" minimumScale="0" minLabelScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" scaleBasedLabelVisibilityFlag="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" maximumScale="1e+08">
+          <qgis maximumScale="1e+08" minimumScale="0" maxLabelScale="1e+08" hasScaleBasedVisibilityFlag="0" minLabelScale="1" version="2.9.0-Master" simplifyLocal="1" simplifyDrawingHints="1" scaleBasedLabelVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1">
             <edittypes>
-              <edittype widgetv2type="TextEdit" name="pk">
+              <edittype name="pk" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
-              <edittype widgetv2type="TextEdit" name="name">
+              <edittype name="name" widgetv2type="TextEdit">
                 <widgetv2config fieldEditable="1" IsMultiline="0" UseHtml="0" labelOnTop="0"/>
               </edittype>
             </edittypes>
             <renderer-v2 symbollevels="0" type="singleSymbol">
               <symbols>
-                <symbol type="fill" clip_to_extent="1" alpha="1" name="0">
-                  <layer class="SimpleFill" locked="0" pass="0">
+                <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+                  <layer locked="0" class="SimpleFill" pass="0">
                     <prop v="0,0" k="border_width_map_unit_scale"/>
                     <prop v="145,149,158,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -3140,7 +3140,7 @@ def my_form_open(dialog, layer, feature):
                     <prop v="0.26" k="outline_width"/>
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
-                    <effect enabled="0" type="effectStack">
+                    <effect type="effectStack" enabled="0">
                       <effect type="drawSource">
                         <prop v="0" k="blend_mode"/>
                         <prop v="2" k="draw_mode"/>
@@ -3149,7 +3149,7 @@ def my_form_open(dialog, layer, feature):
                       </effect>
                     </effect>
                   </layer>
-                  <layer class="SimpleFill" locked="0" pass="0">
+                  <layer locked="0" class="SimpleFill" pass="0">
                     <prop v="0,0" k="border_width_map_unit_scale"/>
                     <prop v="0,0,255,255" k="color"/>
                     <prop v="bevel" k="joinstyle"/>
@@ -3161,7 +3161,7 @@ def my_form_open(dialog, layer, feature):
                     <prop v="0.26" k="outline_width"/>
                     <prop v="MM" k="outline_width_unit"/>
                     <prop v="solid" k="style"/>
-                    <effect enabled="0" type="effectStack">
+                    <effect type="effectStack" enabled="0">
                       <effect type="drawSource">
                         <prop v="0" k="blend_mode"/>
                         <prop v="2" k="draw_mode"/>
@@ -3174,7 +3174,7 @@ def my_form_open(dialog, layer, feature):
               </symbols>
               <rotation/>
               <sizescale scalemethod="area"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="drawSource">
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -3332,31 +3332,31 @@ def my_form_open(dialog, layer, feature):
             <displayfield>name</displayfield>
             <label>0</label>
             <labelattributes>
-              <label text="Label" fieldname=""/>
-              <family fieldname="" name="DejaVu Sans"/>
-              <size units="pt" value="12" fieldname=""/>
+              <label fieldname="" text="Label"/>
+              <family name="DejaVu Sans" fieldname=""/>
+              <size fieldname="" value="12" units="pt"/>
               <bold fieldname="" on="0"/>
               <italic fieldname="" on="0"/>
               <underline fieldname="" on="0"/>
               <strikeout fieldname="" on="0"/>
-              <color blue="0" fieldname="" green="0" red="0"/>
+              <color green="0" fieldname="" red="0" blue="0"/>
               <x fieldname=""/>
               <y fieldname=""/>
-              <offset units="pt" xfieldname="" yfieldname="" x="0" y="0"/>
-              <angle value="0" fieldname="" auto="0"/>
-              <alignment value="center" fieldname=""/>
-              <buffercolor blue="255" fieldname="" green="255" red="255"/>
-              <buffersize units="pt" value="1" fieldname=""/>
+              <offset xfieldname="" x="0" y="0" yfieldname="" units="pt"/>
+              <angle auto="0" fieldname="" value="0"/>
+              <alignment fieldname="" value="center"/>
+              <buffercolor green="255" fieldname="" red="255" blue="255"/>
+              <buffersize fieldname="" value="1" units="pt"/>
               <bufferenabled fieldname="" on=""/>
               <multilineenabled fieldname="" on=""/>
               <selectedonly on=""/>
             </labelattributes>
             <SingleCategoryDiagramRenderer diagramType="Pie">
-              <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" enabled="0" transparency="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+08" width="15" penWidth="0" diagramOrientation="Up" angleOffset="1440" sizeType="MM" scaleDependency="Area" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" penAlpha="255">
-                <attribute field="" label="" color="#000000"/>
+              <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" enabled="0" scaleDependency="Area" width="15" barWidth="5" labelPlacementMethod="XHeight" scaleBasedVisibility="0" font="DejaVu Sans,11,-1,5,25,0,0,0,0,0" backgroundColor="#ffffff" transparency="0" angleOffset="1440" height="15" penColor="#000000" sizeType="MM" maxScaleDenominator="1e+08" penAlpha="255">
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings placement="0" xPosColumn="-1" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" yPosColumn="-1"/>
+            <DiagramLayerSettings obstacle="0" priority="0" dist="0" xPosColumn="-1" linePlacementFlags="10" yPosColumn="-1" showAll="1" placement="0"/>
             <editforminit/>
             <featformsuppress>0</featformsuppress>
             <editorlayout>tablayout</editorlayout>
@@ -3370,10 +3370,10 @@ def my_form_open(dialog, layer, feature):
         </map-layer-style>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,149,158,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -3387,13 +3387,13 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="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"/>
@@ -3407,9 +3407,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3420,20 +3420,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontItalic="0" fontStrikeout="0" textOpacity="1" multilineHeight="1" blendMode="0" isExpression="1" textColor="0,0,0,255" fontLetterSpacing="0" fontWordSpacing="0" fontWeight="50" namedStyle="Normal" fontSizeUnit="Point" fontCapitals="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Sans Serif" fontSize="9" previewBkgrdColor="#ffffff" useSubstitutions="0" fieldName="">
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferOpacity="1"/>
-            <background shapeType="0" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeOffsetY="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSVGFile="" shapeJoinStyle="64" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOpacity="1" shapeBorderWidth="0" shapeBlendMode="0" shapeSizeY="0" shapeRotation="0" shapeSizeX="0" shapeDraw="0"/>
-            <shadow shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowDraw="0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowUnder="0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-style fontWeight="50" namedStyle="Normal" useSubstitutions="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fieldName="" fontCapitals="0" fontSize="9" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" multilineHeight="1" fontFamily="Sans Serif" fontUnderline="0" fontStrikeout="0" fontItalic="0">
+            <text-buffer bufferDraw="0" bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0" bufferColor="255,255,255,255"/>
+            <background shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiY="0" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetUnit="MM" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetX="0" shapeOffsetY="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderWidth="0" shapeJoinStyle="64" shapeSizeY="0" shapeSVGFile="" shapeType="0" shapeBorderWidthUnit="MM"/>
+            <shadow shadowOpacity="0.7" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadius="1.5" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" multilineAlign="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement fitInPolygonOnly="0" maxCurvedCharAngleIn="20" distUnits="MM" centroidInside="0" priority="5" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" repeatDistance="0" rotationAngle="0" placement="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" placementFlags="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" dist="0" maxCurvedCharAngleOut="-20" repeatDistanceUnits="MM" centroidWhole="0" offsetType="0" offsetUnits="MapUnit"/>
-          <rendering zIndex="0" mergeLines="0" fontMinPixelSize="3" labelPerPart="0" obstacleFactor="1" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" obstacle="1" limitNumLabels="0" scaleMax="10000000" displayAll="0" fontMaxPixelSize="10000" scaleVisibility="0" minFeatureSize="0" upsidedownLabels="0" obstacleType="0" maxNumLabels="2000"/>
+          <text-format placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" plussign="0" multilineAlign="0" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0" wrapChar="" decimals="3"/>
+          <placement preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="0" xOffset="0" offsetType="0" priority="5" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceUnits="MM" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" rotationAngle="0" centroidInside="0" quadOffset="4" offsetUnits="MapUnit" dist="0"/>
+          <rendering obstacleFactor="1" scaleMin="1" upsidedownLabels="0" zIndex="0" limitNumLabels="0" displayAll="0" labelPerPart="0" mergeLines="0" fontMinPixelSize="3" obstacleType="0" fontMaxPixelSize="10000" maxNumLabels="2000" fontLimitPixelSize="0" scaleMax="10000000" scaleVisibility="0" drawLabels="1" obstacle="1" minFeatureSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </settings>
@@ -3443,17 +3443,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="-4.65661e-10" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="-4.65661e-10" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3474,27 +3474,27 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="name"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="name" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="name"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -3505,7 +3505,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="ttt" visibilityExpressionEnabled="0"/>
+        <attributeEditorContainer name="ttt" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression=""/>
       </attributeEditorForm>
       <editable/>
       <labelOnTop/>
@@ -3518,7 +3518,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-19619892.68012013286352158</xmin>
         <ymin>-10327100.34232237376272678</ymin>
@@ -3573,14 +3573,14 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="13,126,136,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -3594,9 +3594,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3614,18 +3614,18 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="inf" sizeScale="3x:0,0,0,0,0,0" enabled="1" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="&quot;pk&quot;" label="pk" color="#6fe20e"/>
-          <attribute field=" length( name )" label=" length( name )" color="#38c4c2"/>
+        <DiagramCategory minScaleDenominator="inf" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="1" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#6fe20e" label="pk" field="&quot;pk&quot;"/>
+          <attribute color="#38c4c2" label=" length( name )" field=" length( name )"/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="18" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="18" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3646,31 +3646,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="name"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="name" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="name"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column type="field" hidden="0" width="-1" name="pk"/>
-          <column type="field" hidden="0" width="-1" name="name"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column name="pk" width="-1" type="field" hidden="0"/>
+          <column name="name" width="-1" type="field" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <editform>.</editform>
@@ -3707,7 +3707,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" type="raster" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="-4.65661e-10" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0">
+    <maplayer minScale="1e+8" hasScaleBasedVisibilityFlag="0" maxScale="-4.65661e-10" type="raster" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-29.99999999999666755</xmin>
         <ymin>29.99999999999666755</ymin>
@@ -3763,11 +3763,11 @@ def my_form_open(dialog, layer, feature):
       <noData>
         <noDataList bandNo="1" useSrcNoData="1"/>
       </noData>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <pipe>
-        <rasterrenderer type="singlebandgray" grayBand="1" opacity="1" alphaBand="0" gradient="BlackToWhite">
+        <rasterrenderer opacity="1" grayBand="1" type="singlebandgray" alphaBand="0" gradient="BlackToWhite">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -3783,13 +3783,13 @@ def my_form_open(dialog, layer, feature):
             <algorithm>StretchToMinimumMaximum</algorithm>
           </contrastEnhancement>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation grayscaleMode="0" saturation="0" colorizeGreen="128" colorizeOn="0" colorizeRed="255" colorizeStrength="100" colorizeBlue="128"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" colorizeOn="0" saturation="0" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Polygon" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Polygon" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-14746250.07513097859919071</xmin>
         <ymin>-112075.42807669920148328</ymin>
@@ -3844,14 +3844,14 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="fill" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="fill" clip_to_extent="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="178,178,178,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -3865,13 +3865,13 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="230,85,192,255"/>
               <prop k="joinstyle" v="bevel"/>
@@ -3885,9 +3885,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3901,17 +3901,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3939,31 +3939,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="pk" index="0" name=""/>
-        <alias field="pkuid" index="1" name=""/>
-        <alias field="color" index="2" name=""/>
+        <alias name="" index="0" field="pk"/>
+        <alias name="" index="1" field="pkuid"/>
+        <alias name="" index="2" field="color"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="pk" applyOnUpdate="0" expression=""/>
-        <default field="pkuid" applyOnUpdate="0" expression=""/>
-        <default field="color" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="pk"/>
+        <default expression="" applyOnUpdate="0" field="pkuid"/>
+        <default expression="" applyOnUpdate="0" field="color"/>
       </defaults>
       <constraints>
-        <constraint field="pk" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="pkuid" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="color" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="pk"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="pkuid"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="color"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="pk" desc="" exp=""/>
-        <constraint field="pkuid" desc="" exp=""/>
-        <constraint field="color" desc="" exp=""/>
+        <constraint desc="" exp="" field="pk"/>
+        <constraint desc="" exp="" field="pkuid"/>
+        <constraint desc="" exp="" field="color"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -3974,12 +3974,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="0" name="t" visibilityExpressionEnabled="0">
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c1" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="1" name="pkuid"/>
+        <attributeEditorContainer name="t" columnCount="0" visibilityExpressionEnabled="0" groupBox="0" showLabel="1" visibilityExpression="">
+          <attributeEditorContainer name="c1" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="pkuid" showLabel="1" index="1"/>
           </attributeEditorContainer>
-          <attributeEditorContainer showLabel="1" columnCount="0" visibilityExpression="" groupBox="1" name="c2" visibilityExpressionEnabled="0">
-            <attributeEditorField showLabel="1" index="2" name="color"/>
+          <attributeEditorContainer name="c2" columnCount="0" visibilityExpressionEnabled="0" groupBox="1" showLabel="1" visibilityExpression="">
+            <attributeEditorField name="color" showLabel="1" index="2"/>
           </attributeEditorContainer>
         </attributeEditorContainer>
       </attributeEditorForm>
@@ -3994,7 +3994,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "pkuid", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer minScale="1e+8" labelsEnabled="1" type="vector" readOnly="0" autoRefreshTime="0" simplifyMaxScale="1" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" geometry="Point" simplifyLocal="1">
+    <maplayer labelsEnabled="1" minScale="1e+8" geometry="Point" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" maxScale="0" type="vector" autoRefreshTime="0" autoRefreshEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" simplifyDrawingHints="0" readOnly="0" simplifyDrawingTol="1" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>1000</xmin>
         <ymin>2000</ymin>
@@ -4049,14 +4049,14 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="singleSymbol" symbollevels="0" forceraster="0" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" name="0" alpha="1">
-            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+          <symbol name="0" alpha="1" type="marker" clip_to_extent="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <prop k="angle" v="0"/>
               <prop k="color" v="172,96,98,255"/>
               <prop k="horizontal_anchor_point" v="1"/>
@@ -4077,9 +4077,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4093,17 +4093,17 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory scaleBasedVisibility="0" barWidth="5" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" minimumSize="0" backgroundAlpha="255" penColor="#000000" maxScaleDenominator="1e+8" width="15" penWidth="0" rotationOffset="270" diagramOrientation="Up" sizeType="MM" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" labelPlacementMethod="XHeight" height="15" backgroundColor="#ffffff" lineSizeType="MM" penAlpha="255">
-          <fontProperties description="DejaVu Sans,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" label="" color="#000000"/>
+        <DiagramCategory minScaleDenominator="0" diagramOrientation="Up" backgroundAlpha="255" penWidth="0" minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" width="15" labelPlacementMethod="XHeight" barWidth="5" scaleBasedVisibility="0" backgroundColor="#ffffff" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" sizeType="MM" lineSizeType="MM" maxScaleDenominator="1e+8" opacity="1" penAlpha="255" rotationOffset="270">
+          <fontProperties style="" description="DejaVu Sans,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="10" priority="0" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" dist="0" linePlacementFlags="10" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -4131,31 +4131,31 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="gid" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="color" index="2" name=""/>
+        <alias name="" index="0" field="gid"/>
+        <alias name="" index="1" field="name"/>
+        <alias name="" index="2" field="color"/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default field="gid" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="color" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="gid"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="color"/>
       </defaults>
       <constraints>
-        <constraint field="gid" exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1"/>
-        <constraint field="name" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="color" exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0"/>
+        <constraint notnull_strength="1" exp_strength="0" constraints="3" unique_strength="1" field="gid"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" unique_strength="0" field="color"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="gid" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="color" desc="" exp=""/>
+        <constraint desc="" exp="" field="gid"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="color"/>
       </constraintExpressions>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <editform>../../../../../..</editform>
@@ -4192,9 +4192,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="Country_Diagrams_208edc6e_7828_426b_a7d8_c2383f10761d"/>
   </layerorder>
   <properties>
-    <WMSFees type="QString">conditions unknown</WMSFees>
-    <WMSContactMail type="QString"></WMSContactMail>
-    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
+    <Identify>
+      <disabledLayers type="QStringList"/>
+    </Identify>
     <WFSLayers type="QStringList">
       <value>Hello_SubsetString_copy20160222085231770</value>
       <value>Hello_copy20150804164427541</value>
@@ -4202,161 +4202,166 @@ def my_form_open(dialog, layer, feature):
       <value>hello20131022151106574</value>
       <value>points20150803121107046</value>
     </WFSLayers>
-    <WMSMaxWidth type="int">5000</WMSMaxWidth>
-    <WFSTLayers>
-      <Delete type="QStringList">
-        <value>points20150803121107046</value>
-      </Delete>
-      <Update type="QStringList">
-        <value>points20150803121107046</value>
-      </Update>
-      <Insert type="QStringList">
-        <value>points20150803121107046</value>
-      </Insert>
-    </WFSTLayers>
-    <WMSAddWktGeometry type="bool">true</WMSAddWktGeometry>
-    <SpatialRefSys>
-      <ProjectCrs type="QString">EPSG:3857</ProjectCrs>
-      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
-      <ProjectCRSProj4String type="QString">+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs</ProjectCRSProj4String>
-      <ProjectCRSID type="int">3857</ProjectCRSID>
-    </SpatialRefSys>
-    <WMSRestrictedLayers type="QStringList"/>
-    <WFSUrl type="QString"></WFSUrl>
-    <WMSServiceTitle type="QString">QGIS Server test</WMSServiceTitle>
-    <WMSOnlineResource type="QString"></WMSOnlineResource>
-    <WFSLayersPrecision>
-      <hello20131022151106574 type="int">0</hello20131022151106574>
-      <Hello_copy20150804164427541 type="int">1</Hello_copy20150804164427541>
-      <Hello_SubsetString_copy20160222085231770 type="int">1</Hello_SubsetString_copy20160222085231770>
-      <country20131022151106556 type="int">1</country20131022151106556>
-      <points20150803121107046 type="int">1</points20150803121107046>
-    </WFSLayersPrecision>
-    <WMSMaxHeight type="int">5000</WMSMaxHeight>
-    <WCSLayers type="QStringList">
-      <value>dem20150730091219559</value>
-    </WCSLayers>
-    <PositionPrecision>
-      <DegreeFormat type="QString">D</DegreeFormat>
-      <DecimalPlaces type="int">2</DecimalPlaces>
-      <Automatic type="bool">true</Automatic>
-    </PositionPrecision>
-    <PAL>
-      <ShowingAllLabels type="bool">false</ShowingAllLabels>
-      <CandidatesLine type="int">50</CandidatesLine>
-      <CandidatesPoint type="int">16</CandidatesPoint>
-      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
-      <DrawRectOnly type="bool">false</DrawRectOnly>
-      <ShowingCandidates type="bool">false</ShowingCandidates>
-      <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
-      <CandidatesPolygon type="int">30</CandidatesPolygon>
-      <SearchMethod type="int">0</SearchMethod>
-    </PAL>
-    <Legend>
-      <filterByMap type="bool">false</filterByMap>
-    </Legend>
-    <WMSPrecision type="QString">5</WMSPrecision>
-    <Identify>
-      <disabledLayers type="QStringList"/>
-    </Identify>
-    <WMSContactPosition type="QString"></WMSContactPosition>
-    <WCSUrl type="QString"></WCSUrl>
-    <WMSContactPerson type="QString">Stéphane Brunner</WMSContactPerson>
-    <WMSCrsList type="QStringList">
-      <value>EPSG:3857</value>
-      <value>EPSG:4326</value>
-    </WMSCrsList>
-    <WMSServiceAbstract type="QString">Simple test app.</WMSServiceAbstract>
-    <DefaultStyles>
-      <AlphaInt type="int">255</AlphaInt>
-      <Fill type="QString"></Fill>
-      <Line type="QString"></Line>
-      <ColorRamp type="QString"></ColorRamp>
-      <RandomColors type="bool">true</RandomColors>
-      <Marker type="QString"></Marker>
-    </DefaultStyles>
-    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
-    <Paths>
-      <Absolute type="bool">false</Absolute>
-    </Paths>
-    <Gui>
-      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
-      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
-      <CanvasColorRedPart type="int">255</CanvasColorRedPart>
-      <SelectionColorAlphaPart type="int">128</SelectionColorAlphaPart>
-      <SelectionColorBluePart type="int">108</SelectionColorBluePart>
-      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
-      <SelectionColorGreenPart type="int">246</SelectionColorGreenPart>
-    </Gui>
-    <Digitizing>
-      <AvoidIntersectionsList type="QStringList"/>
-      <LayerSnappingEnabledList type="QStringList">
-        <value>enabled</value>
-        <value>enabled</value>
-      </LayerSnappingEnabledList>
-      <DefaultSnapType type="QString">to vertex</DefaultSnapType>
-      <LayerSnappingToleranceList type="QStringList">
-        <value>40.000000</value>
-        <value>40.000000</value>
-      </LayerSnappingToleranceList>
-      <LayerSnappingList type="QStringList">
-        <value>country20131022151106556</value>
-        <value>hello20131022151106574</value>
-      </LayerSnappingList>
-      <DefaultSnapToleranceUnit type="int">1</DefaultSnapToleranceUnit>
-      <LayerSnappingToleranceUnitList type="QStringList">
-        <value>1</value>
-        <value>1</value>
-      </LayerSnappingToleranceUnitList>
-      <LayerSnapToList type="QStringList">
-        <value>to_vertex</value>
-        <value>to_vertex</value>
-      </LayerSnapToList>
-      <DefaultSnapTolerance type="double">40</DefaultSnapTolerance>
-      <SnappingMode type="QString">advanced</SnappingMode>
-    </Digitizing>
-    <Measurement>
-      <AreaUnits type="QString">m2</AreaUnits>
-      <DistanceUnits type="QString">meters</DistanceUnits>
-    </Measurement>
-    <Macros>
-      <pythonCode type="QString"></pythonCode>
-    </Macros>
-    <TimeManager>
-      <showLabel type="int">1</showLabel>
-      <playBackwards type="int">0</playBackwards>
-      <timeLayerList type="QStringList"/>
-      <loopAnimation type="int">0</loopAnimation>
-      <timeFrameType type="QString">days</timeFrameType>
-      <timeFrameSize type="int">1</timeFrameSize>
-      <animationFrameLength type="int">2000</animationFrameLength>
-      <timeLayerManager type="QString"></timeLayerManager>
-      <currentMapTimePosition type="int">0</currentMapTimePosition>
-      <active type="int">1</active>
-    </TimeManager>
-    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
-    <Variables>
-      <variableNames type="QStringList"/>
-      <variableValues type="QStringList"/>
-    </Variables>
-    <WMSRequestDefinedDataSources type="bool">false</WMSRequestDefinedDataSources>
-    <WMSUrl type="QString"></WMSUrl>
     <WMSExtent type="QStringList">
       <value>-20609693.37008669599890709</value>
       <value>-11055006.82298868149518967</value>
       <value>20961935.60850896313786507</value>
       <value>19143772.79360072687268257</value>
     </WMSExtent>
+    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
+    <RequiredLayers>
+      <Layers type="QStringList"/>
+    </RequiredLayers>
     <WMSKeywordList type="QStringList">
       <value></value>
     </WMSKeywordList>
+    <WMSServiceCapabilities type="bool">true</WMSServiceCapabilities>
+    <WMSRestrictedLayers type="QStringList"/>
+    <WFSTLayers>
+      <Update type="QStringList">
+        <value>points20150803121107046</value>
+      </Update>
+      <Insert type="QStringList">
+        <value>points20150803121107046</value>
+      </Insert>
+      <Delete type="QStringList">
+        <value>points20150803121107046</value>
+      </Delete>
+    </WFSTLayers>
+    <Macros>
+      <pythonCode type="QString"></pythonCode>
+    </Macros>
+    <PAL>
+      <SearchMethod type="int">0</SearchMethod>
+      <ShowingAllLabels type="bool">false</ShowingAllLabels>
+      <ShowingCandidates type="bool">false</ShowingCandidates>
+      <DrawRectOnly type="bool">false</DrawRectOnly>
+      <CandidatesLine type="int">50</CandidatesLine>
+      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
+      <DrawOutlineLabels type="bool">true</DrawOutlineLabels>
+      <CandidatesPoint type="int">16</CandidatesPoint>
+      <CandidatesPolygon type="int">30</CandidatesPolygon>
+    </PAL>
+    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
+    <WMSOnlineResource type="QString"></WMSOnlineResource>
+    <WMSRestrictedComposers type="QStringList"/>
+    <WMSRequestDefinedDataSources type="bool">false</WMSRequestDefinedDataSources>
+    <WMSMaxWidth type="int">5000</WMSMaxWidth>
+    <WFSLayersPrecision>
+      <hello20131022151106574 type="int">0</hello20131022151106574>
+      <country20131022151106556 type="int">1</country20131022151106556>
+      <Hello_SubsetString_copy20160222085231770 type="int">1</Hello_SubsetString_copy20160222085231770>
+      <points20150803121107046 type="int">1</points20150803121107046>
+      <Hello_copy20150804164427541 type="int">1</Hello_copy20150804164427541>
+    </WFSLayersPrecision>
+    <WMSContactMail type="QString"></WMSContactMail>
+    <Measurement>
+      <DistanceUnits type="QString">meters</DistanceUnits>
+      <AreaUnits type="QString">m2</AreaUnits>
+    </Measurement>
+    <WMSContactPerson type="QString">Stéphane Brunner</WMSContactPerson>
+    <WMSMaxHeight type="int">5000</WMSMaxHeight>
+    <DefaultStyles>
+      <ColorRamp type="QString"></ColorRamp>
+      <RandomColors type="bool">true</RandomColors>
+      <AlphaInt type="int">255</AlphaInt>
+      <Marker type="QString"></Marker>
+      <Opacity type="double">1</Opacity>
+      <Fill type="QString"></Fill>
+      <Line type="QString"></Line>
+    </DefaultStyles>
+    <WMSServiceTitle type="QString">QGIS Server test</WMSServiceTitle>
+    <WMSContactPosition type="QString"></WMSContactPosition>
+    <WMSServiceAbstract type="QString">Simple test app.</WMSServiceAbstract>
+    <WMSAddWktGeometry type="bool">true</WMSAddWktGeometry>
+    <Variables>
+      <variableNames type="QStringList"/>
+      <variableValues type="QStringList"/>
+    </Variables>
+    <Legend>
+      <filterByMap type="bool">false</filterByMap>
+    </Legend>
+    <Digitizing>
+      <SnappingMode type="QString">advanced</SnappingMode>
+      <LayerSnappingEnabledList type="QStringList">
+        <value>enabled</value>
+        <value>enabled</value>
+      </LayerSnappingEnabledList>
+      <DefaultSnapTolerance type="double">40</DefaultSnapTolerance>
+      <DefaultSnapType type="QString">to vertex</DefaultSnapType>
+      <LayerSnappingToleranceList type="QStringList">
+        <value>40.000000</value>
+        <value>40.000000</value>
+      </LayerSnappingToleranceList>
+      <LayerSnapToList type="QStringList">
+        <value>to_vertex</value>
+        <value>to_vertex</value>
+      </LayerSnapToList>
+      <LayerSnappingToleranceUnitList type="QStringList">
+        <value>1</value>
+        <value>1</value>
+      </LayerSnappingToleranceUnitList>
+      <AvoidIntersectionsList type="QStringList"/>
+      <DefaultSnapToleranceUnit type="int">1</DefaultSnapToleranceUnit>
+      <LayerSnappingList type="QStringList">
+        <value>country20131022151106556</value>
+        <value>hello20131022151106574</value>
+      </LayerSnappingList>
+    </Digitizing>
+    <WCSLayers type="QStringList">
+      <value>dem20150730091219559</value>
+    </WCSLayers>
+    <WMSUrl type="QString"></WMSUrl>
+    <Paths>
+      <Absolute type="bool">false</Absolute>
+    </Paths>
     <WMSContactPhone type="QString"></WMSContactPhone>
     <WMSImageQuality type="int">90</WMSImageQuality>
-    <WMSContactOrganization type="QString">QGIS</WMSContactOrganization>
-    <WMSServiceCapabilities type="bool">true</WMSServiceCapabilities>
+    <WFSUrl type="QString"></WFSUrl>
+    <Gui>
+      <SelectionColorBluePart type="int">108</SelectionColorBluePart>
+      <SelectionColorAlphaPart type="int">128</SelectionColorAlphaPart>
+      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
+      <SelectionColorGreenPart type="int">246</SelectionColorGreenPart>
+      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
+      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
+      <CanvasColorRedPart type="int">255</CanvasColorRedPart>
+    </Gui>
+    <WMSPrecision type="QString">5</WMSPrecision>
+    <WMSCrsList type="QStringList">
+      <value>EPSG:3857</value>
+      <value>EPSG:4326</value>
+    </WMSCrsList>
+    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
+    <WMSFees type="QString">conditions unknown</WMSFees>
+    <WCSUrl type="QString"></WCSUrl>
+    <PositionPrecision>
+      <DecimalPlaces type="int">2</DecimalPlaces>
+      <DegreeFormat type="QString">D</DegreeFormat>
+      <Automatic type="bool">true</Automatic>
+    </PositionPrecision>
     <Measure>
       <Ellipsoid type="QString">WGS84</Ellipsoid>
     </Measure>
+    <WMSContactOrganization type="QString">QGIS</WMSContactOrganization>
+    <TimeManager>
+      <timeFrameType type="QString">days</timeFrameType>
+      <playBackwards type="int">0</playBackwards>
+      <animationFrameLength type="int">2000</animationFrameLength>
+      <loopAnimation type="int">0</loopAnimation>
+      <timeFrameSize type="int">1</timeFrameSize>
+      <currentMapTimePosition type="int">0</currentMapTimePosition>
+      <active type="int">1</active>
+      <timeLayerManager type="QString"></timeLayerManager>
+      <showLabel type="int">1</showLabel>
+      <timeLayerList type="QStringList"/>
+    </TimeManager>
+    <SpatialRefSys>
+      <ProjectCrs type="QString">EPSG:3857</ProjectCrs>
+      <ProjectCRSID type="int">3857</ProjectCRSID>
+      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
+      <ProjectCRSProj4String type="QString">+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs</ProjectCRSProj4String>
+    </SpatialRefSys>
   </properties>
   <visibility-presets/>
   <transformContext/>
@@ -4367,18 +4372,27 @@ def my_form_open(dialog, layer, feature):
     <type></type>
     <title>QGIS Server Hello World</title>
     <abstract></abstract>
+    <contact>
+      <name></name>
+      <organization></organization>
+      <position></position>
+      <voice></voice>
+      <fax></fax>
+      <email></email>
+      <role></role>
+    </contact>
     <links/>
     <author></author>
-    <creation></creation>
+    <creation>2000-01-01T00:00:00</creation>
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" printResolution="300" worldFileMap="" name="layoutA4">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" resolution="10" offsetX="0" offsetY="0" offsetUnits="mm"/>
+    <Layout name="layoutA4" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" offsetUnits="mm" resolution="10" offsetX="0"/>
       <PageCollection>
-        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
-          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -4392,22 +4406,22 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem type="65638" positionLock="false" visibility="1" itemRotation="0" positionOnPage="0,0,mm" blendMode="0" zValue="0" frameJoinStyle="miter" frame="false" background="true" excludeFromExports="0" size="297,210,mm" outlineWidthM="0.3,mm" uuid="{5ba811b6-fe73-4b35-8b5b-a66628550f58}" groupUuid="" referencePoint="0" id="" templateUuid="{5ba811b6-fe73-4b35-8b5b-a66628550f58}" position="0,0,mm" opacity="1">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" templateUuid="{5ba811b6-fe73-4b35-8b5b-a66628550f58}" excludeFromExports="0" itemRotation="0" frame="false" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="0" id="" blendMode="0" uuid="{5ba811b6-fe73-4b35-8b5b-a66628550f58}" type="65638" background="true" size="297,210,mm" positionLock="false" groupUuid="" positionOnPage="0,0,mm" opacity="1" referencePoint="0">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -4415,51 +4429,51 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65641" positionLock="false" visibility="1" labelText="QGIS" itemRotation="0" positionOnPage="21.5381,157.547,mm" blendMode="0" zValue="4" frameJoinStyle="miter" marginY="1" frame="false" background="false" excludeFromExports="0" size="120.853,35.0992,mm" outlineWidthM="0.3,mm" uuid="{df61fc2f-86dc-402e-a37a-bc577e6349cd}" groupUuid="" referencePoint="0" id="idtextbox" templateUuid="{df61fc2f-86dc-402e-a37a-bc577e6349cd}" htmlState="0" position="21.5381,157.547,mm" opacity="1" marginX="1" halign="1" valign="32">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="21.5381,157.547,mm" templateUuid="{df61fc2f-86dc-402e-a37a-bc577e6349cd}" valign="32" excludeFromExports="0" itemRotation="0" marginX="1" frame="false" marginY="1" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="4" id="idtextbox" htmlState="0" blendMode="0" uuid="{df61fc2f-86dc-402e-a37a-bc577e6349cd}" type="65641" labelText="QGIS" background="false" size="120.853,35.0992,mm" positionLock="false" groupUuid="" halign="1" positionOnPage="21.5381,157.547,mm" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="DejaVu Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-        <FontColor blue="0" green="0" red="0"/>
+        <LabelFont style="" description="DejaVu Sans,10,-1,5,50,0,0,0,0,0"/>
+        <FontColor green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65639" followPreset="false" followPresetName="" positionLock="false" visibility="1" itemRotation="0" positionOnPage="21.3911,46,mm" blendMode="0" zValue="3" frameJoinStyle="miter" frame="false" background="true" excludeFromExports="0" size="242,104,mm" outlineWidthM="0.3,mm" uuid="{e2138dff-8012-45c7-9a52-a543ca96ac60}" groupUuid="" drawCanvasItems="true" referencePoint="0" id="" keepLayerSet="false" templateUuid="{e2138dff-8012-45c7-9a52-a543ca96ac60}" position="21.3911,46,mm" mapRotation="0" opacity="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="21.3911,46,mm" followPresetName="" templateUuid="{e2138dff-8012-45c7-9a52-a543ca96ac60}" followPreset="false" excludeFromExports="0" keepLayerSet="false" itemRotation="0" frame="false" visibility="1" mapRotation="0" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="3" id="" blendMode="0" uuid="{e2138dff-8012-45c7-9a52-a543ca96ac60}" type="65639" background="true" size="242,104,mm" positionLock="false" groupUuid="" positionOnPage="21.3911,46,mm" drawCanvasItems="true" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="16020257.03109830431640148" ymin="-13032965.18542143888771534" xmin="-33626185.49808585643768311" xmax="33978427.73650816082954407"/>
+        <Extent ymax="16020257.03109830431640148" xmax="33978427.73650816082954407" ymin="-13032965.18542143888771534" xmin="-33626185.49808585643768311"/>
         <LayerSet>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;points&quot; (geom) sql=" provider="spatialite" name="db_point">points20150803121107046</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" provider="spatialite" name="Hello">hello20131022151106574</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" provider="spatialite" name="Hello_SubsetString">Hello_copy20150804164427541</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=&quot;pkuid&quot; in ( 7, 8 )" provider="spatialite" name="Hello_Project_SubsetString">Hello_SubsetString_copy20160222085231770</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" provider="spatialite" name="Hello_Filter_SubsetString">Hello_Project_SubsetString_copy20160223113949592</Layer>
-          <Layer source="/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/dem.tif" provider="gdal" name="dem">dem20150730091219559</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" provider="spatialite" name="Country">country20131022151106556</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" provider="spatialite" name="Country_Labels">Country_copy20161127151800736</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" provider="spatialite" name="Country_Diagrams">country20170328164317226</Layer>
+          <Layer name="db_point" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;points&quot; (geom) sql=">points20150803121107046</Layer>
+          <Layer name="Hello" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=">hello20131022151106574</Layer>
+          <Layer name="Hello_SubsetString" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=">Hello_copy20150804164427541</Layer>
+          <Layer name="Hello_Project_SubsetString" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=&quot;pkuid&quot; in ( 7, 8 )">Hello_SubsetString_copy20160222085231770</Layer>
+          <Layer name="Hello_Filter_SubsetString" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=">Hello_Project_SubsetString_copy20160223113949592</Layer>
+          <Layer name="dem" provider="gdal" source="/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/dem.tif">dem20150730091219559</Layer>
+          <Layer name="Country" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=">country20131022151106556</Layer>
+          <Layer name="Country_Labels" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=">Country_copy20161127151800736</Layer>
+          <Layer name="Country_Diagrams" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=">country20170328164317226</Layer>
         </LayerSet>
-        <ComposerMapGrid intervalY="0" gridFramePenColor="0,0,0,255" rightAnnotationDisplay="0" offsetY="0" leftAnnotationPosition="1" frameAnnotationDistance="1" crossLength="3" bottomAnnotationPosition="1" annotationExpression="" leftAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" rightAnnotationPosition="1" topAnnotationDisplay="0" gridFrameStyle="0" name="Grid 1" topAnnotationDirection="0" bottomAnnotationDisplay="0" bottomFrameDivisions="0" uuid="{2097ba82-73aa-4cf8-911e-b3472427ff3f}" gridFrameSideFlags="15" topFrameDivisions="0" leftAnnotationDirection="0" offsetX="0" unit="0" showAnnotation="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridStyle="0" annotationPrecision="3" topAnnotationPosition="1" rightAnnotationDirection="0" bottomAnnotationDirection="0" intervalX="0" annotationFontColor="0,0,0,255" annotationFormat="0" show="1" rightFrameDivisions="0">
+        <ComposerMapGrid annotationFormat="0" annotationExpression="" leftFrameDivisions="0" gridFrameStyle="0" showAnnotation="0" leftAnnotationDisplay="0" bottomAnnotationDirection="0" uuid="{2097ba82-73aa-4cf8-911e-b3472427ff3f}" bottomAnnotationDisplay="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" gridStyle="0" intervalY="0" intervalX="0" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" leftAnnotationDirection="0" topAnnotationDirection="0" gridFrameWidth="2" crossLength="3" blendMode="0" annotationPrecision="3" frameFillColor1="255,255,255,255" unit="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" show="1" topAnnotationPosition="1" gridFrameSideFlags="15" leftAnnotationPosition="1" frameAnnotationDistance="1" rightAnnotationPosition="1" rightAnnotationDisplay="0" topAnnotationDisplay="0" topFrameDivisions="0" bottomFrameDivisions="0" name="Grid 1" offsetY="0" offsetX="0">
           <lineStyle>
-            <symbol type="line" clip_to_extent="1" name="" alpha="1">
-              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+            <symbol name="" alpha="1" type="line" clip_to_extent="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4477,17 +4491,17 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
-              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -4508,59 +4522,59 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description=",11,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description=",11,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
       </LayoutItem>
-      <LayoutItem type="65641" positionLock="false" visibility="1" labelText="Welcome to our world...." itemRotation="0" positionOnPage="213.302,161.791,mm" blendMode="0" zValue="2" frameJoinStyle="miter" marginY="1" frame="false" background="false" excludeFromExports="0" size="64.3016,11.0626,mm" outlineWidthM="0.3,mm" uuid="{b3f8da1e-352d-4ea6-b8c1-c2464bfdd050}" groupUuid="" referencePoint="0" id="" templateUuid="{b3f8da1e-352d-4ea6-b8c1-c2464bfdd050}" htmlState="0" position="213.302,161.791,mm" opacity="1" marginX="1" halign="1" valign="32">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="213.302,161.791,mm" templateUuid="{b3f8da1e-352d-4ea6-b8c1-c2464bfdd050}" valign="32" excludeFromExports="0" itemRotation="0" marginX="1" frame="false" marginY="1" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="2" id="" htmlState="0" blendMode="0" uuid="{b3f8da1e-352d-4ea6-b8c1-c2464bfdd050}" type="65641" labelText="Welcome to our world...." background="false" size="64.3016,11.0626,mm" positionLock="false" groupUuid="" halign="1" positionOnPage="213.302,161.791,mm" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="DejaVu Sans,12,-1,5,75,0,0,0,0,0" style=""/>
-        <FontColor blue="0" green="0" red="0"/>
+        <LabelFont style="" description="DejaVu Sans,12,-1,5,75,0,0,0,0,0"/>
+        <FontColor green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" positionLock="false" visibility="1" labelText="QGIS Mapserver" itemRotation="0" positionOnPage="49.9838,9.33411,mm" blendMode="0" zValue="1" frameJoinStyle="miter" marginY="1" frame="false" background="false" excludeFromExports="0" size="215.03,28.0023,mm" outlineWidthM="0.3,mm" uuid="{4f60a368-b33d-4bd1-950a-76a48f3c8695}" groupUuid="" referencePoint="0" id="" templateUuid="{4f60a368-b33d-4bd1-950a-76a48f3c8695}" htmlState="0" position="49.9838,9.33411,mm" opacity="1" marginX="1" halign="1" valign="32">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="49.9838,9.33411,mm" templateUuid="{4f60a368-b33d-4bd1-950a-76a48f3c8695}" valign="32" excludeFromExports="0" itemRotation="0" marginX="1" frame="false" marginY="1" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="1" id="" htmlState="0" blendMode="0" uuid="{4f60a368-b33d-4bd1-950a-76a48f3c8695}" type="65641" labelText="QGIS Mapserver" background="false" size="215.03,28.0023,mm" positionLock="false" groupUuid="" halign="1" positionOnPage="49.9838,9.33411,mm" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="DejaVu Sans,48,-1,5,75,0,0,0,0,0" style=""/>
-        <FontColor blue="0" green="0" red="0"/>
+        <LabelFont style="" description="DejaVu Sans,48,-1,5,75,0,0,0,0,0"/>
+        <FontColor green="0" red="0" blue="0"/>
       </LayoutItem>
       <customproperties/>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="0" coverageLayer="" pageNameExpression="" sortFeatures="0" filterFeatures="0" hideCoverage="0"/>
+      <Atlas filterFeatures="0" coverageLayer="" sortFeatures="0" enabled="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="0" pageNameExpression=""/>
     </Layout>
-    <Layout units="mm" printResolution="300" worldFileMap="" name="layoutA4copy">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" resolution="10" offsetX="0" offsetY="0" offsetUnits="mm"/>
+    <Layout name="layoutA4copy" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" offsetUnits="mm" resolution="10" offsetX="0"/>
       <PageCollection>
-        <symbol type="fill" clip_to_extent="1" name="" alpha="1">
-          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+        <symbol name="" alpha="1" type="fill" clip_to_extent="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
             <prop k="joinstyle" v="miter"/>
@@ -4574,22 +4588,22 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem type="65638" positionLock="false" visibility="1" itemRotation="0" positionOnPage="0,0,mm" blendMode="0" zValue="0" frameJoinStyle="miter" frame="false" background="true" excludeFromExports="0" size="297,210,mm" outlineWidthM="0.3,mm" uuid="{be5b970b-dedc-4331-9553-c78d877046e4}" groupUuid="" referencePoint="0" id="" templateUuid="{be5b970b-dedc-4331-9553-c78d877046e4}" position="0,0,mm" opacity="1">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" templateUuid="{be5b970b-dedc-4331-9553-c78d877046e4}" excludeFromExports="0" itemRotation="0" frame="false" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="0" id="" blendMode="0" uuid="{be5b970b-dedc-4331-9553-c78d877046e4}" type="65638" background="true" size="297,210,mm" positionLock="false" groupUuid="" positionOnPage="0,0,mm" opacity="1" referencePoint="0">
+          <FrameColor alpha="255" green="0" red="0" blue="0"/>
+          <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -4597,82 +4611,82 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem lineSpacing="1" resizeToContents="1" templateUuid="{3d056e83-9087-450b-81e7-b343a652139d}" positionOnPage="147.933,150,mm" opacity="1" frameJoinStyle="miter" titleAlignment="1" zValue="5" symbolWidth="7" columnCount="1" type="65642" blendMode="0" background="true" splitLayer="0" boxSpace="2" map_uuid="{98195e4d-0084-4747-b15b-507220be6d8a}" symbolHeight="4" title="" columnSpace="2" id="" fontColor="#000000" rasterBorderColor="0,0,0,255" uuid="{3d056e83-9087-450b-81e7-b343a652139d}" outlineWidthM="0.3,mm" wmsLegendHeight="25" rasterBorderWidth="0" referencePoint="0" position="147.933,150,mm" legendFilterByAtlas="0" visibility="1" itemRotation="0" size="65.3688,96.2,mm" positionLock="false" rasterBorder="1" frame="false" excludeFromExports="0" groupUuid="" equalColumnWidth="0" wrapChar="" wmsLegendWidth="50">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem rasterBorder="1" wmsLegendHeight="25" referencePoint="0" frame="false" id="" rasterBorderWidth="0" itemRotation="0" symbolWidth="7" frameJoinStyle="miter" uuid="{3d056e83-9087-450b-81e7-b343a652139d}" boxSpace="2" title="" splitLayer="0" excludeFromExports="0" fontColor="#000000" equalColumnWidth="0" positionLock="false" wrapChar="" symbolHeight="4" blendMode="0" columnSpace="2" templateUuid="{3d056e83-9087-450b-81e7-b343a652139d}" visibility="1" opacity="1" lineSpacing="1" position="147.933,150,mm" rasterBorderColor="0,0,0,255" size="65.3688,96.2,mm" wmsLegendWidth="50" background="true" type="65642" outlineWidthM="0.3,mm" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="147.933,150,mm" groupUuid="" columnCount="1" map_uuid="{98195e4d-0084-4747-b15b-507220be6d8a}" titleAlignment="1" zValue="5">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style marginBottom="3.5" name="title">
-            <styleFont description="Ubuntu,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="title" marginBottom="3.5">
+            <styleFont style="" description="Ubuntu,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="3" name="group">
-            <styleFont description="Ubuntu,14,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="group" marginTop="3">
+            <styleFont style="" description="Ubuntu,14,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="3" name="subgroup">
-            <styleFont description="Ubuntu,12,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="subgroup" marginTop="3">
+            <styleFont style="" description="Ubuntu,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginTop="2.5" name="symbol">
-            <styleFont description="Ubuntu,11,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbol" marginTop="2.5">
+            <styleFont style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style marginLeft="2" marginTop="2" name="symbolLabel">
-            <styleFont description="Ubuntu,12,-1,5,50,0,0,0,0,0" style=""/>
+          <style name="symbolLabel" marginTop="2" marginLeft="2">
+            <styleFont style="" description="Ubuntu,12,-1,5,50,0,0,0,0,0"/>
           </style>
         </styles>
       </LayoutItem>
-      <LayoutItem type="65641" positionLock="false" visibility="1" labelText="QGIS" itemRotation="0" positionOnPage="21.5381,157.547,mm" blendMode="0" zValue="4" frameJoinStyle="miter" marginY="1" frame="false" background="false" excludeFromExports="0" size="120.853,35.0992,mm" outlineWidthM="0.3,mm" uuid="{aaaf60fd-943b-463a-b2e5-162b0f7931a5}" groupUuid="" referencePoint="0" id="idtextbox" templateUuid="{aaaf60fd-943b-463a-b2e5-162b0f7931a5}" htmlState="0" position="21.5381,157.547,mm" opacity="1" marginX="1" halign="1" valign="32">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="21.5381,157.547,mm" templateUuid="{aaaf60fd-943b-463a-b2e5-162b0f7931a5}" valign="32" excludeFromExports="0" itemRotation="0" marginX="1" frame="false" marginY="1" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="4" id="idtextbox" htmlState="0" blendMode="0" uuid="{aaaf60fd-943b-463a-b2e5-162b0f7931a5}" type="65641" labelText="QGIS" background="false" size="120.853,35.0992,mm" positionLock="false" groupUuid="" halign="1" positionOnPage="21.5381,157.547,mm" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="DejaVu Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-        <FontColor blue="0" green="0" red="0"/>
+        <LabelFont style="" description="DejaVu Sans,10,-1,5,50,0,0,0,0,0"/>
+        <FontColor green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65639" followPreset="false" followPresetName="" positionLock="false" visibility="1" itemRotation="0" positionOnPage="21.3911,46,mm" blendMode="0" zValue="3" frameJoinStyle="miter" frame="false" background="true" excludeFromExports="0" size="242,104,mm" outlineWidthM="0.3,mm" uuid="{98195e4d-0084-4747-b15b-507220be6d8a}" groupUuid="" drawCanvasItems="true" referencePoint="0" id="" keepLayerSet="false" templateUuid="{98195e4d-0084-4747-b15b-507220be6d8a}" position="21.3911,46,mm" mapRotation="0" opacity="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="21.3911,46,mm" followPresetName="" templateUuid="{98195e4d-0084-4747-b15b-507220be6d8a}" followPreset="false" excludeFromExports="0" keepLayerSet="false" itemRotation="0" frame="false" visibility="1" mapRotation="0" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="3" id="" blendMode="0" uuid="{98195e4d-0084-4747-b15b-507220be6d8a}" type="65639" background="true" size="242,104,mm" positionLock="false" groupUuid="" positionOnPage="21.3911,46,mm" drawCanvasItems="true" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent ymax="16020257.03109830431640148" ymin="-13032965.18542143888771534" xmin="-33626185.49808585643768311" xmax="33978427.73650816082954407"/>
+        <Extent ymax="16020257.03109830431640148" xmax="33978427.73650816082954407" ymin="-13032965.18542143888771534" xmin="-33626185.49808585643768311"/>
         <LayerSet>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;points&quot; (geom) sql=" provider="spatialite" name="db_point">points20150803121107046</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" provider="spatialite" name="Hello">hello20131022151106574</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" provider="spatialite" name="Hello_SubsetString">Hello_copy20150804164427541</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=&quot;pkuid&quot; in ( 7, 8 )" provider="spatialite" name="Hello_Project_SubsetString">Hello_SubsetString_copy20160222085231770</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=" provider="spatialite" name="Hello_Filter_SubsetString">Hello_Project_SubsetString_copy20160223113949592</Layer>
-          <Layer source="/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/dem.tif" provider="gdal" name="dem">dem20150730091219559</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" provider="spatialite" name="Country">country20131022151106556</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" provider="spatialite" name="Country_Labels">Country_copy20161127151800736</Layer>
-          <Layer source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=" provider="spatialite" name="Country_Diagrams">country20170328164317226</Layer>
+          <Layer name="db_point" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;points&quot; (geom) sql=">points20150803121107046</Layer>
+          <Layer name="Hello" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=">hello20131022151106574</Layer>
+          <Layer name="Hello_SubsetString" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=">Hello_copy20150804164427541</Layer>
+          <Layer name="Hello_Project_SubsetString" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=&quot;pkuid&quot; in ( 7, 8 )">Hello_SubsetString_copy20160222085231770</Layer>
+          <Layer name="Hello_Filter_SubsetString" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;hello&quot; (geom) sql=">Hello_Project_SubsetString_copy20160223113949592</Layer>
+          <Layer name="dem" provider="gdal" source="/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/dem.tif">dem20150730091219559</Layer>
+          <Layer name="Country" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=">country20131022151106556</Layer>
+          <Layer name="Country_Labels" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=">Country_copy20161127151800736</Layer>
+          <Layer name="Country_Diagrams" provider="spatialite" source="dbname='/home/coupin/workspace/github.com/tcoupin/qgis/tests/testdata/qgis_server_accesscontrol/helloworld.db' table=&quot;country&quot; (geom) sql=">country20170328164317226</Layer>
         </LayerSet>
-        <ComposerMapGrid intervalY="0" gridFramePenColor="0,0,0,255" rightAnnotationDisplay="0" offsetY="0" leftAnnotationPosition="1" frameAnnotationDistance="1" crossLength="3" bottomAnnotationPosition="1" annotationExpression="" leftAnnotationDisplay="0" frameFillColor2="0,0,0,255" blendMode="0" frameFillColor1="255,255,255,255" gridFrameWidth="2" rightAnnotationPosition="1" topAnnotationDisplay="0" gridFrameStyle="0" name="Grid 1" topAnnotationDirection="0" bottomAnnotationDisplay="0" bottomFrameDivisions="0" uuid="{2097ba82-73aa-4cf8-911e-b3472427ff3f}" gridFrameSideFlags="15" topFrameDivisions="0" leftAnnotationDirection="0" offsetX="0" unit="0" showAnnotation="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridStyle="0" annotationPrecision="3" topAnnotationPosition="1" rightAnnotationDirection="0" bottomAnnotationDirection="0" intervalX="0" annotationFontColor="0,0,0,255" annotationFormat="0" show="1" rightFrameDivisions="0">
+        <ComposerMapGrid annotationFormat="0" annotationExpression="" leftFrameDivisions="0" gridFrameStyle="0" showAnnotation="0" leftAnnotationDisplay="0" bottomAnnotationDirection="0" uuid="{2097ba82-73aa-4cf8-911e-b3472427ff3f}" bottomAnnotationDisplay="0" annotationFontColor="0,0,0,255" rightFrameDivisions="0" gridStyle="0" intervalY="0" intervalX="0" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" leftAnnotationDirection="0" topAnnotationDirection="0" gridFrameWidth="2" crossLength="3" blendMode="0" annotationPrecision="3" frameFillColor1="255,255,255,255" unit="0" bottomAnnotationPosition="1" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" show="1" topAnnotationPosition="1" gridFrameSideFlags="15" leftAnnotationPosition="1" frameAnnotationDistance="1" rightAnnotationPosition="1" rightAnnotationDisplay="0" topAnnotationDisplay="0" topFrameDivisions="0" bottomFrameDivisions="0" name="Grid 1" offsetY="0" offsetX="0">
           <lineStyle>
-            <symbol type="line" clip_to_extent="1" name="" alpha="1">
-              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+            <symbol name="" alpha="1" type="line" clip_to_extent="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <prop k="capstyle" v="square"/>
                 <prop k="customdash" v="5;2"/>
                 <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4690,17 +4704,17 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" clip_to_extent="1" name="" alpha="1">
-              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+            <symbol name="" alpha="1" type="marker" clip_to_extent="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <prop k="angle" v="0"/>
                 <prop k="color" v="0,0,0,255"/>
                 <prop k="horizontal_anchor_point" v="1"/>
@@ -4721,52 +4735,52 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description=",11,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description=",11,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
       </LayoutItem>
-      <LayoutItem type="65641" positionLock="false" visibility="1" labelText="Welcome to our world...." itemRotation="0" positionOnPage="213.302,161.791,mm" blendMode="0" zValue="2" frameJoinStyle="miter" marginY="1" frame="false" background="false" excludeFromExports="0" size="64.3016,11.0626,mm" outlineWidthM="0.3,mm" uuid="{05c05681-4df2-4c58-b5d7-cea8e08dd782}" groupUuid="" referencePoint="0" id="" templateUuid="{05c05681-4df2-4c58-b5d7-cea8e08dd782}" htmlState="0" position="213.302,161.791,mm" opacity="1" marginX="1" halign="1" valign="32">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="213.302,161.791,mm" templateUuid="{05c05681-4df2-4c58-b5d7-cea8e08dd782}" valign="32" excludeFromExports="0" itemRotation="0" marginX="1" frame="false" marginY="1" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="2" id="" htmlState="0" blendMode="0" uuid="{05c05681-4df2-4c58-b5d7-cea8e08dd782}" type="65641" labelText="Welcome to our world...." background="false" size="64.3016,11.0626,mm" positionLock="false" groupUuid="" halign="1" positionOnPage="213.302,161.791,mm" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="DejaVu Sans,12,-1,5,75,0,0,0,0,0" style=""/>
-        <FontColor blue="0" green="0" red="0"/>
+        <LabelFont style="" description="DejaVu Sans,12,-1,5,75,0,0,0,0,0"/>
+        <FontColor green="0" red="0" blue="0"/>
       </LayoutItem>
-      <LayoutItem type="65641" positionLock="false" visibility="1" labelText="QGIS Mapserver" itemRotation="0" positionOnPage="49.9838,9.33411,mm" blendMode="0" zValue="1" frameJoinStyle="miter" marginY="1" frame="false" background="false" excludeFromExports="0" size="215.03,28.0023,mm" outlineWidthM="0.3,mm" uuid="{faa8706c-3878-455c-9fd5-607cdd8739f3}" groupUuid="" referencePoint="0" id="" templateUuid="{faa8706c-3878-455c-9fd5-607cdd8739f3}" htmlState="0" position="49.9838,9.33411,mm" opacity="1" marginX="1" halign="1" valign="32">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem position="49.9838,9.33411,mm" templateUuid="{faa8706c-3878-455c-9fd5-607cdd8739f3}" valign="32" excludeFromExports="0" itemRotation="0" marginX="1" frame="false" marginY="1" visibility="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" zValue="1" id="" htmlState="0" blendMode="0" uuid="{faa8706c-3878-455c-9fd5-607cdd8739f3}" type="65641" labelText="QGIS Mapserver" background="false" size="215.03,28.0023,mm" positionLock="false" groupUuid="" halign="1" positionOnPage="49.9838,9.33411,mm" opacity="1" referencePoint="0">
+        <FrameColor alpha="255" green="0" red="0" blue="0"/>
+        <BackgroundColor alpha="255" green="255" red="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="DejaVu Sans,48,-1,5,75,0,0,0,0,0" style=""/>
-        <FontColor blue="0" green="0" red="0"/>
+        <LabelFont style="" description="DejaVu Sans,48,-1,5,75,0,0,0,0,0"/>
+        <FontColor green="0" red="0" blue="0"/>
       </LayoutItem>
       <customproperties/>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="0" coverageLayer="" pageNameExpression="" sortFeatures="0" filterFeatures="0" hideCoverage="0"/>
+      <Atlas filterFeatures="0" coverageLayer="" sortFeatures="0" enabled="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="0" pageNameExpression=""/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/tests/testdata/qgis_server_project/project.qgs b/tests/testdata/qgis_server_project/project.qgs
index ce905ec7e6b..5cab8acae31 100644
--- a/tests/testdata/qgis_server_project/project.qgs
+++ b/tests/testdata/qgis_server_project/project.qgs
@@ -176,8 +176,8 @@
         <noDataList bandNo="8" useSrcNoData="0"/>
         <noDataList bandNo="9" useSrcNoData="0"/>
       </noData>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <pipe>
         <rasterrenderer alphaBand="-1" redBand="1" opacity="1" greenBand="2" type="multibandcolor" blueBand="3">
@@ -267,8 +267,8 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
       <renderer-v2 forceraster="0" type="categorizedSymbol" attr="Name" enableorderby="0" symbollevels="0">
@@ -489,8 +489,8 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
       <renderer-v2 forceraster="0" type="categorizedSymbol" attr="Class" enableorderby="0" symbollevels="0">
@@ -792,8 +792,8 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields/>
-      <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
       <renderer-v2 forceraster="0" type="categorizedSymbol" attr="Name" enableorderby="0" symbollevels="0">