diff --git a/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3 (fences only).pdf b/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3 (fences only).pdf
new file mode 100644
index 0000000..132e99d
--- /dev/null
+++ b/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3 (fences only).pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0c259d4433ff7a4dad690aa0e4425368ea20ef9bb0fa6196538e7c261dad0a5
+size 2352072
diff --git a/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3.pdf b/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3.pdf
new file mode 100644
index 0000000..b60d837
--- /dev/null
+++ b/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3.pdf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:547a52ad02a2e72148a9411d2eb42e97de9730016da07ac2b330b0e8fb0aca61
+size 4469576
diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 27476a7..1715b0d 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -19,124 +19,126 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="marshal_positions" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" name="marshal_positions" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./extra_security.shp" id="extra_security20170921130834191">
+      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" name="extra_security" expanded="1" id="extra_security20170921130834191" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" expanded="1" checked="Qt::Unchecked" providerKey="delimitedtext" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" name="marshals_by_position" expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="complete_marshal_overview" expanded="1" checked="Qt::Unchecked" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="marshal_overviews" expanded="0" checked="Qt::Unchecked" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" name="marshal_overviews" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="fencing" expanded="0" checked="Qt::Checked" providerKey="ogr" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_groups" expanded="1" checked="Qt::Unchecked" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" name="fence_groups" expanded="1" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" providerKey="virtual">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="timelapse" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./timelapse.shp|layername=timelapse" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe">
+      <layer-tree-layer source="./timelapse.shp|layername=timelapse" checked="Qt::Unchecked" name="timelapse" expanded="1" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" providerKey="ogr">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1">
         <customproperties/>
-        <layer-tree-layer name="route markers" expanded="0" checked="Qt::Checked" providerKey="memory" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={2d51e5b3-6a9d-45f7-a888-2856a6d54c70}" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa">
-          <customproperties/>
+        <layer-tree-layer source="Point?crs=EPSG:4326&amp;uid={92473fdf-e0f9-4b27-ad1c-fa2cfc7b925d}" checked="Qt::Checked" name="route markers" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" providerKey="memory">
+          <customproperties>
+            <property key="showFeatureCount" value="1"/>
+          </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="water_tables" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./water_tables.shp" id="water_tables20170921142016467">
+      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" name="water_tables" expanded="1" id="water_tables20170921142016467" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" name="residents_access" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="osm_roads" expanded="0" checked="Qt::Checked" providerKey="ogr" source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" name="osm_roads" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" name="osm_places" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="data-comments" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12">
+      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" name="data-comments" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="start_finish_area" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe">
+      <layer-tree-layer source="./start_finish_area.shp" checked="Qt::Unchecked" name="start_finish_area" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="capetownelevation-1m" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
+      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" expanded="1" checked="Qt::Unchecked" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="Outlines" expanded="1" checked="Qt::Checked" providerKey="wms" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
+      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Unchecked" name="Outlines" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -161,46 +163,46 @@
       <item>data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12</item>
       <item>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</item>
       <item>fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1</item>
-      <item>proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa</item>
       <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
       <item>timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe</item>
+      <item>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" type="1" intersection-snapping="1" tolerance="10" mode="3" enabled="0">
+  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" unit="1" type="1" enabled="0">
     <individual-layer-settings>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer-setting type="2" tolerance="0" units="2" enabled="0" id="extra_security20170921130834191"/>
-      <layer-setting type="2" tolerance="0" units="2" enabled="0" id="water_tables20170921142016467"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer-setting type="2" tolerance="20" units="1" enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe"/>
-      <layer-setting type="1" tolerance="12" units="1" enabled="0" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" enabled="0"/>
+      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" type="2" enabled="0"/>
+      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" enabled="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations>
-    <relation referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fence_group_relationship" referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" strength="Association" id="fence_group_rel">
-      <fieldRef referencedField="group" referencingField="group"/>
+    <relation strength="Association" name="fence_group_relationship" id="fence_group_rel" referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1">
+      <fieldRef referencingField="group" referencedField="group"/>
     </relation>
   </relations>
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.36882664357088757</xmin>
-      <ymin>-33.94741659845757198</ymin>
-      <xmax>18.41776328058529444</xmax>
-      <ymax>-33.89677112988409391</ymax>
+      <xmin>18.40437472216478199</xmin>
+      <ymin>-33.90415462296931537</ymin>
+      <xmax>18.4068947122138411</xmax>
+      <ymax>-33.90273256048882899</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -220,135 +222,135 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" checked="Qt::Unchecked" open="true">
-      <legendlayer name="marshal_positions" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
+      <legendlayer open="true" checked="Qt::Checked" name="marshal_positions" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="extra_security" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="extra_security" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshals_by_position" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="marshals_by_position" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="complete_marshal_overview" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="complete_marshal_overview" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshal_overviews" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false">
+      <legendlayer open="false" checked="Qt::Unchecked" name="marshal_overviews" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="false" hidden="false">
           <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
-      <legendlayer name="fencing" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="false">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Fencing and Cones">
+      <legendlayer open="true" checked="Qt::Checked" name="fencing" drawingOrder="-1" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="fence_groups" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="fence_groups" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" checked="Qt::Checked" open="true">
-      <legendlayer name="timelapse" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup open="true" checked="Qt::Checked" name="Routes">
+      <legendlayer open="true" checked="Qt::Unchecked" name="timelapse" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" visible="1"/>
+          <legendlayerfile isInOverview="0" layerid="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup name="Markers" checked="Qt::Checked" open="true">
-        <legendlayer name="route markers" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="false">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa" visible="1"/>
+      <legendgroup open="true" checked="Qt::Checked" name="Markers">
+        <legendlayer open="true" checked="Qt::Checked" name="route markers" drawingOrder="-1" showFeatureCount="1">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer name="all_routes" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Checked" name="all_routes" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
-      <legendlayer name="water_tables" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
+      <legendlayer open="true" checked="Qt::Checked" name="water_tables" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
-      <legendlayer name="poi_labels" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
+      <legendlayer open="true" checked="Qt::Checked" name="poi_labels" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="directions_to_start" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Checked" name="directions_to_start" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
-      <legendlayer name="residents_access_roads" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
+      <legendlayer open="true" checked="Qt::Checked" name="residents_access_roads" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="residents_access" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
-      <legendlayer name="osm_roads" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="false">
+    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
+      <legendlayer open="false" checked="Qt::Checked" name="osm_roads" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="false" hidden="false">
           <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="osm_places" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true">
+      <legendlayer open="true" checked="Qt::Checked" name="osm_places" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="false">
-      <legendlayer name="data-comments" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Start and Finish pages">
+      <legendlayer open="true" checked="Qt::Unchecked" name="data-comments" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="start_finish_area" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="start_finish_area" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
-      <legendlayer name="capetownelevation-1m" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
+      <legendlayer open="true" checked="Qt::Unchecked" name="capetownelevation-1m" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" checked="Qt::Checked" open="true">
-      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="true" checked="Qt::Checked" name="Map">
+      <legendlayer open="true" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
+          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="Outlines" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="Outlines" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -356,7 +358,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer type="raster" autoRefreshTime="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -409,11 +411,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -424,9 +426,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -437,13 +439,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property value="false" key="WMSBackgroundLayer"/>
-        <property value="false" key="WMSPublishDataSourceUrl"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="Value" key="identify/format"/>
+        <property key="WMSBackgroundLayer" value="false"/>
+        <property key="WMSPublishDataSourceUrl" value="false"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="identify/format" value="Value"/>
       </customproperties>
       <pipe>
-        <rasterrenderer greenBand="2" type="multibandcolor" redBand="1" blueBand="3" opacity="0.6" alphaBand="-1">
+        <rasterrenderer alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor" opacity="0.6" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -454,13 +456,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeBlue="128" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer type="raster" autoRefreshTime="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -513,11 +515,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -528,7 +530,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -539,13 +541,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property value="true" key="WMSBackgroundLayer"/>
-        <property value="false" key="WMSPublishDataSourceUrl"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="Undefined" key="identify/format"/>
+        <property key="WMSBackgroundLayer" value="true"/>
+        <property key="WMSPublishDataSourceUrl" value="false"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="identify/format" value="Undefined"/>
       </customproperties>
       <pipe>
-        <rasterrenderer type="singlebandcolordata" opacity="0.75" alphaBand="-1" band="1">
+        <rasterrenderer alphaBand="-1" band="1" type="singlebandcolordata" opacity="0.75">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -556,13 +558,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeBlue="128" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -615,11 +617,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -634,8 +636,8 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field subType="0" type="2" name="length_m" length="6" comment="" typeName="integer" expression="$length" precision="0"/>
-        <field subType="0" type="6" name="length_km" length="-1" comment="" typeName="double precision" expression="$length / 1000" precision="0"/>
+        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
+        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -646,96 +648,96 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" label="Active Routes" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule symbol="1" filter="&quot;Distance&quot; = '21KM'" checkstate="0" description="This should be disabled, since it's only for legends" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="2" filter="&quot;Distance&quot; = '10KM'" description="This should be disabled, since it's only for legends" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="3" filter="&quot;Distance&quot; = '25'" checkstate="0" description="This should be disabled, since it's only for legends" label="5KM" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule symbol="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
+            <rule symbol="1" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0" filter="&quot;Distance&quot; = '21KM'"/>
+            <rule symbol="2" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="10KM" filter="&quot;Distance&quot; = '10KM'"/>
+            <rule symbol="3" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0" filter="&quot;Distance&quot; = '25'"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="4" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@0@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="true" name="active" type="bool"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                              <Option value="3" name="type" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -743,236 +745,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="true" name="active" type="bool"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                          <Option value="3" name="type" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="true" name="active" type="bool"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                          <Option value="3" name="type" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -980,236 +982,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1217,236 +1219,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@3@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1454,243 +1456,243 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{86cc78bd-cf95-435a-99c5-13093c859aa5}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{68d5cde2-f285-4651-b007-1511cc17bfbe}">
+          <rule key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" description="Active routes" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="round($length / 1000, 0)" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round($length / 1000, 0)" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="1" xOffset="0" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="km_marker()" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="1" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="quadrant" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="rotation" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -1710,29 +1712,29 @@
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1741,8 +1743,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1751,8 +1753,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1761,8 +1763,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1771,8 +1773,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1781,8 +1783,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1791,8 +1793,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1801,8 +1803,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1811,8 +1813,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1821,8 +1823,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1831,83 +1833,83 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_m"/>
-        <alias name="" index="9" field="length_km"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="length_m" index="8" name=""/>
+        <alias field="length_km" index="9" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="descriptio"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="timestamp"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="begin"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="end"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Distance"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="RouteLen"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Source"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="length_m"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field subType="0" type="2" name="length_m" length="6" comment="" typeName="integer" expression="$length" precision="0"/>
-        <field subType="0" type="6" name="length_km" length="-1" comment="" typeName="double precision" expression="$length / 1000" precision="0"/>
+        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
+        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
         <columns>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="163" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="163" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1938,16 +1940,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -1965,7 +1967,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2009,7 +2011,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2029,31 +2031,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="183,72,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="183,72,75,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2066,7 +2068,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2094,32 +2096,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" field="elevation"/>
+        <default field="ID" applyOnUpdate="0" expression=""/>
+        <default field="height" applyOnUpdate="0" expression=""/>
+        <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="ID"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="height"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="elevation"/>
+        <constraint notnull_strength="0" field="ID" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="height" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="elevation" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="ID"/>
-        <constraint desc="" exp="" field="height"/>
-        <constraint desc="" exp="" field="elevation"/>
+        <constraint field="ID" exp="" desc=""/>
+        <constraint field="height" exp="" desc=""/>
+        <constraint field="elevation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2139,7 +2141,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -2183,7 +2185,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2205,26 +2207,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="225,89,137,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2237,9 +2239,9 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -2267,32 +2269,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="page"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2312,7 +2314,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2365,11 +2367,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2393,31 +2395,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,85,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,85,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2428,49 +2430,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="Name" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="10">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="Name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="LineGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="2" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="Name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="Name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2491,32 +2493,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Name"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Name" index="1" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Name"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Name"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Name" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2547,8 +2549,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Name"/>
@@ -2558,7 +2560,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2611,11 +2613,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2639,140 +2641,140 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'"/>
+          <rule symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'"/>
+          <rule symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="miter" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="210,32,39,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="miter"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="210,32,39,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@0@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2780,106 +2782,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="103,34,144,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="miter"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="103,34,144,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2887,79 +2889,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2967,106 +2969,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="69,100,25,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="69,100,25,255"/>
+                      <prop k="joinstyle" v="miter"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="69,100,25,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3074,79 +3076,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="69,100,25,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3154,62 +3156,62 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="69,100,25,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="69,100,25,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3225,40 +3227,40 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3289,17 +3291,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -3318,7 +3320,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3362,7 +3364,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3382,39 +3384,39 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="227,0,185,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.796078">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="227,0,185,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,0"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3425,89 +3427,89 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="8">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="1" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="8" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="1" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="227,0,185,255" namedStyle="Semibold" fontSize="4">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.1" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.5" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="4" blendMode="0" textColor="227,0,185,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="1" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="2"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -3515,164 +3517,164 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="false" key="labeling/addDirectionSymbol"/>
-        <property value="0" key="labeling/angleOffset"/>
-        <property value="0" key="labeling/blendMode"/>
-        <property value="0" key="labeling/bufferBlendMode"/>
-        <property value="255" key="labeling/bufferColorA"/>
-        <property value="255" key="labeling/bufferColorB"/>
-        <property value="255" key="labeling/bufferColorG"/>
-        <property value="255" key="labeling/bufferColorR"/>
-        <property value="false" key="labeling/bufferDraw"/>
-        <property value="64" key="labeling/bufferJoinStyle"/>
-        <property value="false" key="labeling/bufferNoFill"/>
-        <property value="1" key="labeling/bufferSize"/>
-        <property value="false" key="labeling/bufferSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
-        <property value="0" key="labeling/bufferTransp"/>
-        <property value="false" key="labeling/centroidInside"/>
-        <property value="false" key="labeling/centroidWhole"/>
-        <property value="3" key="labeling/decimals"/>
-        <property value="false" key="labeling/displayAll"/>
-        <property value="0" key="labeling/dist"/>
-        <property value="false" key="labeling/distInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
-        <property value="false" key="labeling/drawLabels"/>
-        <property value="false" key="labeling/enabled"/>
-        <property value="position" key="labeling/fieldName"/>
-        <property value="false" key="labeling/fitInPolygonOnly"/>
-        <property value="0" key="labeling/fontCapitals"/>
-        <property value="Myriad Pro" key="labeling/fontFamily"/>
-        <property value="false" key="labeling/fontItalic"/>
-        <property value="0" key="labeling/fontLetterSpacing"/>
-        <property value="false" key="labeling/fontLimitPixelSize"/>
-        <property value="10000" key="labeling/fontMaxPixelSize"/>
-        <property value="3" key="labeling/fontMinPixelSize"/>
-        <property value="10" key="labeling/fontSize"/>
-        <property value="false" key="labeling/fontSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
-        <property value="false" key="labeling/fontStrikeout"/>
-        <property value="false" key="labeling/fontUnderline"/>
-        <property value="63" key="labeling/fontWeight"/>
-        <property value="0" key="labeling/fontWordSpacing"/>
-        <property value="false" key="labeling/formatNumbers"/>
-        <property value="false" key="labeling/isExpression"/>
-        <property value="true" key="labeling/labelOffsetInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
-        <property value="false" key="labeling/labelPerPart"/>
-        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
-        <property value="false" key="labeling/limitNumLabels"/>
-        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
-        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
-        <property value="2000" key="labeling/maxNumLabels"/>
-        <property value="false" key="labeling/mergeLines"/>
-        <property value="0" key="labeling/minFeatureSize"/>
-        <property value="0" key="labeling/multilineAlign"/>
-        <property value="1" key="labeling/multilineHeight"/>
-        <property value="Semibold" key="labeling/namedStyle"/>
-        <property value="true" key="labeling/obstacle"/>
-        <property value="1" key="labeling/obstacleFactor"/>
-        <property value="0" key="labeling/obstacleType"/>
-        <property value="0" key="labeling/offsetType"/>
-        <property value="0" key="labeling/placeDirectionSymbol"/>
-        <property value="0" key="labeling/placement"/>
-        <property value="10" key="labeling/placementFlags"/>
-        <property value="false" key="labeling/plussign"/>
-        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
-        <property value="true" key="labeling/preserveRotation"/>
-        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
-        <property value="5" key="labeling/priority"/>
-        <property value="4" key="labeling/quadOffset"/>
-        <property value="0" key="labeling/repeatDistance"/>
-        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
-        <property value="1" key="labeling/repeatDistanceUnit"/>
-        <property value="false" key="labeling/reverseDirectionSymbol"/>
-        <property value=">" key="labeling/rightDirectionSymbol"/>
-        <property value="10000000" key="labeling/scaleMax"/>
-        <property value="1" key="labeling/scaleMin"/>
-        <property value="false" key="labeling/scaleVisibility"/>
-        <property value="6" key="labeling/shadowBlendMode"/>
-        <property value="0" key="labeling/shadowColorB"/>
-        <property value="0" key="labeling/shadowColorG"/>
-        <property value="0" key="labeling/shadowColorR"/>
-        <property value="false" key="labeling/shadowDraw"/>
-        <property value="135" key="labeling/shadowOffsetAngle"/>
-        <property value="1" key="labeling/shadowOffsetDist"/>
-        <property value="true" key="labeling/shadowOffsetGlobal"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shadowOffsetUnits"/>
-        <property value="1.5" key="labeling/shadowRadius"/>
-        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
-        <property value="1" key="labeling/shadowRadiusUnits"/>
-        <property value="100" key="labeling/shadowScale"/>
-        <property value="30" key="labeling/shadowTransparency"/>
-        <property value="0" key="labeling/shadowUnder"/>
-        <property value="0" key="labeling/shapeBlendMode"/>
-        <property value="255" key="labeling/shapeBorderColorA"/>
-        <property value="128" key="labeling/shapeBorderColorB"/>
-        <property value="128" key="labeling/shapeBorderColorG"/>
-        <property value="128" key="labeling/shapeBorderColorR"/>
-        <property value="0" key="labeling/shapeBorderWidth"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
-        <property value="1" key="labeling/shapeBorderWidthUnits"/>
-        <property value="true" key="labeling/shapeDraw"/>
-        <property value="255" key="labeling/shapeFillColorA"/>
-        <property value="138" key="labeling/shapeFillColorB"/>
-        <property value="0" key="labeling/shapeFillColorG"/>
-        <property value="101" key="labeling/shapeFillColorR"/>
-        <property value="64" key="labeling/shapeJoinStyle"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shapeOffsetUnits"/>
-        <property value="0" key="labeling/shapeOffsetX"/>
-        <property value="0" key="labeling/shapeOffsetY"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
-        <property value="1" key="labeling/shapeRadiiUnits"/>
-        <property value="0" key="labeling/shapeRadiiX"/>
-        <property value="0" key="labeling/shapeRadiiY"/>
-        <property value="0" key="labeling/shapeRotation"/>
-        <property value="0" key="labeling/shapeRotationType"/>
-        <property value="" key="labeling/shapeSVGFile"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
-        <property value="0" key="labeling/shapeSizeType"/>
-        <property value="1" key="labeling/shapeSizeUnits"/>
-        <property value="0" key="labeling/shapeSizeX"/>
-        <property value="0" key="labeling/shapeSizeY"/>
-        <property value="0" key="labeling/shapeTransparency"/>
-        <property value="0" key="labeling/shapeType"/>
-        <property value="255" key="labeling/textColorA"/>
-        <property value="255" key="labeling/textColorB"/>
-        <property value="255" key="labeling/textColorG"/>
-        <property value="255" key="labeling/textColorR"/>
-        <property value="0" key="labeling/textTransp"/>
-        <property value="0" key="labeling/upsidedownLabels"/>
-        <property value="" key="labeling/wrapChar"/>
-        <property value="0" key="labeling/xOffset"/>
-        <property value="0" key="labeling/yOffset"/>
-        <property value="0" key="labeling/zIndex"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="labeling/addDirectionSymbol" value="false"/>
+        <property key="labeling/angleOffset" value="0"/>
+        <property key="labeling/blendMode" value="0"/>
+        <property key="labeling/bufferBlendMode" value="0"/>
+        <property key="labeling/bufferColorA" value="255"/>
+        <property key="labeling/bufferColorB" value="255"/>
+        <property key="labeling/bufferColorG" value="255"/>
+        <property key="labeling/bufferColorR" value="255"/>
+        <property key="labeling/bufferDraw" value="false"/>
+        <property key="labeling/bufferJoinStyle" value="64"/>
+        <property key="labeling/bufferNoFill" value="false"/>
+        <property key="labeling/bufferSize" value="1"/>
+        <property key="labeling/bufferSizeInMapUnits" value="false"/>
+        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/bufferTransp" value="0"/>
+        <property key="labeling/centroidInside" value="false"/>
+        <property key="labeling/centroidWhole" value="false"/>
+        <property key="labeling/decimals" value="3"/>
+        <property key="labeling/displayAll" value="false"/>
+        <property key="labeling/dist" value="0"/>
+        <property key="labeling/distInMapUnits" value="false"/>
+        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/drawLabels" value="false"/>
+        <property key="labeling/enabled" value="false"/>
+        <property key="labeling/fieldName" value="position"/>
+        <property key="labeling/fitInPolygonOnly" value="false"/>
+        <property key="labeling/fontCapitals" value="0"/>
+        <property key="labeling/fontFamily" value="Myriad Pro"/>
+        <property key="labeling/fontItalic" value="false"/>
+        <property key="labeling/fontLetterSpacing" value="0"/>
+        <property key="labeling/fontLimitPixelSize" value="false"/>
+        <property key="labeling/fontMaxPixelSize" value="10000"/>
+        <property key="labeling/fontMinPixelSize" value="3"/>
+        <property key="labeling/fontSize" value="10"/>
+        <property key="labeling/fontSizeInMapUnits" value="false"/>
+        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/fontStrikeout" value="false"/>
+        <property key="labeling/fontUnderline" value="false"/>
+        <property key="labeling/fontWeight" value="63"/>
+        <property key="labeling/fontWordSpacing" value="0"/>
+        <property key="labeling/formatNumbers" value="false"/>
+        <property key="labeling/isExpression" value="false"/>
+        <property key="labeling/labelOffsetInMapUnits" value="true"/>
+        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/labelPerPart" value="false"/>
+        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
+        <property key="labeling/limitNumLabels" value="false"/>
+        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
+        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
+        <property key="labeling/maxNumLabels" value="2000"/>
+        <property key="labeling/mergeLines" value="false"/>
+        <property key="labeling/minFeatureSize" value="0"/>
+        <property key="labeling/multilineAlign" value="0"/>
+        <property key="labeling/multilineHeight" value="1"/>
+        <property key="labeling/namedStyle" value="Semibold"/>
+        <property key="labeling/obstacle" value="true"/>
+        <property key="labeling/obstacleFactor" value="1"/>
+        <property key="labeling/obstacleType" value="0"/>
+        <property key="labeling/offsetType" value="0"/>
+        <property key="labeling/placeDirectionSymbol" value="0"/>
+        <property key="labeling/placement" value="0"/>
+        <property key="labeling/placementFlags" value="10"/>
+        <property key="labeling/plussign" value="false"/>
+        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+        <property key="labeling/preserveRotation" value="true"/>
+        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
+        <property key="labeling/priority" value="5"/>
+        <property key="labeling/quadOffset" value="4"/>
+        <property key="labeling/repeatDistance" value="0"/>
+        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/repeatDistanceUnit" value="1"/>
+        <property key="labeling/reverseDirectionSymbol" value="false"/>
+        <property key="labeling/rightDirectionSymbol" value=">"/>
+        <property key="labeling/scaleMax" value="10000000"/>
+        <property key="labeling/scaleMin" value="1"/>
+        <property key="labeling/scaleVisibility" value="false"/>
+        <property key="labeling/shadowBlendMode" value="6"/>
+        <property key="labeling/shadowColorB" value="0"/>
+        <property key="labeling/shadowColorG" value="0"/>
+        <property key="labeling/shadowColorR" value="0"/>
+        <property key="labeling/shadowDraw" value="false"/>
+        <property key="labeling/shadowOffsetAngle" value="135"/>
+        <property key="labeling/shadowOffsetDist" value="1"/>
+        <property key="labeling/shadowOffsetGlobal" value="true"/>
+        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowOffsetUnits" value="1"/>
+        <property key="labeling/shadowRadius" value="1.5"/>
+        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
+        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowRadiusUnits" value="1"/>
+        <property key="labeling/shadowScale" value="100"/>
+        <property key="labeling/shadowTransparency" value="30"/>
+        <property key="labeling/shadowUnder" value="0"/>
+        <property key="labeling/shapeBlendMode" value="0"/>
+        <property key="labeling/shapeBorderColorA" value="255"/>
+        <property key="labeling/shapeBorderColorB" value="128"/>
+        <property key="labeling/shapeBorderColorG" value="128"/>
+        <property key="labeling/shapeBorderColorR" value="128"/>
+        <property key="labeling/shapeBorderWidth" value="0"/>
+        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeBorderWidthUnits" value="1"/>
+        <property key="labeling/shapeDraw" value="true"/>
+        <property key="labeling/shapeFillColorA" value="255"/>
+        <property key="labeling/shapeFillColorB" value="138"/>
+        <property key="labeling/shapeFillColorG" value="0"/>
+        <property key="labeling/shapeFillColorR" value="101"/>
+        <property key="labeling/shapeJoinStyle" value="64"/>
+        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeOffsetUnits" value="1"/>
+        <property key="labeling/shapeOffsetX" value="0"/>
+        <property key="labeling/shapeOffsetY" value="0"/>
+        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeRadiiUnits" value="1"/>
+        <property key="labeling/shapeRadiiX" value="0"/>
+        <property key="labeling/shapeRadiiY" value="0"/>
+        <property key="labeling/shapeRotation" value="0"/>
+        <property key="labeling/shapeRotationType" value="0"/>
+        <property key="labeling/shapeSVGFile" value=""/>
+        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeSizeType" value="0"/>
+        <property key="labeling/shapeSizeUnits" value="1"/>
+        <property key="labeling/shapeSizeX" value="0"/>
+        <property key="labeling/shapeSizeY" value="0"/>
+        <property key="labeling/shapeTransparency" value="0"/>
+        <property key="labeling/shapeType" value="0"/>
+        <property key="labeling/textColorA" value="255"/>
+        <property key="labeling/textColorB" value="255"/>
+        <property key="labeling/textColorG" value="255"/>
+        <property key="labeling/textColorR" value="255"/>
+        <property key="labeling/textTransp" value="0"/>
+        <property key="labeling/upsidedownLabels" value="0"/>
+        <property key="labeling/wrapChar" value=""/>
+        <property key="labeling/xOffset" value="0"/>
+        <property key="labeling/yOffset" value="0"/>
+        <property key="labeling/zIndex" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3681,8 +3683,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -3691,8 +3693,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -3701,45 +3703,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="position"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3812,7 +3814,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -3865,11 +3867,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3886,12 +3888,12 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" precision="0"/>
-        <field subType="0" type="10" name="type" length="0" comment="" typeName="string" expression="'fencing'" precision="0"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -3902,26 +3904,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,170,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="f_diagonal" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,170,0,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="f_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3931,30 +3933,30 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3996,53 +3998,53 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="fence_length"/>
-        <alias name="" index="3" field="cone_length"/>
-        <alias name="" index="4" field="type"/>
+        <alias field="name" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="fence_length" index="2" name=""/>
+        <alias field="cone_length" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="fence_length"/>
-        <default applyOnUpdate="0" expression="" field="cone_length"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="fence_length" applyOnUpdate="0" expression=""/>
+        <default field="cone_length" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="group"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="fence_length"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="cone_length"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_length" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_length" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="fence_length"/>
-        <constraint desc="" exp="" field="cone_length"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="fence_length" exp="" desc=""/>
+        <constraint field="cone_length" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" precision="0"/>
-        <field subType="0" type="10" name="type" length="0" comment="" typeName="string" expression="'fencing'" precision="0"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;fence_length&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;fence_length&quot;">
         <columns>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="fence_length" width="148" hidden="0"/>
-          <column type="field" name="cone_length" width="157" hidden="0"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="148" name="fence_length" hidden="0" type="field"/>
+          <column width="157" name="cone_length" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4073,10 +4075,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="cone_length"/>
-        <field editable="0" name="fence_length"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="cone_length" editable="0"/>
+        <field name="fence_length" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="cone_length"/>
@@ -4087,14 +4089,14 @@ def my_form_open(dialog, layer, feature):
       <widgets>
         <widget name="fence_group_rel">
           <config type="Map">
-            <Option type="QString" name="nm-rel" value=""/>
+            <Option value="" name="nm-rel" type="QString"/>
           </config>
         </widget>
       </widgets>
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4147,11 +4149,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4166,47 +4168,47 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyLocal="1" simplifyDrawingTol="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" version="3.8.3-Zanzibar" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" minScale="1e+08">
+          <qgis labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyLocal="1" readOnly="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" version="3.8.3-Zanzibar" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
+            <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol alpha="1" type="line" name="0" clip_to_extent="1" force_rhr="0">
-                  <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" name="name" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -4215,64 +4217,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontStrikeout="0" fontFamily="Myriad Pro" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="comment" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="11">
-                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeFillColor="255,255,255,255" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiUnit="MM" shapeJoinStyle="128" shapeOffsetX="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiY="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+                    <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidth="0.6" shapeOffsetX="0" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="4" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="5" maxCurvedCharAngleIn="25" geometryGenerator="" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                    <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
+                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                          <Option name="PositionY" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontStrikeout="0" fontFamily="Myriad Pro" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="round( $length, 1) || 'm'" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="12">
-                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiUnit="MM" shapeJoinStyle="64" shapeOffsetX="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiY="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+                    <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidth="0" shapeOffsetX="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="1" maxCurvedCharAngleIn="25" geometryGenerator="" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                    <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
+                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                          <Option name="PositionY" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -4280,30 +4282,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute color="#000000" label="" field=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -4387,81 +4389,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" index="0" field="id"/>
-              <alias name="" index="1" field="group"/>
-              <alias name="" index="2" field="comment"/>
-              <alias name="" index="3" field="moveable"/>
-              <alias name="" index="4" field="type"/>
-              <alias name="" index="5" field="name"/>
-              <alias name="" index="6" field="hidden"/>
-              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-              <alias name="" index="9" field="fence_len"/>
-              <alias name="" index="10" field="cone_len"/>
+              <alias field="id" index="0" name=""/>
+              <alias field="group" index="1" name=""/>
+              <alias field="comment" index="2" name=""/>
+              <alias field="moveable" index="3" name=""/>
+              <alias field="type" index="4" name=""/>
+              <alias field="name" index="5" name=""/>
+              <alias field="hidden" index="6" name=""/>
+              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
+              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
+              <alias field="fence_len" index="9" name=""/>
+              <alias field="cone_len" index="10" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" expression="" field="id"/>
-              <default applyOnUpdate="0" expression="" field="group"/>
-              <default applyOnUpdate="0" expression="" field="comment"/>
-              <default applyOnUpdate="0" expression="" field="moveable"/>
-              <default applyOnUpdate="0" expression="" field="type"/>
-              <default applyOnUpdate="0" expression="" field="name"/>
-              <default applyOnUpdate="0" expression="" field="hidden"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-              <default applyOnUpdate="0" expression="" field="fence_len"/>
-              <default applyOnUpdate="0" expression="" field="cone_len"/>
+              <default field="id" applyOnUpdate="0" expression=""/>
+              <default field="group" applyOnUpdate="0" expression=""/>
+              <default field="comment" applyOnUpdate="0" expression=""/>
+              <default field="moveable" applyOnUpdate="0" expression=""/>
+              <default field="type" applyOnUpdate="0" expression=""/>
+              <default field="name" applyOnUpdate="0" expression=""/>
+              <default field="hidden" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+              <default field="fence_len" applyOnUpdate="0" expression=""/>
+              <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="group"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="comment"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="moveable"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="hidden"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="fence_len"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="cone_len"/>
+              <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint desc="" exp="" field="id"/>
-              <constraint desc="" exp="" field="group"/>
-              <constraint desc="" exp="" field="comment"/>
-              <constraint desc="" exp="" field="moveable"/>
-              <constraint desc="" exp="" field="type"/>
-              <constraint desc="" exp="" field="name"/>
-              <constraint desc="" exp="" field="hidden"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-              <constraint desc="" exp="" field="fence_len"/>
-              <constraint desc="" exp="" field="cone_len"/>
+              <constraint field="id" exp="" desc=""/>
+              <constraint field="group" exp="" desc=""/>
+              <constraint field="comment" exp="" desc=""/>
+              <constraint field="moveable" exp="" desc=""/>
+              <constraint field="type" exp="" desc=""/>
+              <constraint field="name" exp="" desc=""/>
+              <constraint field="hidden" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
+              <constraint field="fence_len" exp="" desc=""/>
+              <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field subType="0" type="6" name="fence_len" length="-1" typeName="double precision" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
-              <field subType="0" type="6" name="fence_len" length="-1" typeName="double precision" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-              <field subType="0" type="6" name="cone_len" length="-1" typeName="double precision" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
+              <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+              <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+              <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;cone_len&quot;">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;cone_len&quot;">
               <columns>
-                <column type="field" name="id" width="-1" hidden="0"/>
-                <column type="field" name="group" width="-1" hidden="0"/>
-                <column type="actions" width="-1" hidden="1"/>
-                <column type="field" name="comment" width="223" hidden="0"/>
-                <column type="field" name="moveable" width="-1" hidden="0"/>
-                <column type="field" name="type" width="-1" hidden="0"/>
-                <column type="field" name="name" width="414" hidden="0"/>
-                <column type="field" name="hidden" width="-1" hidden="0"/>
-                <column type="field" name="fence_len" width="-1" hidden="0"/>
-                <column type="field" name="cone_len" width="-1" hidden="0"/>
-                <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
-                <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -4492,18 +4494,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -4532,170 +4534,170 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
+      <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
-          <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
-          <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <rule symbol="0" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')"/>
+          <rule symbol="1" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
+          <rule symbol="2" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
+          <rule symbol="3" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr')"/>
+          <rule symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="1;4" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Point" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="round"/>
+              <prop k="customdash" v="1;4"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="Point"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="4;3" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="round"/>
+              <prop k="customdash" v="4;3"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4704,64 +4706,64 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{c6c63c45-b105-4938-9293-1e0b6b509ffc}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cb13c93f-b798-48fe-be18-377822a9654c}">
+          <rule key="{cb13c93f-b798-48fe-be18-377822a9654c}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="comment" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="11">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.6" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.6" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="5" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{f68a5523-5992-4232-8c24-8259482e149e}">
+          <rule key="{f68a5523-5992-4232-8c24-8259482e149e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="round( $length, 1) || 'm'" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="12">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="1" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -4769,30 +4771,30 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4876,81 +4878,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
-        <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-        <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-        <alias name="" index="9" field="fence_len"/>
-        <alias name="" index="10" field="cone_len"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
+        <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
+        <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
+        <alias field="fence_len" index="9" name=""/>
+        <alias field="cone_len" index="10" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default field="moveable" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="hidden" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="group"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="comment"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="moveable"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="hidden"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="fence_len"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="cone_len"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-        <constraint desc="" exp="" field="fence_len"/>
-        <constraint desc="" exp="" field="cone_len"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="comment" exp="" desc=""/>
+        <constraint field="moveable" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="hidden" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
+        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="comment" width="1150" hidden="0"/>
-          <column type="field" name="moveable" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="name" width="414" hidden="0"/>
-          <column type="field" name="hidden" width="-1" hidden="0"/>
-          <column type="field" name="fence_len" width="-1" hidden="0"/>
-          <column type="field" name="cone_len" width="-1" hidden="0"/>
-          <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
-          <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="1150" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="414" name="name" hidden="0" type="field"/>
+          <column width="-1" name="hidden" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4981,18 +4983,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -5012,7 +5014,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5056,7 +5058,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5076,26 +5078,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="26,0,201,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="dot" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="26,0,201,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="dot"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5105,36 +5107,36 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option type="bool" name="active" value="true"/>
-                <Option type="QString" name="field" value="id"/>
-                <Option type="int" name="type" value="2"/>
+            <Option value="" name="name" type="QString"/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option value="true" name="active" type="bool"/>
+                <Option value="id" name="field" type="QString"/>
+                <Option value="2" name="type" type="int"/>
               </Option>
             </Option>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5143,8 +5145,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5153,8 +5155,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5163,45 +5165,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="page"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="page" width="-1" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5232,9 +5234,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -5245,7 +5247,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -5298,11 +5300,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5326,66 +5328,66 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview" label="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule symbol="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview" label="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule symbol="1" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="0.792157" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.792157">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.01" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.01">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5394,236 +5396,236 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{f4f14825-d873-4bbe-9728-d63dc57afbf9}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}">
+          <rule key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="6">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.1" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.5" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="1" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="2"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{2296c342-131c-47dd-a5f3-3d062b82ee51}">
+          <rule key="{2296c342-131c-47dd-a5f3-3d062b82ee51}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.5" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="6">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.5" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.5" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="8" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="5"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}">
+          <rule key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.6" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="6">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.6" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="8" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="5"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}">
+          <rule key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="8">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,0,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.9" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.9" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="10"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -5631,165 +5633,165 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="false" key="labeling/addDirectionSymbol"/>
-        <property value="0" key="labeling/angleOffset"/>
-        <property value="0" key="labeling/blendMode"/>
-        <property value="0" key="labeling/bufferBlendMode"/>
-        <property value="255" key="labeling/bufferColorA"/>
-        <property value="255" key="labeling/bufferColorB"/>
-        <property value="255" key="labeling/bufferColorG"/>
-        <property value="255" key="labeling/bufferColorR"/>
-        <property value="false" key="labeling/bufferDraw"/>
-        <property value="64" key="labeling/bufferJoinStyle"/>
-        <property value="false" key="labeling/bufferNoFill"/>
-        <property value="1" key="labeling/bufferSize"/>
-        <property value="false" key="labeling/bufferSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
-        <property value="0" key="labeling/bufferTransp"/>
-        <property value="false" key="labeling/centroidInside"/>
-        <property value="false" key="labeling/centroidWhole"/>
-        <property value="3" key="labeling/decimals"/>
-        <property value="false" key="labeling/displayAll"/>
-        <property value="0" key="labeling/dist"/>
-        <property value="false" key="labeling/distInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
-        <property value="false" key="labeling/drawLabels"/>
-        <property value="false" key="labeling/enabled"/>
-        <property value="position" key="labeling/fieldName"/>
-        <property value="false" key="labeling/fitInPolygonOnly"/>
-        <property value="0" key="labeling/fontCapitals"/>
-        <property value="Myriad Pro" key="labeling/fontFamily"/>
-        <property value="false" key="labeling/fontItalic"/>
-        <property value="0" key="labeling/fontLetterSpacing"/>
-        <property value="false" key="labeling/fontLimitPixelSize"/>
-        <property value="10000" key="labeling/fontMaxPixelSize"/>
-        <property value="3" key="labeling/fontMinPixelSize"/>
-        <property value="10" key="labeling/fontSize"/>
-        <property value="false" key="labeling/fontSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
-        <property value="false" key="labeling/fontStrikeout"/>
-        <property value="false" key="labeling/fontUnderline"/>
-        <property value="63" key="labeling/fontWeight"/>
-        <property value="0" key="labeling/fontWordSpacing"/>
-        <property value="false" key="labeling/formatNumbers"/>
-        <property value="false" key="labeling/isExpression"/>
-        <property value="true" key="labeling/labelOffsetInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
-        <property value="false" key="labeling/labelPerPart"/>
-        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
-        <property value="false" key="labeling/limitNumLabels"/>
-        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
-        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
-        <property value="2000" key="labeling/maxNumLabels"/>
-        <property value="false" key="labeling/mergeLines"/>
-        <property value="0" key="labeling/minFeatureSize"/>
-        <property value="0" key="labeling/multilineAlign"/>
-        <property value="1" key="labeling/multilineHeight"/>
-        <property value="Semibold" key="labeling/namedStyle"/>
-        <property value="true" key="labeling/obstacle"/>
-        <property value="1" key="labeling/obstacleFactor"/>
-        <property value="0" key="labeling/obstacleType"/>
-        <property value="0" key="labeling/offsetType"/>
-        <property value="0" key="labeling/placeDirectionSymbol"/>
-        <property value="0" key="labeling/placement"/>
-        <property value="10" key="labeling/placementFlags"/>
-        <property value="false" key="labeling/plussign"/>
-        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
-        <property value="true" key="labeling/preserveRotation"/>
-        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
-        <property value="5" key="labeling/priority"/>
-        <property value="4" key="labeling/quadOffset"/>
-        <property value="0" key="labeling/repeatDistance"/>
-        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
-        <property value="1" key="labeling/repeatDistanceUnit"/>
-        <property value="false" key="labeling/reverseDirectionSymbol"/>
-        <property value=">" key="labeling/rightDirectionSymbol"/>
-        <property value="10000000" key="labeling/scaleMax"/>
-        <property value="1" key="labeling/scaleMin"/>
-        <property value="false" key="labeling/scaleVisibility"/>
-        <property value="6" key="labeling/shadowBlendMode"/>
-        <property value="0" key="labeling/shadowColorB"/>
-        <property value="0" key="labeling/shadowColorG"/>
-        <property value="0" key="labeling/shadowColorR"/>
-        <property value="false" key="labeling/shadowDraw"/>
-        <property value="135" key="labeling/shadowOffsetAngle"/>
-        <property value="1" key="labeling/shadowOffsetDist"/>
-        <property value="true" key="labeling/shadowOffsetGlobal"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shadowOffsetUnits"/>
-        <property value="1.5" key="labeling/shadowRadius"/>
-        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
-        <property value="1" key="labeling/shadowRadiusUnits"/>
-        <property value="100" key="labeling/shadowScale"/>
-        <property value="30" key="labeling/shadowTransparency"/>
-        <property value="0" key="labeling/shadowUnder"/>
-        <property value="0" key="labeling/shapeBlendMode"/>
-        <property value="255" key="labeling/shapeBorderColorA"/>
-        <property value="128" key="labeling/shapeBorderColorB"/>
-        <property value="128" key="labeling/shapeBorderColorG"/>
-        <property value="128" key="labeling/shapeBorderColorR"/>
-        <property value="0" key="labeling/shapeBorderWidth"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
-        <property value="1" key="labeling/shapeBorderWidthUnits"/>
-        <property value="true" key="labeling/shapeDraw"/>
-        <property value="255" key="labeling/shapeFillColorA"/>
-        <property value="138" key="labeling/shapeFillColorB"/>
-        <property value="0" key="labeling/shapeFillColorG"/>
-        <property value="101" key="labeling/shapeFillColorR"/>
-        <property value="64" key="labeling/shapeJoinStyle"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shapeOffsetUnits"/>
-        <property value="0" key="labeling/shapeOffsetX"/>
-        <property value="0" key="labeling/shapeOffsetY"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
-        <property value="1" key="labeling/shapeRadiiUnits"/>
-        <property value="0" key="labeling/shapeRadiiX"/>
-        <property value="0" key="labeling/shapeRadiiY"/>
-        <property value="0" key="labeling/shapeRotation"/>
-        <property value="0" key="labeling/shapeRotationType"/>
-        <property value="" key="labeling/shapeSVGFile"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
-        <property value="0" key="labeling/shapeSizeType"/>
-        <property value="1" key="labeling/shapeSizeUnits"/>
-        <property value="0" key="labeling/shapeSizeX"/>
-        <property value="0" key="labeling/shapeSizeY"/>
-        <property value="0" key="labeling/shapeTransparency"/>
-        <property value="0" key="labeling/shapeType"/>
-        <property value="255" key="labeling/textColorA"/>
-        <property value="255" key="labeling/textColorB"/>
-        <property value="255" key="labeling/textColorG"/>
-        <property value="255" key="labeling/textColorR"/>
-        <property value="0" key="labeling/textTransp"/>
-        <property value="0" key="labeling/upsidedownLabels"/>
-        <property value="" key="labeling/wrapChar"/>
-        <property value="0" key="labeling/xOffset"/>
-        <property value="0" key="labeling/yOffset"/>
-        <property value="0" key="labeling/zIndex"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="labeling/addDirectionSymbol" value="false"/>
+        <property key="labeling/angleOffset" value="0"/>
+        <property key="labeling/blendMode" value="0"/>
+        <property key="labeling/bufferBlendMode" value="0"/>
+        <property key="labeling/bufferColorA" value="255"/>
+        <property key="labeling/bufferColorB" value="255"/>
+        <property key="labeling/bufferColorG" value="255"/>
+        <property key="labeling/bufferColorR" value="255"/>
+        <property key="labeling/bufferDraw" value="false"/>
+        <property key="labeling/bufferJoinStyle" value="64"/>
+        <property key="labeling/bufferNoFill" value="false"/>
+        <property key="labeling/bufferSize" value="1"/>
+        <property key="labeling/bufferSizeInMapUnits" value="false"/>
+        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/bufferTransp" value="0"/>
+        <property key="labeling/centroidInside" value="false"/>
+        <property key="labeling/centroidWhole" value="false"/>
+        <property key="labeling/decimals" value="3"/>
+        <property key="labeling/displayAll" value="false"/>
+        <property key="labeling/dist" value="0"/>
+        <property key="labeling/distInMapUnits" value="false"/>
+        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/drawLabels" value="false"/>
+        <property key="labeling/enabled" value="false"/>
+        <property key="labeling/fieldName" value="position"/>
+        <property key="labeling/fitInPolygonOnly" value="false"/>
+        <property key="labeling/fontCapitals" value="0"/>
+        <property key="labeling/fontFamily" value="Myriad Pro"/>
+        <property key="labeling/fontItalic" value="false"/>
+        <property key="labeling/fontLetterSpacing" value="0"/>
+        <property key="labeling/fontLimitPixelSize" value="false"/>
+        <property key="labeling/fontMaxPixelSize" value="10000"/>
+        <property key="labeling/fontMinPixelSize" value="3"/>
+        <property key="labeling/fontSize" value="10"/>
+        <property key="labeling/fontSizeInMapUnits" value="false"/>
+        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/fontStrikeout" value="false"/>
+        <property key="labeling/fontUnderline" value="false"/>
+        <property key="labeling/fontWeight" value="63"/>
+        <property key="labeling/fontWordSpacing" value="0"/>
+        <property key="labeling/formatNumbers" value="false"/>
+        <property key="labeling/isExpression" value="false"/>
+        <property key="labeling/labelOffsetInMapUnits" value="true"/>
+        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/labelPerPart" value="false"/>
+        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
+        <property key="labeling/limitNumLabels" value="false"/>
+        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
+        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
+        <property key="labeling/maxNumLabels" value="2000"/>
+        <property key="labeling/mergeLines" value="false"/>
+        <property key="labeling/minFeatureSize" value="0"/>
+        <property key="labeling/multilineAlign" value="0"/>
+        <property key="labeling/multilineHeight" value="1"/>
+        <property key="labeling/namedStyle" value="Semibold"/>
+        <property key="labeling/obstacle" value="true"/>
+        <property key="labeling/obstacleFactor" value="1"/>
+        <property key="labeling/obstacleType" value="0"/>
+        <property key="labeling/offsetType" value="0"/>
+        <property key="labeling/placeDirectionSymbol" value="0"/>
+        <property key="labeling/placement" value="0"/>
+        <property key="labeling/placementFlags" value="10"/>
+        <property key="labeling/plussign" value="false"/>
+        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+        <property key="labeling/preserveRotation" value="true"/>
+        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
+        <property key="labeling/priority" value="5"/>
+        <property key="labeling/quadOffset" value="4"/>
+        <property key="labeling/repeatDistance" value="0"/>
+        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/repeatDistanceUnit" value="1"/>
+        <property key="labeling/reverseDirectionSymbol" value="false"/>
+        <property key="labeling/rightDirectionSymbol" value=">"/>
+        <property key="labeling/scaleMax" value="10000000"/>
+        <property key="labeling/scaleMin" value="1"/>
+        <property key="labeling/scaleVisibility" value="false"/>
+        <property key="labeling/shadowBlendMode" value="6"/>
+        <property key="labeling/shadowColorB" value="0"/>
+        <property key="labeling/shadowColorG" value="0"/>
+        <property key="labeling/shadowColorR" value="0"/>
+        <property key="labeling/shadowDraw" value="false"/>
+        <property key="labeling/shadowOffsetAngle" value="135"/>
+        <property key="labeling/shadowOffsetDist" value="1"/>
+        <property key="labeling/shadowOffsetGlobal" value="true"/>
+        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowOffsetUnits" value="1"/>
+        <property key="labeling/shadowRadius" value="1.5"/>
+        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
+        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowRadiusUnits" value="1"/>
+        <property key="labeling/shadowScale" value="100"/>
+        <property key="labeling/shadowTransparency" value="30"/>
+        <property key="labeling/shadowUnder" value="0"/>
+        <property key="labeling/shapeBlendMode" value="0"/>
+        <property key="labeling/shapeBorderColorA" value="255"/>
+        <property key="labeling/shapeBorderColorB" value="128"/>
+        <property key="labeling/shapeBorderColorG" value="128"/>
+        <property key="labeling/shapeBorderColorR" value="128"/>
+        <property key="labeling/shapeBorderWidth" value="0"/>
+        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeBorderWidthUnits" value="1"/>
+        <property key="labeling/shapeDraw" value="true"/>
+        <property key="labeling/shapeFillColorA" value="255"/>
+        <property key="labeling/shapeFillColorB" value="138"/>
+        <property key="labeling/shapeFillColorG" value="0"/>
+        <property key="labeling/shapeFillColorR" value="101"/>
+        <property key="labeling/shapeJoinStyle" value="64"/>
+        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeOffsetUnits" value="1"/>
+        <property key="labeling/shapeOffsetX" value="0"/>
+        <property key="labeling/shapeOffsetY" value="0"/>
+        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeRadiiUnits" value="1"/>
+        <property key="labeling/shapeRadiiX" value="0"/>
+        <property key="labeling/shapeRadiiY" value="0"/>
+        <property key="labeling/shapeRotation" value="0"/>
+        <property key="labeling/shapeRotationType" value="0"/>
+        <property key="labeling/shapeSVGFile" value=""/>
+        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeSizeType" value="0"/>
+        <property key="labeling/shapeSizeUnits" value="1"/>
+        <property key="labeling/shapeSizeX" value="0"/>
+        <property key="labeling/shapeSizeY" value="0"/>
+        <property key="labeling/shapeTransparency" value="0"/>
+        <property key="labeling/shapeType" value="0"/>
+        <property key="labeling/textColorA" value="255"/>
+        <property key="labeling/textColorB" value="255"/>
+        <property key="labeling/textColorG" value="255"/>
+        <property key="labeling/textColorR" value="255"/>
+        <property key="labeling/textTransp" value="0"/>
+        <property key="labeling/upsidedownLabels" value="0"/>
+        <property key="labeling/wrapChar" value=""/>
+        <property key="labeling/xOffset" value="0"/>
+        <property key="labeling/yOffset" value="0"/>
+        <property key="labeling/zIndex" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5798,8 +5800,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5808,8 +5810,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" name="IsMultiline" type="bool"/>
+                <Option value="false" name="UseHtml" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -5818,8 +5820,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" name="IsMultiline" type="bool"/>
+                <Option value="false" name="UseHtml" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -5828,8 +5830,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5838,8 +5840,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5848,8 +5850,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5865,8 +5867,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5875,8 +5877,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5918,92 +5920,92 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="oldpositio"/>
-        <alias name="" index="5" field="xyposition"/>
-        <alias name="" index="6" field="csv_positi"/>
-        <alias name="" index="7" field="csv_name"/>
-        <alias name="" index="8" field="csv_club"/>
-        <alias name="" index="9" field="csv_captai"/>
-        <alias name="" index="10" field="csv_capt_1"/>
-        <alias name="" index="11" field="csv_first_"/>
-        <alias name="" index="12" field="csv_last_r"/>
-        <alias name="" index="13" field="csv_instru"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="notes" index="3" name=""/>
+        <alias field="oldpositio" index="4" name=""/>
+        <alias field="xyposition" index="5" name=""/>
+        <alias field="csv_positi" index="6" name=""/>
+        <alias field="csv_name" index="7" name=""/>
+        <alias field="csv_club" index="8" name=""/>
+        <alias field="csv_captai" index="9" name=""/>
+        <alias field="csv_capt_1" index="10" name=""/>
+        <alias field="csv_first_" index="11" name=""/>
+        <alias field="csv_last_r" index="12" name=""/>
+        <alias field="csv_instru" index="13" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="oldpositio"/>
-        <default applyOnUpdate="0" expression="" field="xyposition"/>
-        <default applyOnUpdate="0" expression="" field="csv_positi"/>
-        <default applyOnUpdate="0" expression="" field="csv_name"/>
-        <default applyOnUpdate="0" expression="" field="csv_club"/>
-        <default applyOnUpdate="0" expression="" field="csv_captai"/>
-        <default applyOnUpdate="0" expression="" field="csv_capt_1"/>
-        <default applyOnUpdate="0" expression="" field="csv_first_"/>
-        <default applyOnUpdate="0" expression="" field="csv_last_r"/>
-        <default applyOnUpdate="0" expression="" field="csv_instru"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="notes" applyOnUpdate="0" expression=""/>
+        <default field="oldpositio" applyOnUpdate="0" expression=""/>
+        <default field="xyposition" applyOnUpdate="0" expression=""/>
+        <default field="csv_positi" applyOnUpdate="0" expression=""/>
+        <default field="csv_name" applyOnUpdate="0" expression=""/>
+        <default field="csv_club" applyOnUpdate="0" expression=""/>
+        <default field="csv_captai" applyOnUpdate="0" expression=""/>
+        <default field="csv_capt_1" applyOnUpdate="0" expression=""/>
+        <default field="csv_first_" applyOnUpdate="0" expression=""/>
+        <default field="csv_last_r" applyOnUpdate="0" expression=""/>
+        <default field="csv_instru" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="position"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="notes"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="oldpositio"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="xyposition"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_positi"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_club"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_captai"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_capt_1"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_first_"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_last_r"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_instru"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="notes" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="oldpositio" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="xyposition" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_positi" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_club" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_captai" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_capt_1" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_first_" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_last_r" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_instru" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="notes"/>
-        <constraint desc="" exp="" field="oldpositio"/>
-        <constraint desc="" exp="" field="xyposition"/>
-        <constraint desc="" exp="" field="csv_positi"/>
-        <constraint desc="" exp="" field="csv_name"/>
-        <constraint desc="" exp="" field="csv_club"/>
-        <constraint desc="" exp="" field="csv_captai"/>
-        <constraint desc="" exp="" field="csv_capt_1"/>
-        <constraint desc="" exp="" field="csv_first_"/>
-        <constraint desc="" exp="" field="csv_last_r"/>
-        <constraint desc="" exp="" field="csv_instru"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="notes" exp="" desc=""/>
+        <constraint field="oldpositio" exp="" desc=""/>
+        <constraint field="xyposition" exp="" desc=""/>
+        <constraint field="csv_positi" exp="" desc=""/>
+        <constraint field="csv_name" exp="" desc=""/>
+        <constraint field="csv_club" exp="" desc=""/>
+        <constraint field="csv_captai" exp="" desc=""/>
+        <constraint field="csv_capt_1" exp="" desc=""/>
+        <constraint field="csv_first_" exp="" desc=""/>
+        <constraint field="csv_last_r" exp="" desc=""/>
+        <constraint field="csv_instru" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;csv_club&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;csv_club&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="notes" width="-1" hidden="0"/>
-          <column type="field" name="oldpositio" width="-1" hidden="0"/>
-          <column type="field" name="xyposition" width="-1" hidden="0"/>
-          <column type="field" name="csv_name" width="-1" hidden="0"/>
-          <column type="field" name="csv_club" width="-1" hidden="0"/>
-          <column type="field" name="csv_positi" width="-1" hidden="0"/>
-          <column type="field" name="csv_captai" width="-1" hidden="0"/>
-          <column type="field" name="csv_capt_1" width="-1" hidden="0"/>
-          <column type="field" name="csv_first_" width="-1" hidden="0"/>
-          <column type="field" name="csv_last_r" width="-1" hidden="0"/>
-          <column type="field" name="csv_instru" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="oldpositio" hidden="0" type="field"/>
+          <column width="-1" name="xyposition" hidden="0" type="field"/>
+          <column width="-1" name="csv_name" hidden="0" type="field"/>
+          <column width="-1" name="csv_club" hidden="0" type="field"/>
+          <column width="-1" name="csv_positi" hidden="0" type="field"/>
+          <column width="-1" name="csv_captai" hidden="0" type="field"/>
+          <column width="-1" name="csv_capt_1" hidden="0" type="field"/>
+          <column width="-1" name="csv_first_" hidden="0" type="field"/>
+          <column width="-1" name="csv_last_r" hidden="0" type="field"/>
+          <column width="-1" name="csv_instru" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6034,35 +6036,35 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="csv_10_distance"/>
@@ -6142,7 +6144,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" type="vector" wkbType="NoGeometry" autoRefreshTime="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" geometry="No geometry" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -6189,11 +6191,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6221,12 +6223,12 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property value="first_name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="first_name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6235,8 +6237,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6259,8 +6261,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6269,8 +6271,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6279,8 +6281,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6289,8 +6291,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6299,8 +6301,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6316,8 +6318,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6345,87 +6347,87 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="position"/>
-        <alias name="" index="1" field="firstname"/>
-        <alias name="" index="2" field="surname"/>
-        <alias name="" index="3" field="name"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_phone"/>
-        <alias name="" index="9" field="races"/>
-        <alias name="" index="10" field="first_runner"/>
-        <alias name="" index="11" field="last_runner"/>
-        <alias name="" index="12" field="instructions"/>
+        <alias field="position" index="0" name=""/>
+        <alias field="firstname" index="1" name=""/>
+        <alias field="surname" index="2" name=""/>
+        <alias field="name" index="3" name=""/>
+        <alias field="club" index="4" name=""/>
+        <alias field="phone" index="5" name=""/>
+        <alias field="email" index="6" name=""/>
+        <alias field="captain" index="7" name=""/>
+        <alias field="captain_phone" index="8" name=""/>
+        <alias field="races" index="9" name=""/>
+        <alias field="first_runner" index="10" name=""/>
+        <alias field="last_runner" index="11" name=""/>
+        <alias field="instructions" index="12" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="firstname"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="firstname" applyOnUpdate="0" expression=""/>
+        <default field="surname" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="club" applyOnUpdate="0" expression=""/>
+        <default field="phone" applyOnUpdate="0" expression=""/>
+        <default field="email" applyOnUpdate="0" expression=""/>
+        <default field="captain" applyOnUpdate="0" expression=""/>
+        <default field="captain_phone" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="first_runner" applyOnUpdate="0" expression=""/>
+        <default field="last_runner" applyOnUpdate="0" expression=""/>
+        <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="position"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="firstname"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="surname"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="club"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="phone"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="email"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="captain"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="captain_phone"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="races"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="first_runner"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="last_runner"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="instructions"/>
+        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="firstname" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="surname" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="club" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="phone" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="email" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain_phone" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_runner" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_runner" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="instructions" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="firstname"/>
-        <constraint desc="" exp="" field="surname"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="club"/>
-        <constraint desc="" exp="" field="phone"/>
-        <constraint desc="" exp="" field="email"/>
-        <constraint desc="" exp="" field="captain"/>
-        <constraint desc="" exp="" field="captain_phone"/>
-        <constraint desc="" exp="" field="races"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
-        <constraint desc="" exp="" field="instructions"/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="firstname" exp="" desc=""/>
+        <constraint field="surname" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="club" exp="" desc=""/>
+        <constraint field="phone" exp="" desc=""/>
+        <constraint field="email" exp="" desc=""/>
+        <constraint field="captain" exp="" desc=""/>
+        <constraint field="captain_phone" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
+        <constraint field="first_runner" exp="" desc=""/>
+        <constraint field="last_runner" exp="" desc=""/>
+        <constraint field="instructions" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="club" width="-1" hidden="0"/>
-          <column type="field" name="phone" width="-1" hidden="0"/>
-          <column type="field" name="email" width="-1" hidden="0"/>
-          <column type="field" name="captain" width="-1" hidden="0"/>
-          <column type="field" name="races" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="first_runner" width="-1" hidden="0"/>
-          <column type="field" name="last_runner" width="-1" hidden="0"/>
-          <column type="field" name="instructions" width="-1" hidden="0"/>
-          <column type="field" name="firstname" width="-1" hidden="0"/>
-          <column type="field" name="surname" width="-1" hidden="0"/>
-          <column type="field" name="captain_phone" width="-1" hidden="0"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" name="races" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="firstname" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6456,23 +6458,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="10_distance"/>
@@ -6497,7 +6499,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -6550,11 +6552,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6581,70 +6583,70 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.75" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="name" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="8.5">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="64" bufferOpacity="0.6" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1.5"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.75" fontSizeUnit="Point" fieldName="name" fontSize="8.5" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="1" placementFlags="2" offsetType="0" offsetUnits="MapUnit"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_x" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_y" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="&quot;name&quot;" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="&quot;name&quot;"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6653,8 +6655,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6663,8 +6665,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6673,8 +6675,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6683,8 +6685,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6693,8 +6695,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6703,8 +6705,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6713,8 +6715,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6723,8 +6725,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6733,75 +6735,75 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="osm_id" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="type" index="3" name=""/>
+        <alias field="z_order" index="4" name=""/>
+        <alias field="population" index="5" name=""/>
+        <alias field="label_x" index="6" name=""/>
+        <alias field="label_y" index="7" name=""/>
+        <alias field="label_rota" index="8" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="population" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="osm_id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="z_order"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="population"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_x"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_y"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_rota"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="population" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="population"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="population" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="field" name="population" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6832,15 +6834,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -6857,7 +6859,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -6910,11 +6912,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6941,61 +6943,61 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="7">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="0.6" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="3" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="3" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" yOffset="0" repeatDistanceUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="5" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="0.3" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="3" geometryGeneratorEnabled="0" repeatDistanceUnits="MapUnit" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="3" placementFlags="4" offsetType="0" offsetUnits="MapUnit"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.3" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="5" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="always_sho"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="always_sho" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="&quot;&quot;"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="&quot;&quot;" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_x" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_y" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="Priority" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="Show" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -7013,29 +7015,29 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "name", '&lt;NULL>' )</value>
           <value>COALESCE( "name", '&lt;NULL>' )</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7044,8 +7046,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7054,8 +7056,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7099,8 +7101,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7163,102 +7165,102 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
-        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
+        <alias field="osm_id" index="0" name=""/>
+        <alias field="name" index="1" name=""/>
+        <alias field="highway" index="2" name=""/>
+        <alias field="waterway" index="3" name=""/>
+        <alias field="aerialway" index="4" name=""/>
+        <alias field="barrier" index="5" name=""/>
+        <alias field="man_made" index="6" name=""/>
+        <alias field="z_order" index="7" name=""/>
+        <alias field="other_tags" index="8" name=""/>
+        <alias field="never_show" index="9" name=""/>
+        <alias field="label_x" index="10" name=""/>
+        <alias field="label_y" index="11" name=""/>
+        <alias field="label_rota" index="12" name=""/>
+        <alias field="always_sho" index="13" name=""/>
+        <alias field="resident_a" index="14" name=""/>
+        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="highway" applyOnUpdate="0" expression=""/>
+        <default field="waterway" applyOnUpdate="0" expression=""/>
+        <default field="aerialway" applyOnUpdate="0" expression=""/>
+        <default field="barrier" applyOnUpdate="0" expression=""/>
+        <default field="man_made" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="other_tags" applyOnUpdate="0" expression=""/>
+        <default field="never_show" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="always_sho" applyOnUpdate="0" expression=""/>
+        <default field="resident_a" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="osm_id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="highway"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="waterway"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="aerialway"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="barrier"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="man_made"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="z_order"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="other_tags"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="never_show"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_x"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_y"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_rota"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="always_sho"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="resident_a"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_show"/>
+        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="highway" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="waterway" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="aerialway" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="barrier" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="man_made" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="other_tags" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="never_show" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="always_sho" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="resident_a" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="highway"/>
-        <constraint desc="" exp="" field="waterway"/>
-        <constraint desc="" exp="" field="aerialway"/>
-        <constraint desc="" exp="" field="barrier"/>
-        <constraint desc="" exp="" field="man_made"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="other_tags"/>
-        <constraint desc="" exp="" field="never_show"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
-        <constraint desc="" exp="" field="always_sho"/>
-        <constraint desc="" exp="" field="resident_a"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="highway" exp="" desc=""/>
+        <constraint field="waterway" exp="" desc=""/>
+        <constraint field="aerialway" exp="" desc=""/>
+        <constraint field="barrier" exp="" desc=""/>
+        <constraint field="man_made" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="other_tags" exp="" desc=""/>
+        <constraint field="never_show" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
+        <constraint field="always_sho" exp="" desc=""/>
+        <constraint field="resident_a" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;resident_a&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;resident_a&quot;">
         <columns>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="highway" width="-1" hidden="0"/>
-          <column type="field" name="waterway" width="-1" hidden="0"/>
-          <column type="field" name="aerialway" width="-1" hidden="0"/>
-          <column type="field" name="barrier" width="-1" hidden="0"/>
-          <column type="field" name="man_made" width="-1" hidden="0"/>
-          <column type="field" name="other_tags" width="-1" hidden="0"/>
-          <column type="field" name="never_show" width="-1" hidden="0"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
-          <column type="field" name="always_sho" width="-1" hidden="0"/>
-          <column type="field" name="resident_a" width="-1" hidden="0"/>
-          <column type="field" name="auxiliary_storage_labeling_show" width="-1" hidden="0"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="-1" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7289,40 +7291,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="aerialway"/>
@@ -7407,7 +7409,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -7460,11 +7462,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7488,299 +7490,299 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
+          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
+          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
+          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
+          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="star" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.5" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="name" v="star"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.5"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,32,80,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="amenity/amenity_toilets.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,32,80,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="amenity/amenity_toilets.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/gym-bag.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/gym-bag.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/road_closure.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="125,139,143,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/road_closure.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,12,254,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/transport_bus_stop.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,12,254,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/transport_bus_stop.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="255,255,255,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="outerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
                 <effect type="drawSource">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="43,153,41,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/amenity=parking.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="5" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="43,153,41,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/amenity=parking.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7789,65 +7791,65 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="name" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="10">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="0.8" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="2"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="2" shapeRadiiY="2" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="0.7" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="0.8" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="0.7" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="2" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="2" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="2" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="2" dist="3" maxCurvedCharAngleIn="25" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="3" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="10"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="3" yOffset="3" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="2"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="2" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7882,42 +7884,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="distance"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7948,10 +7950,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="distance"/>
@@ -7963,595 +7965,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
-      <extent>
-        <xmin>18.37564676953091336</xmin>
-        <ymin>-33.94557435997037231</ymin>
-        <xmax>18.41958021754603791</xmax>
-        <ymax>-33.90046742091590914</ymax>
-      </extent>
-      <id>proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route markers</layername>
-      <srs>
-        <spatialrefsys>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>WGS84</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
-      <provider encoding="UTF-8">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="nullSymbol"/>
-      <labeling type="rule-based">
-        <rules key="{221a1642-6e3c-4f39-bb33-a3e2d5fd68bc}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{e8acadf6-cecd-4d6b-8f98-05d691116778}">
-            <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active" active="0" key="{61d3ed28-6049-49a9-ade6-00e281e9218f}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" key="{ea0f4b42-ff8f-4d75-a2af-7472461c25fd}">
-              <settings>
-                <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="210,32,39,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                  <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                  <substitutions/>
-                </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-              </settings>
-            </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" key="{08a26428-d667-4e19-be4b-d866760ee1c4}">
-              <settings>
-                <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="103,34,144,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                  <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                  <substitutions/>
-                </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-              </settings>
-            </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" description="5KM" key="{4017648a-e8e0-4246-b2ce-9c9b91a36b2f}">
-              <settings>
-                <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="145,211,55,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                  <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                  <substitutions/>
-                </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-              </settings>
-            </rule>
-          </rule>
-          <rule description="Always Show" key="{e5511335-5f7c-4b02-8678-edc87ff82a4e}">
-            <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Regular" fontSize="7">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeSizeX="0.5" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0.1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="3" maxCurvedCharAngleIn="20" priority="4" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value=""/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration>
-        <field name="Name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="length_km"/>
-        <alias name="" index="8" field="Source"/>
-        <alias name="" index="9" field="org_fid"/>
-        <alias name="" index="10" field="distance"/>
-      </aliases>
-      <excludeAttributesWMS/>
-      <excludeAttributesWFS/>
-      <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-      </defaults>
-      <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="descriptio"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="timestamp"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="begin"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="end"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Distance"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="RouteLen"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="length_km"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Source"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="org_fid"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="distance"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
-      </editable>
-      <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
-      </labelOnTop>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
-    </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -8595,7 +8009,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8615,75 +8029,75 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
-              <prop v="135" k="angle"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="2" k="distance"/>
-              <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-              <prop v="MM" k="distance_unit"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
+              <prop k="angle" v="135"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="distance" v="2"/>
+              <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="distance_unit" v="MM"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                  <prop v="square" k="capstyle"/>
-                  <prop v="5;2" k="customdash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                  <prop v="MM" k="customdash_unit"/>
-                  <prop v="0" k="draw_inside_polygon"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="211,134,33,255" k="line_color"/>
-                  <prop v="solid" k="line_style"/>
-                  <prop v="0.3" k="line_width"/>
-                  <prop v="MM" k="line_width_unit"/>
-                  <prop v="0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0" k="ring_filter"/>
-                  <prop v="0" k="use_custom_dash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                  <prop k="capstyle" v="square"/>
+                  <prop k="customdash" v="5;2"/>
+                  <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="customdash_unit" v="MM"/>
+                  <prop k="draw_inside_polygon" v="0"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="line_color" v="211,134,33,255"/>
+                  <prop k="line_style" v="solid"/>
+                  <prop k="line_width" v="0.3"/>
+                  <prop k="line_width_unit" v="MM"/>
+                  <prop k="offset" v="0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="ring_filter" v="0"/>
+                  <prop k="use_custom_dash" v="0"/>
+                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.46" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="no" k="style"/>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.46"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8693,30 +8107,30 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8730,28 +8144,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="FID"/>
+        <alias field="FID" index="0" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="FID"/>
+        <constraint notnull_strength="0" field="FID" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="FID"/>
+        <constraint field="FID" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="431" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8782,8 +8196,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -8793,7 +8207,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -8846,11 +8260,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8874,348 +8288,348 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" filter="&quot;status&quot; = 'open'"/>
+          <rule symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" filter="&quot;status&quot; = 'one-way'"/>
+          <rule symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="2"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,255,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,255,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,255,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="1"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="2;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash dot dot" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="2;1;1;1"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash dot dot"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="3;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="3;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9224,49 +8638,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="times" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="9">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="times" fontSize="9" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="0" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9301,42 +8715,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" field="times"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="status" applyOnUpdate="0" expression=""/>
+        <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="status"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="times"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="status" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="times" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="times"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="status" exp="" desc=""/>
+        <constraint field="times" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="202" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="status" width="-1" hidden="0"/>
-          <column type="field" name="times" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9367,10 +8781,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -9382,7 +8796,592 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+      <extent>
+        <xmin>18.37564632736778236</xmin>
+        <ymin>-33.94557692503335744</ymin>
+        <xmax>18.41938719291285409</xmax>
+        <ymax>-33.90033791158612075</ymax>
+      </extent>
+      <id>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>route markers</layername>
+      <srs>
+        <spatialrefsys>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>WGS84</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="UTF-8">memory</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <legend type="default-vector"/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+      </flags>
+      <renderer-v2 type="nullSymbol"/>
+      <labeling type="rule-based">
+        <rules key="{ef0a4f1c-3683-401e-af50-096e9c122ec2}">
+          <rule key="{89ce512c-f4b6-4593-abdd-e1496b39d38d}" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <settings>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <substitutions/>
+              </text-style>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="quadrant" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="rotation" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                  </Option>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </dd_properties>
+            </settings>
+          </rule>
+          <rule key="{c8fa4d70-045a-495e-8ee0-9e8348c14c1f}" description="List for legends" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule key="{5cc2708e-64e0-43b4-ba64-8c4ce9774fe9}" description="21KM" active="0" filter="&quot;Source&quot; = '21KM'">
+              <settings>
+                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                  <substitutions/>
+                </text-style>
+                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" name="name" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option value="true" name="active" type="bool"/>
+                        <Option value="quadrant" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="rotation" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                    </Option>
+                    <Option value="collection" name="type" type="QString"/>
+                  </Option>
+                </dd_properties>
+              </settings>
+            </rule>
+            <rule key="{159ba16a-95ba-44ad-b846-c28bc7694004}" description="10KM" active="0" filter="&quot;Source&quot; = '10KM'">
+              <settings>
+                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                  <substitutions/>
+                </text-style>
+                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" name="name" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option value="true" name="active" type="bool"/>
+                        <Option value="quadrant" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="rotation" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                    </Option>
+                    <Option value="collection" name="type" type="QString"/>
+                  </Option>
+                </dd_properties>
+              </settings>
+            </rule>
+            <rule key="{4b0221e3-9f99-4b44-b4ff-a02ed7189f03}" description="5KM" active="0" filter="&quot;Source&quot; = '5KM'">
+              <settings>
+                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                  <substitutions/>
+                </text-style>
+                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" name="name" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option value="true" name="active" type="bool"/>
+                        <Option value="quadrant" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="rotation" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                    </Option>
+                    <Option value="collection" name="type" type="QString"/>
+                  </Option>
+                </dd_properties>
+              </settings>
+            </rule>
+          </rule>
+          <rule key="{8cbbbde3-7d35-4f80-89e2-32d6f85fe1dc}" description="Always Show" active="0">
+            <settings>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="7" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.5" shapeRadiiX="0.1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <substitutions/>
+              </text-style>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="3" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="4" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="rotation" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                  </Option>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </dd_properties>
+            </settings>
+          </rule>
+        </rules>
+      </labeling>
+      <customproperties>
+        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+        <properties>
+          <Option type="Map">
+            <Option value="" name="name" type="QString"/>
+            <Option name="properties"/>
+            <Option value="collection" name="type" type="QString"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <fieldConfiguration>
+        <field name="Name">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="descriptio">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="timestamp">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="begin">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="end">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Distance">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="RouteLen">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="length_m" index="8" name=""/>
+        <alias field="length_km" index="9" name=""/>
+        <alias field="org_fid" index="10" name=""/>
+        <alias field="distance" index="11" name=""/>
+      </aliases>
+      <excludeAttributesWMS/>
+      <excludeAttributesWFS/>
+      <defaults>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+      </defaults>
+      <constraints>
+        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="org_fid" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;distance&quot;">
+        <columns>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath>.</editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
+      </editable>
+      <labelOnTop>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
+      </labelOnTop>
+      <widgets/>
+      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+      <mapTip>Text</mapTip>
+    </maplayer>
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -9426,7 +9425,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -9446,26 +9445,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="114,155,111,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9475,14 +9474,14 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="&quot;id&quot;" key="dualview/previewExpressions"/>
+        <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -9510,37 +9509,37 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="area"/>
-        <alias name="" index="2" field="rotation"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="area" index="1" name=""/>
+        <alias field="rotation" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" field="rotation"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="area" applyOnUpdate="0" expression=""/>
+        <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="area"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="rotation"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="area" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="rotation" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="rotation"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="area" exp="" desc=""/>
+        <constraint field="rotation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="area" width="-1" hidden="0"/>
-          <column type="field" name="rotation" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9560,7 +9559,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37527697005977245</xmin>
         <ymin>-33.94584879231483399</ymin>
@@ -9613,11 +9612,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9641,47 +9640,47 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="1">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.35" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.35"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9692,46 +9691,46 @@ def my_form_open(dialog, layer, feature):
         <rules key="{8209fadf-9c49-4b02-955b-00e6176ca6e7}">
           <rule key="{19b7fab2-9e40-4733-8ee6-00027ba6a037}">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" namedStyle="Semibold" fontSize="9">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.2" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="0,0,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontSize="9" blendMode="0" textColor="0,0,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.2" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,255,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="17" plussign="0" multilineAlign="2" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="LineGeometry" centroidInside="0" offsetType="0" preserveRotation="0" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="0" maxCurvedCharAngleIn="25" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="17" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="2" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Hali">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="'Center'"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Hali" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="'Center'" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value=""/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value=""/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Vali">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="'Half'"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Vali" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="'Half'" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -9739,30 +9738,30 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9771,8 +9770,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9781,8 +9780,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9791,8 +9790,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9820,66 +9819,66 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="begin"/>
-        <alias name="" index="1" field="RouteLen"/>
-        <alias name="" index="2" field="Source"/>
-        <alias name="" index="3" field="distance_1"/>
-        <alias name="" index="4" field="first_run"/>
-        <alias name="" index="5" field="last_run"/>
+        <alias field="begin" index="0" name=""/>
+        <alias field="RouteLen" index="1" name=""/>
+        <alias field="Source" index="2" name=""/>
+        <alias field="distance_1" index="3" name=""/>
+        <alias field="first_run" index="4" name=""/>
+        <alias field="last_run" index="5" name=""/>
       </aliases>
       <excludeAttributesWMS>
         <attribute>Source</attribute>
-        <attribute>last_run</attribute>
-        <attribute>first_run</attribute>
         <attribute>distance_1</attribute>
-        <attribute>RouteLen</attribute>
+        <attribute>first_run</attribute>
+        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>RouteLen</attribute>
       </excludeAttributesWMS>
       <excludeAttributesWFS>
         <attribute>Source</attribute>
-        <attribute>last_run</attribute>
-        <attribute>first_run</attribute>
         <attribute>distance_1</attribute>
-        <attribute>RouteLen</attribute>
+        <attribute>first_run</attribute>
+        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>RouteLen</attribute>
       </excludeAttributesWFS>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="distance_1"/>
-        <default applyOnUpdate="0" expression="" field="first_run"/>
-        <default applyOnUpdate="0" expression="" field="last_run"/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="distance_1" applyOnUpdate="0" expression=""/>
+        <default field="first_run" applyOnUpdate="0" expression=""/>
+        <default field="last_run" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="begin"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="RouteLen"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Source"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="distance_1"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="first_run"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="last_run"/>
+        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance_1" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_run" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_run" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="distance_1"/>
-        <constraint desc="" exp="" field="first_run"/>
-        <constraint desc="" exp="" field="last_run"/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="distance_1" exp="" desc=""/>
+        <constraint field="first_run" exp="" desc=""/>
+        <constraint field="last_run" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;last_run&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;last_run&quot;">
         <columns>
-          <column type="field" name="begin" width="179" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="distance_1" width="-1" hidden="0"/>
-          <column type="field" name="first_run" width="191" hidden="0"/>
-          <column type="field" name="last_run" width="174" hidden="0"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="distance_1" hidden="0" type="field"/>
+          <column width="191" name="first_run" hidden="0" type="field"/>
+          <column width="174" name="last_run" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9910,30 +9909,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -9965,7 +9964,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -10018,11 +10017,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10049,22 +10048,22 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}">
+          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="label" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="31,120,180,255" namedStyle="Bold" fontSize="8">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="0.4" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="0.75"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,204" shapeBorderWidth="0.75" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.3" shapeBorderColor="31,120,206,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="-0.15" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Bold" fontWeight="75" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="label" fontSize="8" blendMode="0" textColor="31,120,180,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="0.4" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75"/>
+                <background shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.75" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="-0.15" shapeSizeY="0.3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.75" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="1" placement="0" centroidWhole="1" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="1" dist="0" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.76" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="6" scaleVisibility="0" labelPerPart="0" zIndex="5"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" priority="5" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="6" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -10072,30 +10071,30 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10104,8 +10103,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10114,8 +10113,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10124,8 +10123,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10139,42 +10138,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
-        <alias name="" index="3" field="races"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="table_set" index="1" name=""/>
+        <alias field="label" index="2" name=""/>
+        <alias field="races" index="3" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="table_set" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="table_set"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="races"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="table_set" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="table_set"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="races"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="table_set" exp="" desc=""/>
+        <constraint field="label" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="table_set" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="field" name="races" width="130" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10205,10 +10204,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -10240,9 +10239,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
     <layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
     <layer id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1"/>
-    <layer id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
     <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
     <layer id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe"/>
+    <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -10418,7 +10417,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/Ask Me/20191010 - Gun Run 2019 - Start Directions rev 1.1.png</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/GunRunMaps/GIS Base Map/Fencing</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -10559,255 +10558,248 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="All Routes">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" style="default" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <expanded-legend-nodes id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="default" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal overview">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Proposed Routes">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" style="default" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <expanded-legend-nodes id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Routes">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" style="default" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <expanded-legend-nodes id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -10834,215 +10826,215 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="Routes" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" position="0,0,mm" type="65638" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="[%&quot;Distance&quot;%]" type="65641" positionOnPage="9.44946,191.611,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" valign="64" htmlState="0" zValue="9" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="14.1764,7.471,mm" position="9.44946,191.611,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" position="9.44946,191.611,mm" type="65641" valign="64" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%&quot;Distance&quot;%]" excludeFromExports="0" positionOnPage="9.44946,191.611,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="RACE ROUTE" type="65641" positionOnPage="24.2445,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="0" frameJoinStyle="miter" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" valign="64" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="29.2025,7.272,mm" position="24.2445,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" position="24.2445,191.81,mm" type="65641" valign="64" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="RACE ROUTE" excludeFromExports="0" positionOnPage="24.2445,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 3.0" type="65641" positionOnPage="204.225,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" valign="64" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="57.4836,6.8714,mm" position="204.225,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 3.0" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="210.038,199.082,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="210.038,199.082,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="17.4074" itemRotation="0" resizeMode="0" type="65640" positionOnPage="262.196,188.218,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="29.7523" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" size="29.7523,17.4718,mm" position="262.196,188.218,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="9.59946,198.832,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" zValue="3" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="251.959,0.1,mm" position="9.59946,198.832,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" position="9.59946,198.832,mm" type="65643" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.86559,4.09761,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" labelMargin="0,mm" zValue="2" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="67.7828,166.874,mm" position="5.86559,4.09761,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11056,102 +11048,102 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="9.44946,9.08557,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" outlineWidthM="0.15,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="282.012,175.592,mm" position="9.44946,9.08557,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816223928584" xmax="18.42303507276718832"/>
+        <Extent xmax="18.42303507276714569" ymin="-33.92999999999999972" ymax="-33.89697816223931426" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11165,123 +11157,123 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas sortAscending="0" hideCoverage="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="length_m" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerName="all_routes" coverageLayerProvider="ogr" enabled="1" filterFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerProvider="ogr" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="1" sortFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="120" name="Marshals" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" type="65638" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -11289,339 +11281,339 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="bevel" opacity="1" groupUuid="" columnSpace="2" position="128.239,3.58,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.1,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="128.239,3.58,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolHeight="4" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="19.9422,26,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="5" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="128" alpha="255" green="128" red="128"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolAlignment="1" frameJoinStyle="bevel" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" equalColumnWidth="1" size="19.9422,26,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="5" rasterBorder="1" fontColor="#000000" position="128.239,3.58,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="128.239,3.58,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.1,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="128" green="128" red="128" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" name="title">
+            <styleFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="1" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Semibold" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="102.986,142.175,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" labelMargin="0,mm" zValue="4" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" outlineWidthM="0.2,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Marshal map - inset" size="50.4055,50.7436,mm" position="102.986,142.175,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="50.4055,50.7436,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" position="102.986,142.175,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal map - inset" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.2,mm" zValue="4" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="102.986,142.175,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.40830605842002043" ymin="-33.90511059368537161" ymax="-33.9047436175620831" xmax="18.40867058941471512"/>
+        <Extent xmax="18.40867058941471512" ymin="-33.90511059368537161" ymax="-33.9047436175620831" xmin="18.40830605842002043"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="1" name="Overview 1" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,65,170,102" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,102" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+        <ComposerMapOverview show="1" centered="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" position="3">
+          <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,65,170,102"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,102"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" mapFlags="0" type="65639" positionOnPage="3.53,6.0007,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" labelMargin="0,mm" zValue="3" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="true" followPresetName="Marshal map - main" size="142,181,mm" position="3.53,6.0007,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="142,181,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" position="3.53,6.0007,mm" type="65639" drawCanvasItems="true" followPresetName="Marshal map - main" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.53,6.0007,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.40643444482690683" ymin="-33.90754507826720499" ymax="-33.90230913298024973" xmax="18.41054220300782873"/>
+        <Extent xmax="18.41054220300782873" ymin="-33.90754507826720499" ymax="-33.90230913298024973" xmin="18.40643444482690683"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65647" positionOnPage="277.3,6.0007,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionWidth="127.436" sectionHeight="159.418" zValue="2" frame="false" referencePoint="2" blendMode="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" id="" sectionX="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" visibility="1" hidePageIfEmpty="0" outlineWidthM="0.3,mm" excludeFromExports="0" hideBackgroundIfEmpty="0" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" size="127.436,159.418,mm" position="277.3,6.0007,mm">
-        <FrameColor blue="119" alpha="255" green="119" red="119"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="127.436,159.418,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="159.418" sectionWidth="127.436" position="277.3,6.0007,mm" hideBackgroundIfEmpty="0" type="65647" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" frameJoinStyle="round" positionLock="true" background="false" sectionX="0" outlineWidthM="0.3,mm" zValue="2" visibility="1" sectionY="0" referencePoint="2" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="277.3,6.0007,mm" hidePageIfEmpty="0" itemRotation="0" groupUuid="">
+        <FrameColor blue="119" green="119" red="119" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="27.6" itemRotation="0" resizeMode="0" type="65640" positionOnPage="230.194,167.419,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" anchorPoint="0" svgBorderColor="0,0,0,255" zValue="1" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="27.4317" pictureRotation="0" file="../Gun_Run_Logo_2018.png" mapUuid="" size="47.1065,27.6,mm" position="230.194,167.419,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="230.194,167.419,mm" type="65640" pictureWidth="27.4317" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="1" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" excludeFromExports="0" pictureHeight="27.6" positionOnPage="230.194,167.419,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame type="65648" url="" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" contentMode="1" evaluateExpressions="true" useSmartBreaks="true">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" type="65648" resizeMode="0" stylesheetEnabled="true">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutMultiFrame>
       <customproperties>
-        <property value="jpg" key="atlasRasterFormat"/>
-        <property value="false" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="0" key="imageCropMarginUnit"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="false" key="rasterize"/>
-        <property value="3.53" key="resizeToContentsBottomMargin"/>
-        <property value="3.53" key="resizeToContentsLeftMargin"/>
-        <property value="3.53" key="resizeToContentsRightMargin"/>
-        <property value="3.53" key="resizeToContentsTopMargin"/>
-        <property value="false" key="singleFile"/>
+        <property key="atlasRasterFormat" value="jpg"/>
+        <property key="forceVector" value="false"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropMarginUnit" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="rasterize" value="false"/>
+        <property key="resizeToContentsBottomMargin" value="3.53"/>
+        <property key="resizeToContentsLeftMargin" value="3.53"/>
+        <property key="resizeToContentsRightMargin" value="3.53"/>
+        <property key="resizeToContentsTopMargin" value="3.53"/>
+        <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="0" sortKey="position" pageNameExpression="&quot;position&quot;" coverageLayer="" enabled="0" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;position&quot;" sortAscending="1" coverageLayer="" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" filterFeatures="0" enabled="0" sortFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="120" name="Marshal Plan" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,420,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,420,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" position="0,0,mm" type="65638" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -11629,250 +11621,250 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="15.6525,12.5708,mm" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="15.6525,12.5708,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" legendFilterByAtlas="0" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolHeight="4" type="65642" fontColor="#000000" frame="false" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="18.6109,9,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="8" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="15.6525,12.5708,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="15.6525,12.5708,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="1" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="MARSHAL POSITIONS" type="65641" positionOnPage="5.69321,399.106,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" valign="64" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="45.1194,7.36972,mm" position="5.69321,399.106,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="45.1194,7.36972,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginX="1" position="5.69321,399.106,mm" type="65641" valign="64" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.69321,399.106,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Page [% &quot;page&quot; %]" type="65641" positionOnPage="5.69321,406.988,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" valign="32" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="16.2476,7.80192,mm" position="5.69321,406.988,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="16.2476,7.80192,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginX="1" position="5.69321,406.988,mm" type="65641" valign="32" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% &quot;page&quot; %]" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.1" type="65641" positionOnPage="214.292,406.988,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" valign="32" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="27.7839,7.51682,mm" position="214.292,406.988,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginX="1" position="214.292,406.988,mm" type="65641" valign="32" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="214.292,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="185.72,399.107,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" valign="64" htmlState="0" zValue="4" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="56.3557,7.36902,mm" position="185.72,399.107,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginX="1" position="185.72,399.107,mm" type="65641" valign="64" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="185.72,399.107,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="28.8527" itemRotation="0" resizeMode="0" type="65640" positionOnPage="243.319,382.696,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" anchorPoint="8" svgBorderColor="0,0,0,255" zValue="3" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="49.3143" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="" size="49.3143,31.2967,mm" position="243.319,382.696,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="49.3143,31.2967,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" position="243.319,382.696,mm" type="65640" pictureWidth="49.3143" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.319,382.696,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="5.84321,406.626,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" zValue="2" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="236.083,0.14328,mm" position="5.84321,406.626,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="236.083,0.14328,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" position="5.84321,406.626,mm" type="65643" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.03,5.9483,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Marshal overview" size="286.94,392.396,mm" position="5.03,5.9483,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="286.94,392.396,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" position="5.03,5.9483,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.03,5.9483,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.4043547521658617" ymin="-33.91857233280978789" ymax="-33.89547273009495854" xmax="18.42124635930919041"/>
+        <Extent xmax="18.42124635930919041" ymin="-33.91857233280978789" ymax="-33.89547273009495854" xmin="18.4043547521658617"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="300" name="Start &amp; Finish Backgrounds" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" type="65638" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -11880,151 +11872,151 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" pictureHeight="7.97477" itemRotation="0" resizeMode="0" type="65640" positionOnPage="286.027,2,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" anchorPoint="0" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="6.31767" pictureRotation="330" file="arrows/NorthArrow_11.svg" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" size="9.45865,11,mm" position="286.027,2,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" type="65640" pictureWidth="6.31767" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" excludeFromExports="0" pictureHeight="7.97477" positionOnPage="286.027,2,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="270" labelText="[%upper( &quot;area&quot; )%]" type="65641" positionOnPage="285.027,205.886,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" htmlState="0" zValue="3" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="142.543,10.3185,mm" position="285.027,205.886,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" position="285.027,205.886,mm" type="65641" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" excludeFromExports="0" positionOnPage="285.027,205.886,mm" itemRotation="270" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem numSegmentsLeft="2" frameJoinStyle="miter" opacity="1" groupUuid="" position="7,189.669,mm" labelBarSpace="3" outlineWidthM="0.3,mm" excludeFromExports="0" unitType="meters" positionOnPage="7,189.669,mm" alignment="0" height="3" lineCapStyle="square" segmentMillimeters="28.5458" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" outlineWidth="0.3" type="65646" numUnitsPerSegment="90" frame="false" background="false" segmentSizeMode="1" lineJoinStyle="miter" style="Single Box" numMapUnitsPerScaleBarUnit="1" itemRotation="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" size="155.102,16.2165,mm" id="" visibility="1" unitLabel="m" zValue="2" referencePoint="0" blendMode="0" positionLock="true" maxBarWidth="150" boxContentSpace="1" minBarWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem lineJoinStyle="miter" visibility="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" style="Single Box" frameJoinStyle="miter" numUnitsPerSegment="90" segmentSizeMode="1" itemRotation="0" outlineWidth="0.3" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" size="155.102,16.2165,mm" id="" type="65646" background="false" segmentMillimeters="28.5458" labelBarSpace="3" numSegments="4" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" zValue="2" alignment="0" unitType="meters" unitLabel="m" position="7,189.669,mm" blendMode="0" positionOnPage="7,189.669,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" minBarWidth="50">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" namedStyle="" fontWeight="50" blendMode="0" fontSize="12" fontCapitals="0" fontLetterSpacing="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" fontFamily="Myriad Pro" fontStrikeout="0">
-          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-          <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
+          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
         </text-style>
-        <fillColor blue="0" alpha="255" green="0" red="0"/>
-        <fillColor2 blue="255" alpha="255" green="255" red="255"/>
-        <strokeColor blue="0" alpha="255" green="0" red="0"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" mapFlags="0" type="65639" positionOnPage="7,5.5,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="330" drawCanvasItems="false" followPresetName="Start/Finish" size="278.027,180.318,mm" position="7,5.5,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" position="7,5.5,mm" type="65639" drawCanvasItems="false" followPresetName="Start/Finish" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="330" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="7,5.5,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="rotation"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="rotation" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="id"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="id" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="angle" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958"/>
+        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="5" topAnnotationDisplay="3" topAnnotationPosition="1" position="3" rightAnnotationDisplay="3" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="1" bottomAnnotationPosition="1" leftAnnotationDisplay="3" bottomAnnotationDisplay="3" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="5">
+        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12040,71 +12032,71 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>WGS84</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
-        <property value="0" key="svgCropMarginBottom"/>
-        <property value="0" key="svgCropMarginLeft"/>
-        <property value="0" key="svgCropMarginRight"/>
-        <property value="0" key="svgCropMarginTop"/>
-        <property value="true" key="svgCropToContents"/>
-        <property value="0" key="svgDisableRasterTiles"/>
-        <property value="false" key="svgGroupLayers"/>
-        <property value="1" key="svgIncludeMetadata"/>
-        <property value="0" key="svgTextFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
+        <property key="svgCropMarginBottom" value="0"/>
+        <property key="svgCropMarginLeft" value="0"/>
+        <property key="svgCropMarginRight" value="0"/>
+        <property key="svgCropMarginTop" value="0"/>
+        <property key="svgCropToContents" value="true"/>
+        <property key="svgDisableRasterTiles" value="0"/>
+        <property key="svgGroupLayers" value="false"/>
+        <property key="svgIncludeMetadata" value="1"/>
+        <property key="svgTextFormat" value="0"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;area&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="300" name="Fencing" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" type="65638" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -12112,269 +12104,269 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="FENCING: [% &quot;name&quot; %]" type="65641" positionOnPage="6.76779,190.27,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="64" htmlState="0" zValue="11" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="148.46,7.36972,mm" position="6.76779,190.27,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" position="6.76779,190.27,mm" type="65641" valign="64" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="11" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" excludeFromExports="0" positionOnPage="6.76779,190.27,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 2.2" type="65641" positionOnPage="211.295,197.64,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" htmlState="0" zValue="10" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="27.7839,7.51682,mm" position="211.295,197.64,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" position="211.295,197.64,mm" type="65641" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="10" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 2.3" excludeFromExports="0" positionOnPage="211.295,197.64,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Total cones: [% &quot;cone_length&quot; %]m" type="65641" positionOnPage="115.637,198.083,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" htmlState="0" zValue="9" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="67.0856,7.80192,mm" position="115.637,198.083,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" position="115.637,198.083,mm" type="65641" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total cones: [% &quot;cone_length&quot; %]m" excludeFromExports="0" positionOnPage="115.637,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Total fencing: [% &quot;fence_length&quot; %]m" type="65641" positionOnPage="59.5581,198.083,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="53.0017,7.80192,mm" position="59.5581,198.083,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" position="59.5581,198.083,mm" type="65641" valign="32" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total fencing: [% &quot;fence_length&quot; %]m" excludeFromExports="0" positionOnPage="59.5581,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Page [% @atlas_featurenumber %]" type="65641" positionOnPage="6.76779,198.083,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="52.7903,7.80192,mm" position="6.76779,198.083,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" position="6.76779,198.083,mm" type="65641" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% @atlas_featurenumber %]" excludeFromExports="0" positionOnPage="6.76779,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="28.8527" itemRotation="0" resizeMode="0" type="65640" positionOnPage="243.098,175.353,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" anchorPoint="8" svgBorderColor="0,0,0,255" zValue="6" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="49.3143" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="" size="49.3143,29.8354,mm" position="243.098,175.353,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" type="65640" pictureWidth="49.3143" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="6" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.098,175.353,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="182.723,190.271,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="56.3557,7.36902,mm" position="182.723,190.271,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" position="182.723,190.271,mm" type="65641" valign="64" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="182.723,190.271,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="6.91779,197.79,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" zValue="4" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="232.01,0.14328,mm" position="6.91779,197.79,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" type="65643" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem numSegmentsLeft="2" frameJoinStyle="miter" opacity="1" groupUuid="" position="6.76779,2.8482,mm" labelBarSpace="1" outlineWidthM="0.3,mm" excludeFromExports="0" unitType="meters" positionOnPage="6.76779,2.8482,mm" alignment="0" height="2" lineCapStyle="square" segmentMillimeters="28.6552" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" outlineWidth="0.2" type="65646" numUnitsPerSegment="400" frame="false" background="false" segmentSizeMode="1" lineJoinStyle="round" style="Double Box" numMapUnitsPerScaleBarUnit="1" itemRotation="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" size="97.6157,15.8378,mm" id="" visibility="1" unitLabel="m" zValue="3" referencePoint="0" blendMode="0" positionLock="true" maxBarWidth="100" boxContentSpace="0.2" minBarWidth="25">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem lineJoinStyle="round" visibility="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" style="Double Box" frameJoinStyle="miter" numUnitsPerSegment="400" segmentSizeMode="1" itemRotation="0" outlineWidth="0.2" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" size="97.6157,15.8378,mm" id="" type="65646" background="false" segmentMillimeters="28.6552" labelBarSpace="1" numSegments="2" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" zValue="3" alignment="0" unitType="meters" unitLabel="m" position="6.76779,2.8482,mm" blendMode="0" positionOnPage="6.76779,2.8482,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" minBarWidth="25">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" namedStyle="" fontWeight="50" blendMode="0" fontSize="12" fontCapitals="0" fontLetterSpacing="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" fontFamily="Myriad Pro" fontStrikeout="0">
-          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-          <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
+          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
         </text-style>
-        <fillColor blue="0" alpha="255" green="0" red="0"/>
-        <fillColor2 blue="255" alpha="255" green="255" red="255"/>
-        <strokeColor blue="0" alpha="255" green="0" red="0"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="256.808,2.9982,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="256.808,2.9982,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolHeight="4" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="38.1563,54.9504,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="0" symbolWidth="7" zValue="2" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" equalColumnWidth="1" size="38.1563,54.9504,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="2" rasterBorder="1" fontColor="#000000" position="256.808,2.9982,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="0" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
+          <style alignment="1" name="title">
+            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2.5" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
               <customproperties>
-                <property value="0,1,2" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/node-order" value="0,1,2"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
               <customproperties>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" mapFlags="0" type="65639" positionOnPage="6.76779,9.35102,mm" opacity="0.9" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Fencing" size="283.418,180.92,mm" position="6.76779,9.35102,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" position="6.76779,9.35102,mm" type="65639" drawCanvasItems="false" followPresetName="Fencing" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="0.9" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="6.76779,9.35102,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option value="1" name="exponent" type="double"/>
+                      <Option value="360" name="maxOutput" type="double"/>
+                      <Option value="0" name="maxValue" type="double"/>
+                      <Option value="0" name="minOutput" type="double"/>
+                      <Option value="0" name="minValue" type="double"/>
+                      <Option value="0" name="nullOutput" type="double"/>
                     </Option>
-                    <Option type="int" name="t" value="0"/>
+                    <Option value="0" name="t" type="int"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="angle" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.35783154382262339" ymin="-33.94972755295309952" ymax="-33.92240721182624696" xmax="18.40062995539080148"/>
+        <Extent xmax="18.4006299553904995" ymin="-33.94972755295310662" ymax="-33.92240721182624696" xmin="18.35783154382292537"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12388,62 +12380,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="5" topAnnotationDisplay="3" topAnnotationPosition="1" position="3" rightAnnotationDisplay="3" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="1" bottomAnnotationPosition="1" leftAnnotationDisplay="3" bottomAnnotationDisplay="3" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="5">
+        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12459,274 +12451,274 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>WGS84</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="rasterize"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="rasterize" value="true"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortKey="group" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerName="fence_groups" coverageLayerProvider="virtual" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;name&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="9" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="9" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" type="65638" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="Directions to Start of Race" type="65641" positionOnPage="4.43449,186.634,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="83.9998,10.4638,mm" position="4.43449,186.634,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" position="4.43449,186.634,mm" type="65641" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Directions to Start of Race" excludeFromExports="0" positionOnPage="4.43449,186.634,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Gun Run" type="65641" positionOnPage="4.43449,197.498,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="48.2923,9.511,mm" position="4.43449,197.498,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" position="4.43449,197.498,mm" type="65641" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Gun Run" excludeFromExports="0" positionOnPage="4.43449,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" opacity="1" groupUuid="" columnSpace="0" position="10.096,10.8563,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="0" lineSpacing="2" boxSpace="2" wrapChar="" positionOnPage="10.096,10.8563,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolHeight="5" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="59.0766,76,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="9" legendFilterByMap="1" zValue="6" referencePoint="0" blendMode="0" positionLock="false" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="139" alpha="255" green="139" red="139"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolAlignment="1" frameJoinStyle="round" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" equalColumnWidth="0" size="59.0766,76,mm" id="" type="65642" lineSpacing="2" background="true" wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" legendFilterByMap="1" excludeFromExports="0" groupUuid="" zValue="6" rasterBorder="1" fontColor="#000000" position="10.096,10.8563,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="10.096,10.8563,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="0" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="9" resizeToContents="1" symbolHeight="5">
+        <FrameColor blue="139" green="139" red="139" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2.5" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="3" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginTop="2.5" alignment="1" name="symbolLabel" marginLeft="3">
+            <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
             <customproperties>
-              <property value="hidden" key="legend/title-style"/>
+              <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
               <customproperties>
-                <property value="Start/Finish" key="legend/label-0"/>
-                <property value="Toilets" key="legend/label-1"/>
-                <property value="Tog Bag Drop-off" key="legend/label-2"/>
-                <property value="Road Closed to Cars" key="legend/label-3"/>
-                <property value="MyCiti Drop-off" key="legend/label-4"/>
-                <property value="Parking" key="legend/label-5"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="Start/Finish"/>
+                <property key="legend/label-1" value="Toilets"/>
+                <property key="legend/label-2" value="Tog Bag Drop-off"/>
+                <property key="legend/label-3" value="Road Closed to Cars"/>
+                <property key="legend/label-4" value="MyCiti Drop-off"/>
+                <property key="legend/label-5" value="Parking"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
               <customproperties>
-                <property value="To 21KM Start (06:30)" key="legend/label-0"/>
-                <property value="To 10KM Start (07:30)" key="legend/label-1"/>
-                <property value="To 5KM Start (08:30)" key="legend/label-2"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="To 21KM Start (06:30)"/>
+                <property key="legend/label-1" value="To 10KM Start (07:30)"/>
+                <property key="legend/label-2" value="To 5KM Start (08:30)"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.0" type="65641" positionOnPage="221.862,190.027,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="27.7839,6.871,mm" position="221.862,190.027,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" position="221.862,190.027,mm" type="65641" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.0" excludeFromExports="0" positionOnPage="221.862,190.027,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="197.975,197.498,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" htmlState="0" zValue="4" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="197.975,197.498,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" position="197.975,197.498,mm" type="65641" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="197.975,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="24.3824" itemRotation="0" resizeMode="0" type="65640" positionOnPage="249.646,179.724,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="3" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="41.6737" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" size="42.9838,24.3824,mm" position="249.646,179.724,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" type="65640" pictureWidth="41.6737" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" frameJoinStyle="miter" positionLock="false" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="24.3824" positionOnPage="249.646,179.724,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="4.58449,197.248,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" zValue="2" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="244.912,0.1,mm" position="4.58449,197.248,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" type="65643" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="4.43449,6.411,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Ask Me" size="288.007,183.616,mm" position="4.43449,6.411,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" position="4.43449,6.411,mm" type="65639" drawCanvasItems="false" followPresetName="Ask Me" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="4.43449,6.411,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151"/>
+        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmin="18.39762336729721071"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12740,480 +12732,480 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="" coverageLayer="" enabled="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas pageNameExpression="" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" enabled="0" sortFeatures="0" hideCoverage="0"/>
     </Layout>
-    <Layout name="All Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="All Routes" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" type="65638" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.6" type="65641" positionOnPage="204.225,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="64" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="57.4836,6.8714,mm" position="204.225,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.6" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="210.038,199.082,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="210.038,199.082,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="17.4074" itemRotation="0" resizeMode="0" type="65640" positionOnPage="262.196,188.218,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="29.7523" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" size="29.7523,17.4718,mm" position="262.196,188.218,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="9.59946,198.832,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" zValue="3" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="251.959,0.1,mm" position="9.59946,198.832,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.59946,198.832,mm" type="65643" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.86559,4.09761,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" labelMargin="0,mm" zValue="2" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="false" id="" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="67.7828,166.874,mm" position="5.86559,4.09761,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="9.44946,9.08557,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="false" id="" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" outlineWidthM="0.15,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="282.012,182.649,mm" position="9.44946,9.08557,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="282.012,182.649,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.36799999999999855" ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmax="18.42103445111282056"/>
+        <Extent xmax="18.42103445111282056" ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmin="18.36799999999999855"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas sortAscending="0" hideCoverage="0" sortKey="length_m" pageNameExpression="&quot;Distance&quot;" coverageLayer="" enabled="0" filterFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayer="" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="0" sortFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="120" name="Marshal Plan A1" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="594,841,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" type="65638" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -13221,436 +13213,436 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="25.5925,18.7971,mm" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="25.5925,18.7971,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolHeight="4" type="65642" fontColor="#000000" frame="false" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="18.6109,9,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="8" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="25.5925,18.7971,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="25.5925,18.7971,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="1" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="MARSHAL POSITIONS" type="65641" positionOnPage="5.2963,808.939,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="91.9494,15.0649,mm" position="5.2963,808.939,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" position="5.2963,808.939,mm" type="65641" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.2963,808.939,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 0.91" type="65641" positionOnPage="430.403,825.052,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="56.6212,15.3656,mm" position="430.403,825.052,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" position="430.403,825.052,mm" type="65641" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 0.91" excludeFromExports="0" positionOnPage="430.403,825.052,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="372.175,808.942,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" htmlState="0" zValue="4" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="114.848,15.0635,mm" position="372.175,808.942,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" position="372.175,808.942,mm" type="65641" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="372.175,808.942,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="58.7992" itemRotation="0" resizeMode="0" type="65640" positionOnPage="489.557,775.395,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" anchorPoint="8" svgBorderColor="0,0,0,255" zValue="3" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="100.498" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="" size="100.498,63.9757,mm" position="489.557,775.395,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" type="65640" pictureWidth="100.498" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="58.7992" positionOnPage="489.557,775.395,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="5.4463,824.155,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" zValue="2" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="481.428,0.606138,mm" position="5.4463,824.155,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" type="65643" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="3.94474,5.25965,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Marshal overview" size="584.759,811.213,mm" position="3.94474,5.25965,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" position="3.94474,5.25965,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.94474,5.25965,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741"/>
+        <Extent xmax="18.42299397558693741" ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="Access Roads" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" type="65638" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="244.484,130.172,mm" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="0" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="244.484,130.172,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolHeight="4" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="34.45,40.8,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="15" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="185" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" equalColumnWidth="0" size="34.45,40.8,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" positionLock="true" excludeFromExports="0" groupUuid="" zValue="15" rasterBorder="1" fontColor="#000000" position="244.484,130.172,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="244.484,130.172,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="title">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2.5" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
               <customproperties>
                 <property key="expandedLegendNodes"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="ACCESS ROUTES FOR RESIDENTS" type="65641" positionOnPage="9.37446,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="0" frameJoinStyle="miter" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="194.851,7.272,mm" position="9.37446,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" position="9.37446,191.81,mm" type="65641" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" excludeFromExports="0" positionOnPage="9.37446,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.1" type="65641" positionOnPage="204.225,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="57.4836,6.8714,mm" position="204.225,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="210.038,199.082,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="210.038,199.082,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="17.4074" itemRotation="0" resizeMode="0" type="65640" positionOnPage="262.196,188.218,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="29.7523" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" size="29.7523,17.4718,mm" position="262.196,188.218,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="9.59946,198.832,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" zValue="3" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="251.959,0.1,mm" position="9.59946,198.832,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" type="65643" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.86559,4.09761,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" labelMargin="0,mm" zValue="2" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Access Routes" size="67.7828,166.874,mm" position="5.86559,4.09761,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13664,102 +13656,102 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="9.44946,9.08557,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" visibility="1" outlineWidthM="0.15,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Access Routes" size="282.012,175.592,mm" position="9.44946,9.08557,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431"/>
+        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13773,87 +13765,87 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="false" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" coverageLayerProvider="ogr" enabled="1" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" enabled="1" sortFeatures="0" hideCoverage="1"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index e08e4fb..90dcf22 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 27476a7..2b0b1e8 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -19,124 +19,126 @@
   </projectCrs>
   <layer-tree-group>
     <customproperties/>
-    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="marshal_positions" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" name="marshal_positions" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./extra_security.shp" id="extra_security20170921130834191">
+      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" name="extra_security" expanded="1" id="extra_security20170921130834191" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" expanded="1" checked="Qt::Unchecked" providerKey="delimitedtext" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" name="marshals_by_position" expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="complete_marshal_overview" expanded="1" checked="Qt::Unchecked" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="marshal_overviews" expanded="0" checked="Qt::Unchecked" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" name="marshal_overviews" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="fencing" expanded="0" checked="Qt::Checked" providerKey="ogr" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_groups" expanded="1" checked="Qt::Unchecked" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" name="fence_groups" expanded="1" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" providerKey="virtual">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="timelapse" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./timelapse.shp|layername=timelapse" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe">
+      <layer-tree-layer source="./timelapse.shp|layername=timelapse" checked="Qt::Unchecked" name="timelapse" expanded="1" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" providerKey="ogr">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1">
         <customproperties/>
-        <layer-tree-layer name="route markers" expanded="0" checked="Qt::Checked" providerKey="memory" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={2d51e5b3-6a9d-45f7-a888-2856a6d54c70}" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa">
-          <customproperties/>
+        <layer-tree-layer source="Point?crs=EPSG:4326&amp;uid={92473fdf-e0f9-4b27-ad1c-fa2cfc7b925d}" checked="Qt::Checked" name="route markers" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" providerKey="memory">
+          <customproperties>
+            <property key="showFeatureCount" value="1"/>
+          </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="water_tables" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./water_tables.shp" id="water_tables20170921142016467">
+      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" name="water_tables" expanded="1" id="water_tables20170921142016467" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" name="residents_access" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="osm_roads" expanded="0" checked="Qt::Checked" providerKey="ogr" source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" name="osm_roads" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" name="osm_places" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="data-comments" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12">
+      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" name="data-comments" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="start_finish_area" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe">
+      <layer-tree-layer source="./start_finish_area.shp" checked="Qt::Unchecked" name="start_finish_area" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0">
       <customproperties/>
-      <layer-tree-layer name="capetownelevation-1m" expanded="1" checked="Qt::Unchecked" providerKey="ogr" source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
+      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1">
       <customproperties/>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" expanded="1" checked="Qt::Unchecked" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="Outlines" expanded="1" checked="Qt::Checked" providerKey="wms" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
+      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Unchecked" name="Outlines" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms">
         <customproperties>
           <property key="expandedLegendNodes"/>
         </customproperties>
@@ -161,46 +163,46 @@
       <item>data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12</item>
       <item>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</item>
       <item>fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1</item>
-      <item>proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa</item>
       <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
       <item>timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe</item>
+      <item>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" type="1" intersection-snapping="1" tolerance="10" mode="3" enabled="0">
+  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" unit="1" type="1" enabled="0">
     <individual-layer-settings>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer-setting type="2" tolerance="0" units="2" enabled="0" id="extra_security20170921130834191"/>
-      <layer-setting type="2" tolerance="0" units="2" enabled="0" id="water_tables20170921142016467"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer-setting type="2" tolerance="20" units="1" enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe"/>
-      <layer-setting type="1" tolerance="12" units="1" enabled="0" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
-      <layer-setting type="2" tolerance="12" units="1" enabled="0" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" enabled="0"/>
+      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" type="2" enabled="0"/>
+      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" enabled="0"/>
+      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" enabled="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations>
-    <relation referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fence_group_relationship" referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" strength="Association" id="fence_group_rel">
-      <fieldRef referencedField="group" referencingField="group"/>
+    <relation strength="Association" name="fence_group_relationship" id="fence_group_rel" referencingLayer="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" referencedLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1">
+      <fieldRef referencingField="group" referencedField="group"/>
     </relation>
   </relations>
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.36882664357088757</xmin>
-      <ymin>-33.94741659845757198</ymin>
-      <xmax>18.41776328058529444</xmax>
-      <ymax>-33.89677112988409391</ymax>
+      <xmin>18.40437472216478199</xmin>
+      <ymin>-33.90415462296931537</ymin>
+      <xmax>18.4068947122138411</xmax>
+      <ymax>-33.90273256048882899</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -220,135 +222,135 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" checked="Qt::Unchecked" open="true">
-      <legendlayer name="marshal_positions" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
+      <legendlayer open="true" checked="Qt::Checked" name="marshal_positions" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="extra_security" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="extra_security" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshals_by_position" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="marshals_by_position" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="complete_marshal_overview" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="complete_marshal_overview" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshal_overviews" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="false">
+      <legendlayer open="false" checked="Qt::Unchecked" name="marshal_overviews" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="false" hidden="false">
           <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
-      <legendlayer name="fencing" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="false">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Fencing and Cones">
+      <legendlayer open="true" checked="Qt::Checked" name="fencing" drawingOrder="-1" showFeatureCount="0">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="fence_groups" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="fence_groups" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" checked="Qt::Checked" open="true">
-      <legendlayer name="timelapse" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup open="true" checked="Qt::Checked" name="Routes">
+      <legendlayer open="true" checked="Qt::Unchecked" name="timelapse" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" visible="1"/>
+          <legendlayerfile isInOverview="0" layerid="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendgroup name="Markers" checked="Qt::Checked" open="true">
-        <legendlayer name="route markers" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="false">
-          <filegroup open="false" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa" visible="1"/>
+      <legendgroup open="true" checked="Qt::Checked" name="Markers">
+        <legendlayer open="true" checked="Qt::Checked" name="route markers" drawingOrder="-1" showFeatureCount="1">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer name="all_routes" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Checked" name="all_routes" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
-      <legendlayer name="water_tables" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
+      <legendlayer open="true" checked="Qt::Checked" name="water_tables" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
-      <legendlayer name="poi_labels" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
+      <legendlayer open="true" checked="Qt::Checked" name="poi_labels" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="directions_to_start" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Checked" name="directions_to_start" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
-      <legendlayer name="residents_access_roads" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
+      <legendlayer open="true" checked="Qt::Checked" name="residents_access_roads" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="residents_access" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
-      <legendlayer name="osm_roads" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="false">
+    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
+      <legendlayer open="false" checked="Qt::Checked" name="osm_roads" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="false" hidden="false">
           <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="osm_places" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="1" open="true">
+      <legendlayer open="true" checked="Qt::Checked" name="osm_places" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="false">
-      <legendlayer name="data-comments" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Start and Finish pages">
+      <legendlayer open="true" checked="Qt::Unchecked" name="data-comments" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="start_finish_area" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="start_finish_area" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
-      <legendlayer name="capetownelevation-1m" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
+      <legendlayer open="true" checked="Qt::Unchecked" name="capetownelevation-1m" drawingOrder="-1" showFeatureCount="1">
         <filegroup open="true" hidden="false">
           <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" checked="Qt::Checked" open="true">
-      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup open="true" checked="Qt::Checked" name="Map">
+      <legendlayer open="true" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
+          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="Outlines" checked="Qt::Checked" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer open="true" checked="Qt::Unchecked" name="Outlines" drawingOrder="-1" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
@@ -356,7 +358,7 @@
   <mapViewDocks/>
   <mapViewDocks3D/>
   <projectlayers>
-    <maplayer type="raster" autoRefreshTime="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -409,11 +411,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -424,9 +426,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -437,13 +439,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property value="false" key="WMSBackgroundLayer"/>
-        <property value="false" key="WMSPublishDataSourceUrl"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="Value" key="identify/format"/>
+        <property key="WMSBackgroundLayer" value="false"/>
+        <property key="WMSPublishDataSourceUrl" value="false"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="identify/format" value="Value"/>
       </customproperties>
       <pipe>
-        <rasterrenderer greenBand="2" type="multibandcolor" redBand="1" blueBand="3" opacity="0.6" alphaBand="-1">
+        <rasterrenderer alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor" opacity="0.6" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -454,13 +456,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeBlue="128" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer type="raster" autoRefreshTime="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692910060286522</ymin>
@@ -513,11 +515,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -528,7 +530,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -539,13 +541,13 @@
         <Searchable>0</Searchable>
       </flags>
       <customproperties>
-        <property value="true" key="WMSBackgroundLayer"/>
-        <property value="false" key="WMSPublishDataSourceUrl"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="Undefined" key="identify/format"/>
+        <property key="WMSBackgroundLayer" value="true"/>
+        <property key="WMSPublishDataSourceUrl" value="false"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="identify/format" value="Undefined"/>
       </customproperties>
       <pipe>
-        <rasterrenderer type="singlebandcolordata" opacity="0.75" alphaBand="-1" band="1">
+        <rasterrenderer alphaBand="-1" band="1" type="singlebandcolordata" opacity="0.75">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -556,13 +558,13 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeBlue="128" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0"/>
+        <huesaturation colorizeStrength="100" colorizeGreen="128" colorizeOn="0" grayscaleMode="0" colorizeRed="255" colorizeBlue="128" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.94586066151139647</ymin>
@@ -615,11 +617,11 @@
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -634,8 +636,8 @@
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field subType="0" type="2" name="length_m" length="6" comment="" typeName="integer" expression="$length" precision="0"/>
-        <field subType="0" type="6" name="length_km" length="-1" comment="" typeName="double precision" expression="$length / 1000" precision="0"/>
+        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
+        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -646,96 +648,96 @@
         <Removable>0</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" label="Active Routes" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule symbol="1" filter="&quot;Distance&quot; = '21KM'" checkstate="0" description="This should be disabled, since it's only for legends" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="2" filter="&quot;Distance&quot; = '10KM'" description="This should be disabled, since it's only for legends" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="3" filter="&quot;Distance&quot; = '25'" checkstate="0" description="This should be disabled, since it's only for legends" label="5KM" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule symbol="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
+            <rule symbol="1" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0" filter="&quot;Distance&quot; = '21KM'"/>
+            <rule symbol="2" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="10KM" filter="&quot;Distance&quot; = '10KM'"/>
+            <rule symbol="3" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0" filter="&quot;Distance&quot; = '25'"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="4" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="0,0,0,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@0@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="true" name="active" type="bool"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                              <Option value="3" name="type" type="int"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -743,236 +745,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="true" name="active" type="bool"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                          <Option value="3" name="type" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="true" name="active" type="bool"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                          <Option value="3" name="type" type="int"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -980,236 +982,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1217,236 +1219,236 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="250" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="RenderMetersInMapUnits" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="145,211,55,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="227,26,28,0" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@3@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option value="" name="name" type="QString"/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option value="false" name="active" type="bool"/>
+                              <Option value="1" name="type" type="int"/>
+                              <Option value="" name="val" type="QString"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1454,243 +1456,243 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="145,211,55,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.5" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="firstvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="firstvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="145,211,55,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{86cc78bd-cf95-435a-99c5-13093c859aa5}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{68d5cde2-f285-4651-b007-1511cc17bfbe}">
+          <rule key="{68d5cde2-f285-4651-b007-1511cc17bfbe}" description="Active routes" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="round($length / 1000, 0)" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round($length / 1000, 0)" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="1" xOffset="0" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="km_marker()" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="1" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="quadrant" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="rotation" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -1710,29 +1712,29 @@
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
           <value>COALESCE( "Name", '&lt;NULL>' )</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -1741,8 +1743,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1751,8 +1753,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1761,8 +1763,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1771,8 +1773,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1781,8 +1783,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1791,8 +1793,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1801,8 +1803,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1811,8 +1813,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1821,8 +1823,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -1831,83 +1833,83 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_m"/>
-        <alias name="" index="9" field="length_km"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="length_m" index="8" name=""/>
+        <alias field="length_km" index="9" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="descriptio"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="timestamp"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="begin"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="end"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Distance"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="RouteLen"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Source"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="length_m"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="length_m"/>
-        <constraint desc="" exp="" field="length_km"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field subType="0" type="2" name="length_m" length="6" comment="" typeName="integer" expression="$length" precision="0"/>
-        <field subType="0" type="6" name="length_km" length="-1" comment="" typeName="double precision" expression="$length / 1000" precision="0"/>
+        <field name="length_m" expression="$length" typeName="integer" length="6" subType="0" precision="0" comment="" type="2"/>
+        <field name="length_km" expression="$length / 1000" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
         <columns>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="163" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="163" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -1938,16 +1940,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -1965,7 +1967,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -2009,7 +2011,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2029,31 +2031,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="183,72,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="183,72,75,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2066,7 +2068,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2094,32 +2096,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" field="elevation"/>
+        <default field="ID" applyOnUpdate="0" expression=""/>
+        <default field="height" applyOnUpdate="0" expression=""/>
+        <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="ID"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="height"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="elevation"/>
+        <constraint notnull_strength="0" field="ID" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="height" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="elevation" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="ID"/>
-        <constraint desc="" exp="" field="height"/>
-        <constraint desc="" exp="" field="elevation"/>
+        <constraint field="ID" exp="" desc=""/>
+        <constraint field="height" exp="" desc=""/>
+        <constraint field="elevation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2139,7 +2141,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -2183,7 +2185,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -2205,26 +2207,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="225,89,137,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="225,89,137,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2237,9 +2239,9 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -2267,32 +2269,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="page"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -2312,7 +2314,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -2365,11 +2367,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2393,31 +2395,31 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,85,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,85,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2428,49 +2430,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="Name" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="10">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="Name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="LineGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="2" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="Name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="Name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -2491,32 +2493,32 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Name"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Name" index="1" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Name"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Name"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Name" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -2547,8 +2549,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Name"/>
@@ -2558,7 +2560,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -2611,11 +2613,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -2639,140 +2641,140 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'"/>
+          <rule symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'"/>
+          <rule symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="miter" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="210,32,39,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="miter"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="210,32,39,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="210,32,39,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@0@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="210,32,39,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@0@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2780,106 +2782,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="210,32,39,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="103,34,144,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="miter"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="103,34,144,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2887,79 +2889,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="103,34,144,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="103,34,144,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2967,106 +2969,106 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="103,34,144,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="500" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="lastvertex" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="lastvertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="miter" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="69,100,25,255" k="outline_color"/>
-                      <prop v="solid" k="outline_style"/>
-                      <prop v="0.5" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="69,100,25,255"/>
+                      <prop k="joinstyle" v="miter"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="69,100,25,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.5"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3074,79 +3076,79 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="100" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="100"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer class="FilledMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="69,100,25,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MapUnit" k="offset_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="69,100,25,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" force_rhr="0">
-                    <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-                      <prop v="69,100,25,255" k="color"/>
-                      <prop v="bevel" k="joinstyle"/>
-                      <prop v="0,0" k="offset"/>
-                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                      <prop v="MM" k="offset_unit"/>
-                      <prop v="26,0,201,0" k="outline_color"/>
-                      <prop v="no" k="outline_style"/>
-                      <prop v="0" k="outline_width"/>
-                      <prop v="MM" k="outline_width_unit"/>
-                      <prop v="solid" k="style"/>
+                  <symbol name="@@2@1@0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="69,100,25,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="26,0,201,0"/>
+                      <prop k="outline_style" v="no"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" name="name" type="QString"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3154,62 +3156,62 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="flat" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MapUnit" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="miter" k="joinstyle"/>
-              <prop v="69,100,25,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="flat"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="miter"/>
+              <prop k="line_color" v="69,100,25,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
-        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3225,40 +3227,40 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="Distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3289,17 +3291,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -3318,7 +3320,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -3362,7 +3364,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -3382,39 +3384,39 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="227,0,185,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,0" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.796078">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="227,0,185,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,0"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3425,89 +3427,89 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="8">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="1" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="8" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="1" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="227,0,185,255" namedStyle="Semibold" fontSize="4">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.1" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.5" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="4" blendMode="0" textColor="227,0,185,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="1" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="2"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -3515,164 +3517,164 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="false" key="labeling/addDirectionSymbol"/>
-        <property value="0" key="labeling/angleOffset"/>
-        <property value="0" key="labeling/blendMode"/>
-        <property value="0" key="labeling/bufferBlendMode"/>
-        <property value="255" key="labeling/bufferColorA"/>
-        <property value="255" key="labeling/bufferColorB"/>
-        <property value="255" key="labeling/bufferColorG"/>
-        <property value="255" key="labeling/bufferColorR"/>
-        <property value="false" key="labeling/bufferDraw"/>
-        <property value="64" key="labeling/bufferJoinStyle"/>
-        <property value="false" key="labeling/bufferNoFill"/>
-        <property value="1" key="labeling/bufferSize"/>
-        <property value="false" key="labeling/bufferSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
-        <property value="0" key="labeling/bufferTransp"/>
-        <property value="false" key="labeling/centroidInside"/>
-        <property value="false" key="labeling/centroidWhole"/>
-        <property value="3" key="labeling/decimals"/>
-        <property value="false" key="labeling/displayAll"/>
-        <property value="0" key="labeling/dist"/>
-        <property value="false" key="labeling/distInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
-        <property value="false" key="labeling/drawLabels"/>
-        <property value="false" key="labeling/enabled"/>
-        <property value="position" key="labeling/fieldName"/>
-        <property value="false" key="labeling/fitInPolygonOnly"/>
-        <property value="0" key="labeling/fontCapitals"/>
-        <property value="Myriad Pro" key="labeling/fontFamily"/>
-        <property value="false" key="labeling/fontItalic"/>
-        <property value="0" key="labeling/fontLetterSpacing"/>
-        <property value="false" key="labeling/fontLimitPixelSize"/>
-        <property value="10000" key="labeling/fontMaxPixelSize"/>
-        <property value="3" key="labeling/fontMinPixelSize"/>
-        <property value="10" key="labeling/fontSize"/>
-        <property value="false" key="labeling/fontSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
-        <property value="false" key="labeling/fontStrikeout"/>
-        <property value="false" key="labeling/fontUnderline"/>
-        <property value="63" key="labeling/fontWeight"/>
-        <property value="0" key="labeling/fontWordSpacing"/>
-        <property value="false" key="labeling/formatNumbers"/>
-        <property value="false" key="labeling/isExpression"/>
-        <property value="true" key="labeling/labelOffsetInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
-        <property value="false" key="labeling/labelPerPart"/>
-        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
-        <property value="false" key="labeling/limitNumLabels"/>
-        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
-        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
-        <property value="2000" key="labeling/maxNumLabels"/>
-        <property value="false" key="labeling/mergeLines"/>
-        <property value="0" key="labeling/minFeatureSize"/>
-        <property value="0" key="labeling/multilineAlign"/>
-        <property value="1" key="labeling/multilineHeight"/>
-        <property value="Semibold" key="labeling/namedStyle"/>
-        <property value="true" key="labeling/obstacle"/>
-        <property value="1" key="labeling/obstacleFactor"/>
-        <property value="0" key="labeling/obstacleType"/>
-        <property value="0" key="labeling/offsetType"/>
-        <property value="0" key="labeling/placeDirectionSymbol"/>
-        <property value="0" key="labeling/placement"/>
-        <property value="10" key="labeling/placementFlags"/>
-        <property value="false" key="labeling/plussign"/>
-        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
-        <property value="true" key="labeling/preserveRotation"/>
-        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
-        <property value="5" key="labeling/priority"/>
-        <property value="4" key="labeling/quadOffset"/>
-        <property value="0" key="labeling/repeatDistance"/>
-        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
-        <property value="1" key="labeling/repeatDistanceUnit"/>
-        <property value="false" key="labeling/reverseDirectionSymbol"/>
-        <property value=">" key="labeling/rightDirectionSymbol"/>
-        <property value="10000000" key="labeling/scaleMax"/>
-        <property value="1" key="labeling/scaleMin"/>
-        <property value="false" key="labeling/scaleVisibility"/>
-        <property value="6" key="labeling/shadowBlendMode"/>
-        <property value="0" key="labeling/shadowColorB"/>
-        <property value="0" key="labeling/shadowColorG"/>
-        <property value="0" key="labeling/shadowColorR"/>
-        <property value="false" key="labeling/shadowDraw"/>
-        <property value="135" key="labeling/shadowOffsetAngle"/>
-        <property value="1" key="labeling/shadowOffsetDist"/>
-        <property value="true" key="labeling/shadowOffsetGlobal"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shadowOffsetUnits"/>
-        <property value="1.5" key="labeling/shadowRadius"/>
-        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
-        <property value="1" key="labeling/shadowRadiusUnits"/>
-        <property value="100" key="labeling/shadowScale"/>
-        <property value="30" key="labeling/shadowTransparency"/>
-        <property value="0" key="labeling/shadowUnder"/>
-        <property value="0" key="labeling/shapeBlendMode"/>
-        <property value="255" key="labeling/shapeBorderColorA"/>
-        <property value="128" key="labeling/shapeBorderColorB"/>
-        <property value="128" key="labeling/shapeBorderColorG"/>
-        <property value="128" key="labeling/shapeBorderColorR"/>
-        <property value="0" key="labeling/shapeBorderWidth"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
-        <property value="1" key="labeling/shapeBorderWidthUnits"/>
-        <property value="true" key="labeling/shapeDraw"/>
-        <property value="255" key="labeling/shapeFillColorA"/>
-        <property value="138" key="labeling/shapeFillColorB"/>
-        <property value="0" key="labeling/shapeFillColorG"/>
-        <property value="101" key="labeling/shapeFillColorR"/>
-        <property value="64" key="labeling/shapeJoinStyle"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shapeOffsetUnits"/>
-        <property value="0" key="labeling/shapeOffsetX"/>
-        <property value="0" key="labeling/shapeOffsetY"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
-        <property value="1" key="labeling/shapeRadiiUnits"/>
-        <property value="0" key="labeling/shapeRadiiX"/>
-        <property value="0" key="labeling/shapeRadiiY"/>
-        <property value="0" key="labeling/shapeRotation"/>
-        <property value="0" key="labeling/shapeRotationType"/>
-        <property value="" key="labeling/shapeSVGFile"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
-        <property value="0" key="labeling/shapeSizeType"/>
-        <property value="1" key="labeling/shapeSizeUnits"/>
-        <property value="0" key="labeling/shapeSizeX"/>
-        <property value="0" key="labeling/shapeSizeY"/>
-        <property value="0" key="labeling/shapeTransparency"/>
-        <property value="0" key="labeling/shapeType"/>
-        <property value="255" key="labeling/textColorA"/>
-        <property value="255" key="labeling/textColorB"/>
-        <property value="255" key="labeling/textColorG"/>
-        <property value="255" key="labeling/textColorR"/>
-        <property value="0" key="labeling/textTransp"/>
-        <property value="0" key="labeling/upsidedownLabels"/>
-        <property value="" key="labeling/wrapChar"/>
-        <property value="0" key="labeling/xOffset"/>
-        <property value="0" key="labeling/yOffset"/>
-        <property value="0" key="labeling/zIndex"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="labeling/addDirectionSymbol" value="false"/>
+        <property key="labeling/angleOffset" value="0"/>
+        <property key="labeling/blendMode" value="0"/>
+        <property key="labeling/bufferBlendMode" value="0"/>
+        <property key="labeling/bufferColorA" value="255"/>
+        <property key="labeling/bufferColorB" value="255"/>
+        <property key="labeling/bufferColorG" value="255"/>
+        <property key="labeling/bufferColorR" value="255"/>
+        <property key="labeling/bufferDraw" value="false"/>
+        <property key="labeling/bufferJoinStyle" value="64"/>
+        <property key="labeling/bufferNoFill" value="false"/>
+        <property key="labeling/bufferSize" value="1"/>
+        <property key="labeling/bufferSizeInMapUnits" value="false"/>
+        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/bufferTransp" value="0"/>
+        <property key="labeling/centroidInside" value="false"/>
+        <property key="labeling/centroidWhole" value="false"/>
+        <property key="labeling/decimals" value="3"/>
+        <property key="labeling/displayAll" value="false"/>
+        <property key="labeling/dist" value="0"/>
+        <property key="labeling/distInMapUnits" value="false"/>
+        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/drawLabels" value="false"/>
+        <property key="labeling/enabled" value="false"/>
+        <property key="labeling/fieldName" value="position"/>
+        <property key="labeling/fitInPolygonOnly" value="false"/>
+        <property key="labeling/fontCapitals" value="0"/>
+        <property key="labeling/fontFamily" value="Myriad Pro"/>
+        <property key="labeling/fontItalic" value="false"/>
+        <property key="labeling/fontLetterSpacing" value="0"/>
+        <property key="labeling/fontLimitPixelSize" value="false"/>
+        <property key="labeling/fontMaxPixelSize" value="10000"/>
+        <property key="labeling/fontMinPixelSize" value="3"/>
+        <property key="labeling/fontSize" value="10"/>
+        <property key="labeling/fontSizeInMapUnits" value="false"/>
+        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/fontStrikeout" value="false"/>
+        <property key="labeling/fontUnderline" value="false"/>
+        <property key="labeling/fontWeight" value="63"/>
+        <property key="labeling/fontWordSpacing" value="0"/>
+        <property key="labeling/formatNumbers" value="false"/>
+        <property key="labeling/isExpression" value="false"/>
+        <property key="labeling/labelOffsetInMapUnits" value="true"/>
+        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/labelPerPart" value="false"/>
+        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
+        <property key="labeling/limitNumLabels" value="false"/>
+        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
+        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
+        <property key="labeling/maxNumLabels" value="2000"/>
+        <property key="labeling/mergeLines" value="false"/>
+        <property key="labeling/minFeatureSize" value="0"/>
+        <property key="labeling/multilineAlign" value="0"/>
+        <property key="labeling/multilineHeight" value="1"/>
+        <property key="labeling/namedStyle" value="Semibold"/>
+        <property key="labeling/obstacle" value="true"/>
+        <property key="labeling/obstacleFactor" value="1"/>
+        <property key="labeling/obstacleType" value="0"/>
+        <property key="labeling/offsetType" value="0"/>
+        <property key="labeling/placeDirectionSymbol" value="0"/>
+        <property key="labeling/placement" value="0"/>
+        <property key="labeling/placementFlags" value="10"/>
+        <property key="labeling/plussign" value="false"/>
+        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+        <property key="labeling/preserveRotation" value="true"/>
+        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
+        <property key="labeling/priority" value="5"/>
+        <property key="labeling/quadOffset" value="4"/>
+        <property key="labeling/repeatDistance" value="0"/>
+        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/repeatDistanceUnit" value="1"/>
+        <property key="labeling/reverseDirectionSymbol" value="false"/>
+        <property key="labeling/rightDirectionSymbol" value=">"/>
+        <property key="labeling/scaleMax" value="10000000"/>
+        <property key="labeling/scaleMin" value="1"/>
+        <property key="labeling/scaleVisibility" value="false"/>
+        <property key="labeling/shadowBlendMode" value="6"/>
+        <property key="labeling/shadowColorB" value="0"/>
+        <property key="labeling/shadowColorG" value="0"/>
+        <property key="labeling/shadowColorR" value="0"/>
+        <property key="labeling/shadowDraw" value="false"/>
+        <property key="labeling/shadowOffsetAngle" value="135"/>
+        <property key="labeling/shadowOffsetDist" value="1"/>
+        <property key="labeling/shadowOffsetGlobal" value="true"/>
+        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowOffsetUnits" value="1"/>
+        <property key="labeling/shadowRadius" value="1.5"/>
+        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
+        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowRadiusUnits" value="1"/>
+        <property key="labeling/shadowScale" value="100"/>
+        <property key="labeling/shadowTransparency" value="30"/>
+        <property key="labeling/shadowUnder" value="0"/>
+        <property key="labeling/shapeBlendMode" value="0"/>
+        <property key="labeling/shapeBorderColorA" value="255"/>
+        <property key="labeling/shapeBorderColorB" value="128"/>
+        <property key="labeling/shapeBorderColorG" value="128"/>
+        <property key="labeling/shapeBorderColorR" value="128"/>
+        <property key="labeling/shapeBorderWidth" value="0"/>
+        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeBorderWidthUnits" value="1"/>
+        <property key="labeling/shapeDraw" value="true"/>
+        <property key="labeling/shapeFillColorA" value="255"/>
+        <property key="labeling/shapeFillColorB" value="138"/>
+        <property key="labeling/shapeFillColorG" value="0"/>
+        <property key="labeling/shapeFillColorR" value="101"/>
+        <property key="labeling/shapeJoinStyle" value="64"/>
+        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeOffsetUnits" value="1"/>
+        <property key="labeling/shapeOffsetX" value="0"/>
+        <property key="labeling/shapeOffsetY" value="0"/>
+        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeRadiiUnits" value="1"/>
+        <property key="labeling/shapeRadiiX" value="0"/>
+        <property key="labeling/shapeRadiiY" value="0"/>
+        <property key="labeling/shapeRotation" value="0"/>
+        <property key="labeling/shapeRotationType" value="0"/>
+        <property key="labeling/shapeSVGFile" value=""/>
+        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeSizeType" value="0"/>
+        <property key="labeling/shapeSizeUnits" value="1"/>
+        <property key="labeling/shapeSizeX" value="0"/>
+        <property key="labeling/shapeSizeY" value="0"/>
+        <property key="labeling/shapeTransparency" value="0"/>
+        <property key="labeling/shapeType" value="0"/>
+        <property key="labeling/textColorA" value="255"/>
+        <property key="labeling/textColorB" value="255"/>
+        <property key="labeling/textColorG" value="255"/>
+        <property key="labeling/textColorR" value="255"/>
+        <property key="labeling/textTransp" value="0"/>
+        <property key="labeling/upsidedownLabels" value="0"/>
+        <property key="labeling/wrapChar" value=""/>
+        <property key="labeling/xOffset" value="0"/>
+        <property key="labeling/yOffset" value="0"/>
+        <property key="labeling/zIndex" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3681,8 +3683,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -3691,8 +3693,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -3701,45 +3703,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="position"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3812,7 +3814,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="Polygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -3865,11 +3867,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -3886,12 +3888,12 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" precision="0"/>
-        <field subType="0" type="10" name="type" length="0" comment="" typeName="string" expression="'fencing'" precision="0"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -3902,26 +3904,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,170,0,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="f_diagonal" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,170,0,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="f_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3931,30 +3933,30 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3996,53 +3998,53 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="fence_length"/>
-        <alias name="" index="3" field="cone_length"/>
-        <alias name="" index="4" field="type"/>
+        <alias field="name" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="fence_length" index="2" name=""/>
+        <alias field="cone_length" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="fence_length"/>
-        <default applyOnUpdate="0" expression="" field="cone_length"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="fence_length" applyOnUpdate="0" expression=""/>
+        <default field="cone_length" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="group"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="fence_length"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="cone_length"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_length" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_length" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="fence_length"/>
-        <constraint desc="" exp="" field="cone_length"/>
-        <constraint desc="" exp="" field="type"/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="fence_length" exp="" desc=""/>
+        <constraint field="cone_length" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_length" length="-1" comment="" typeName="double precision" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_length" length="-1" comment="" typeName="double precision" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" precision="0"/>
-        <field subType="0" type="10" name="type" length="0" comment="" typeName="string" expression="'fencing'" precision="0"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;fence_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; ), 0)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round(relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_length" expression="round( relation_aggregate( 'fence_group_rel', 'sum', $length, '', regexp_match(&quot;type&quot;, '^fenc') ), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_length" expression="relation_aggregate( 'fence_group_rel', 'sum', &quot;cone_len&quot; )" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="type" expression="'fencing'" typeName="string" length="0" subType="0" precision="0" comment="" type="10"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;fence_length&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;fence_length&quot;">
         <columns>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="fence_length" width="148" hidden="0"/>
-          <column type="field" name="cone_length" width="157" hidden="0"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="148" name="fence_length" hidden="0" type="field"/>
+          <column width="157" name="cone_length" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4073,10 +4075,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="cone_length"/>
-        <field editable="0" name="fence_length"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="cone_length" editable="0"/>
+        <field name="fence_length" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="cone_length"/>
@@ -4087,14 +4089,14 @@ def my_form_open(dialog, layer, feature):
       <widgets>
         <widget name="fence_group_rel">
           <config type="Map">
-            <Option type="QString" name="nm-rel" value=""/>
+            <Option value="" name="nm-rel" type="QString"/>
           </config>
         </widget>
       </widgets>
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4147,11 +4149,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4166,47 +4168,47 @@ def my_form_open(dialog, layer, feature):
       <dataDependencies/>
       <legend type="default-vector"/>
       <expressionfields>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyLocal="1" simplifyDrawingTol="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" version="3.8.3-Zanzibar" simplifyAlgorithm="0" simplifyDrawingHints="1" maxScale="0" minScale="1e+08">
+          <qgis labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyLocal="1" readOnly="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" version="3.8.3-Zanzibar" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
+            <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol alpha="1" type="line" name="0" clip_to_extent="1" force_rhr="0">
-                  <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" name="name" type="QString"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -4215,64 +4217,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontStrikeout="0" fontFamily="Myriad Pro" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="comment" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="11">
-                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeFillColor="255,255,255,255" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiUnit="MM" shapeJoinStyle="128" shapeOffsetX="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiY="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+                    <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidth="0.6" shapeOffsetX="0" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="4" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="5" maxCurvedCharAngleIn="25" geometryGenerator="" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                    <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
+                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                          <Option name="PositionY" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontStrikeout="0" fontFamily="Myriad Pro" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="round( $length, 1) || 'm'" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" fontItalic="0" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="12">
-                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiUnit="MM" shapeJoinStyle="64" shapeOffsetX="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiY="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowBlendMode="6" shadowScale="100" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+                    <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                      <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidth="0" shapeOffsetX="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeSizeType="0" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="1" maxCurvedCharAngleIn="25" geometryGenerator="" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                    <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+                    <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+                    <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
+                    <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option type="Map" name="properties">
-                          <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                        <Option value="" name="name" type="QString"/>
+                        <Option name="properties" type="Map">
+                          <Option name="PositionX" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
-                          <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                          <Option name="PositionY" type="Map">
+                            <Option value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -4280,30 +4282,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute color="#000000" label="" field=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -4387,81 +4389,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" index="0" field="id"/>
-              <alias name="" index="1" field="group"/>
-              <alias name="" index="2" field="comment"/>
-              <alias name="" index="3" field="moveable"/>
-              <alias name="" index="4" field="type"/>
-              <alias name="" index="5" field="name"/>
-              <alias name="" index="6" field="hidden"/>
-              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-              <alias name="" index="9" field="fence_len"/>
-              <alias name="" index="10" field="cone_len"/>
+              <alias field="id" index="0" name=""/>
+              <alias field="group" index="1" name=""/>
+              <alias field="comment" index="2" name=""/>
+              <alias field="moveable" index="3" name=""/>
+              <alias field="type" index="4" name=""/>
+              <alias field="name" index="5" name=""/>
+              <alias field="hidden" index="6" name=""/>
+              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
+              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
+              <alias field="fence_len" index="9" name=""/>
+              <alias field="cone_len" index="10" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" expression="" field="id"/>
-              <default applyOnUpdate="0" expression="" field="group"/>
-              <default applyOnUpdate="0" expression="" field="comment"/>
-              <default applyOnUpdate="0" expression="" field="moveable"/>
-              <default applyOnUpdate="0" expression="" field="type"/>
-              <default applyOnUpdate="0" expression="" field="name"/>
-              <default applyOnUpdate="0" expression="" field="hidden"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-              <default applyOnUpdate="0" expression="" field="fence_len"/>
-              <default applyOnUpdate="0" expression="" field="cone_len"/>
+              <default field="id" applyOnUpdate="0" expression=""/>
+              <default field="group" applyOnUpdate="0" expression=""/>
+              <default field="comment" applyOnUpdate="0" expression=""/>
+              <default field="moveable" applyOnUpdate="0" expression=""/>
+              <default field="type" applyOnUpdate="0" expression=""/>
+              <default field="name" applyOnUpdate="0" expression=""/>
+              <default field="hidden" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+              <default field="fence_len" applyOnUpdate="0" expression=""/>
+              <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="group"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="comment"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="moveable"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="hidden"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="fence_len"/>
-              <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="cone_len"/>
+              <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint desc="" exp="" field="id"/>
-              <constraint desc="" exp="" field="group"/>
-              <constraint desc="" exp="" field="comment"/>
-              <constraint desc="" exp="" field="moveable"/>
-              <constraint desc="" exp="" field="type"/>
-              <constraint desc="" exp="" field="name"/>
-              <constraint desc="" exp="" field="hidden"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
-              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-              <constraint desc="" exp="" field="fence_len"/>
-              <constraint desc="" exp="" field="cone_len"/>
+              <constraint field="id" exp="" desc=""/>
+              <constraint field="group" exp="" desc=""/>
+              <constraint field="comment" exp="" desc=""/>
+              <constraint field="moveable" exp="" desc=""/>
+              <constraint field="type" exp="" desc=""/>
+              <constraint field="name" exp="" desc=""/>
+              <constraint field="hidden" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
+              <constraint field="fence_len" exp="" desc=""/>
+              <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field subType="0" type="6" name="fence_len" length="-1" typeName="double precision" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
-              <field subType="0" type="6" name="fence_len" length="-1" typeName="double precision" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-              <field subType="0" type="6" name="cone_len" length="-1" typeName="double precision" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
+              <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+              <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+              <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;cone_len&quot;">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;cone_len&quot;">
               <columns>
-                <column type="field" name="id" width="-1" hidden="0"/>
-                <column type="field" name="group" width="-1" hidden="0"/>
-                <column type="actions" width="-1" hidden="1"/>
-                <column type="field" name="comment" width="223" hidden="0"/>
-                <column type="field" name="moveable" width="-1" hidden="0"/>
-                <column type="field" name="type" width="-1" hidden="0"/>
-                <column type="field" name="name" width="414" hidden="0"/>
-                <column type="field" name="hidden" width="-1" hidden="0"/>
-                <column type="field" name="fence_len" width="-1" hidden="0"/>
-                <column type="field" name="cone_len" width="-1" hidden="0"/>
-                <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
-                <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -4492,18 +4494,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -4532,170 +4534,170 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="1">
+      <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
-          <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
-          <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <rule symbol="0" key="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')"/>
+          <rule symbol="1" key="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
+          <rule symbol="2" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
+          <rule symbol="3" key="{bb4463e8-e33a-4475-878c-fd2d7b636418}" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr')"/>
+          <rule symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="1;4" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="Point" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="round"/>
+              <prop k="customdash" v="1;4"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="Point"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="round" k="capstyle"/>
-              <prop v="4;3" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="1" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="round"/>
+              <prop k="customdash" v="4;3"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="1"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#64ffff00', '#ffffff00' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0,255,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.8" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.8"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4704,64 +4706,64 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{c6c63c45-b105-4938-9293-1e0b6b509ffc}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cb13c93f-b798-48fe-be18-377822a9654c}">
+          <rule key="{cb13c93f-b798-48fe-be18-377822a9654c}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="comment" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="11">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.6" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="comment" fontSize="11" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.6" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="5" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="5" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="2" offsetType="0" offsetUnits="MM"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{f68a5523-5992-4232-8c24-8259482e149e}">
+          <rule key="{f68a5523-5992-4232-8c24-8259482e149e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="round( $length, 1) || 'm'" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="12">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="round( $length, 1) || 'm'" fontSize="12" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="1" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="15" offsetType="0" offsetUnits="MM"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -4769,30 +4771,30 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -4876,81 +4878,81 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
-        <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-        <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-        <alias name="" index="9" field="fence_len"/>
-        <alias name="" index="10" field="cone_len"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
+        <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
+        <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
+        <alias field="fence_len" index="9" name=""/>
+        <alias field="cone_len" index="10" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default field="moveable" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="hidden" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="group"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="comment"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="moveable"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="hidden"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="fence_len"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="cone_len"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="comment" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="moveable" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="hidden" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_len" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="group"/>
-        <constraint desc="" exp="" field="comment"/>
-        <constraint desc="" exp="" field="moveable"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="hidden"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
-        <constraint desc="" exp="" field="fence_len"/>
-        <constraint desc="" exp="" field="cone_len"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="group" exp="" desc=""/>
+        <constraint field="comment" exp="" desc=""/>
+        <constraint field="moveable" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="hidden" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
+        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="fence_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0"/>
-        <field subType="0" type="6" name="cone_len" length="-1" comment="" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" length="-1" subType="0" precision="0" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="comment" width="1150" hidden="0"/>
-          <column type="field" name="moveable" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="name" width="414" hidden="0"/>
-          <column type="field" name="hidden" width="-1" hidden="0"/>
-          <column type="field" name="fence_len" width="-1" hidden="0"/>
-          <column type="field" name="cone_len" width="-1" hidden="0"/>
-          <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
-          <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="1150" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="414" name="name" hidden="0" type="field"/>
+          <column width="-1" name="hidden" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4981,18 +4983,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -5012,7 +5014,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -5056,7 +5058,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -5076,26 +5078,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="26,0,201,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="dot" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="b_diagonal" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="26,0,201,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="dot"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5105,36 +5107,36 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option type="bool" name="active" value="true"/>
-                <Option type="QString" name="field" value="id"/>
-                <Option type="int" name="type" value="2"/>
+            <Option value="" name="name" type="QString"/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option value="true" name="active" type="bool"/>
+                <Option value="id" name="field" type="QString"/>
+                <Option value="2" name="type" type="int"/>
               </Option>
             </Option>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5143,8 +5145,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5153,8 +5155,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5163,45 +5165,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="page"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="page"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="page" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="page" width="-1" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5232,9 +5234,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -5245,7 +5247,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -5298,11 +5300,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5326,66 +5328,66 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview" label="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule symbol="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview" label="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule symbol="1" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="0.792157" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.792157">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.01" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="1" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="0.01">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5394,236 +5396,236 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{f4f14825-d873-4bbe-9728-d63dc57afbf9}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}">
+          <rule key="{3a329855-a43a-4f24-8600-9e8fb5b4d8a4}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="6">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.1" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.5" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.1" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="1" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="2"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="1" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="2" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{2296c342-131c-47dd-a5f3-3d062b82ee51}">
+          <rule key="{2296c342-131c-47dd-a5f3-3d062b82ee51}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.5" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="6">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.5" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.5" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="8" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="5"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}">
+          <rule key="{a58f40a9-df73-4719-aa04-2c30eaa03b8f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.6" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="6">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.6" fontSizeUnit="Point" fieldName="position" fontSize="6" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="8" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="5"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="8" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}">
+          <rule key="{46ca2a32-142f-49b9-a885-1f565c6f0b0f}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="position" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="8">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,0,255" shapeBorderWidth="0.4" shapeSizeX="0.2" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.2" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="3" shapeOffsetY="0" shapeOpacity="0.9" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="position" fontSize="8" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.4" shapeOpacity="0.9" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0.2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.2" shapeRadiiX="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="0" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="10"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="0" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -5631,165 +5633,165 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property value="false" key="labeling/addDirectionSymbol"/>
-        <property value="0" key="labeling/angleOffset"/>
-        <property value="0" key="labeling/blendMode"/>
-        <property value="0" key="labeling/bufferBlendMode"/>
-        <property value="255" key="labeling/bufferColorA"/>
-        <property value="255" key="labeling/bufferColorB"/>
-        <property value="255" key="labeling/bufferColorG"/>
-        <property value="255" key="labeling/bufferColorR"/>
-        <property value="false" key="labeling/bufferDraw"/>
-        <property value="64" key="labeling/bufferJoinStyle"/>
-        <property value="false" key="labeling/bufferNoFill"/>
-        <property value="1" key="labeling/bufferSize"/>
-        <property value="false" key="labeling/bufferSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/bufferSizeMapUnitScale"/>
-        <property value="0" key="labeling/bufferTransp"/>
-        <property value="false" key="labeling/centroidInside"/>
-        <property value="false" key="labeling/centroidWhole"/>
-        <property value="3" key="labeling/decimals"/>
-        <property value="false" key="labeling/displayAll"/>
-        <property value="0" key="labeling/dist"/>
-        <property value="false" key="labeling/distInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/distMapUnitScale"/>
-        <property value="false" key="labeling/drawLabels"/>
-        <property value="false" key="labeling/enabled"/>
-        <property value="position" key="labeling/fieldName"/>
-        <property value="false" key="labeling/fitInPolygonOnly"/>
-        <property value="0" key="labeling/fontCapitals"/>
-        <property value="Myriad Pro" key="labeling/fontFamily"/>
-        <property value="false" key="labeling/fontItalic"/>
-        <property value="0" key="labeling/fontLetterSpacing"/>
-        <property value="false" key="labeling/fontLimitPixelSize"/>
-        <property value="10000" key="labeling/fontMaxPixelSize"/>
-        <property value="3" key="labeling/fontMinPixelSize"/>
-        <property value="10" key="labeling/fontSize"/>
-        <property value="false" key="labeling/fontSizeInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/fontSizeMapUnitScale"/>
-        <property value="false" key="labeling/fontStrikeout"/>
-        <property value="false" key="labeling/fontUnderline"/>
-        <property value="63" key="labeling/fontWeight"/>
-        <property value="0" key="labeling/fontWordSpacing"/>
-        <property value="false" key="labeling/formatNumbers"/>
-        <property value="false" key="labeling/isExpression"/>
-        <property value="true" key="labeling/labelOffsetInMapUnits"/>
-        <property value="0,0,0,0,0,0" key="labeling/labelOffsetMapUnitScale"/>
-        <property value="false" key="labeling/labelPerPart"/>
-        <property value="&lt;" key="labeling/leftDirectionSymbol"/>
-        <property value="false" key="labeling/limitNumLabels"/>
-        <property value="20" key="labeling/maxCurvedCharAngleIn"/>
-        <property value="-20" key="labeling/maxCurvedCharAngleOut"/>
-        <property value="2000" key="labeling/maxNumLabels"/>
-        <property value="false" key="labeling/mergeLines"/>
-        <property value="0" key="labeling/minFeatureSize"/>
-        <property value="0" key="labeling/multilineAlign"/>
-        <property value="1" key="labeling/multilineHeight"/>
-        <property value="Semibold" key="labeling/namedStyle"/>
-        <property value="true" key="labeling/obstacle"/>
-        <property value="1" key="labeling/obstacleFactor"/>
-        <property value="0" key="labeling/obstacleType"/>
-        <property value="0" key="labeling/offsetType"/>
-        <property value="0" key="labeling/placeDirectionSymbol"/>
-        <property value="0" key="labeling/placement"/>
-        <property value="10" key="labeling/placementFlags"/>
-        <property value="false" key="labeling/plussign"/>
-        <property value="TR,TL,BR,BL,R,L,TSR,BSR" key="labeling/predefinedPositionOrder"/>
-        <property value="true" key="labeling/preserveRotation"/>
-        <property value="#ffffff" key="labeling/previewBkgrdColor"/>
-        <property value="5" key="labeling/priority"/>
-        <property value="4" key="labeling/quadOffset"/>
-        <property value="0" key="labeling/repeatDistance"/>
-        <property value="0,0,0,0,0,0" key="labeling/repeatDistanceMapUnitScale"/>
-        <property value="1" key="labeling/repeatDistanceUnit"/>
-        <property value="false" key="labeling/reverseDirectionSymbol"/>
-        <property value=">" key="labeling/rightDirectionSymbol"/>
-        <property value="10000000" key="labeling/scaleMax"/>
-        <property value="1" key="labeling/scaleMin"/>
-        <property value="false" key="labeling/scaleVisibility"/>
-        <property value="6" key="labeling/shadowBlendMode"/>
-        <property value="0" key="labeling/shadowColorB"/>
-        <property value="0" key="labeling/shadowColorG"/>
-        <property value="0" key="labeling/shadowColorR"/>
-        <property value="false" key="labeling/shadowDraw"/>
-        <property value="135" key="labeling/shadowOffsetAngle"/>
-        <property value="1" key="labeling/shadowOffsetDist"/>
-        <property value="true" key="labeling/shadowOffsetGlobal"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shadowOffsetUnits"/>
-        <property value="1.5" key="labeling/shadowRadius"/>
-        <property value="false" key="labeling/shadowRadiusAlphaOnly"/>
-        <property value="0,0,0,0,0,0" key="labeling/shadowRadiusMapUnitScale"/>
-        <property value="1" key="labeling/shadowRadiusUnits"/>
-        <property value="100" key="labeling/shadowScale"/>
-        <property value="30" key="labeling/shadowTransparency"/>
-        <property value="0" key="labeling/shadowUnder"/>
-        <property value="0" key="labeling/shapeBlendMode"/>
-        <property value="255" key="labeling/shapeBorderColorA"/>
-        <property value="128" key="labeling/shapeBorderColorB"/>
-        <property value="128" key="labeling/shapeBorderColorG"/>
-        <property value="128" key="labeling/shapeBorderColorR"/>
-        <property value="0" key="labeling/shapeBorderWidth"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeBorderWidthMapUnitScale"/>
-        <property value="1" key="labeling/shapeBorderWidthUnits"/>
-        <property value="true" key="labeling/shapeDraw"/>
-        <property value="255" key="labeling/shapeFillColorA"/>
-        <property value="138" key="labeling/shapeFillColorB"/>
-        <property value="0" key="labeling/shapeFillColorG"/>
-        <property value="101" key="labeling/shapeFillColorR"/>
-        <property value="64" key="labeling/shapeJoinStyle"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeOffsetMapUnitScale"/>
-        <property value="1" key="labeling/shapeOffsetUnits"/>
-        <property value="0" key="labeling/shapeOffsetX"/>
-        <property value="0" key="labeling/shapeOffsetY"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeRadiiMapUnitScale"/>
-        <property value="1" key="labeling/shapeRadiiUnits"/>
-        <property value="0" key="labeling/shapeRadiiX"/>
-        <property value="0" key="labeling/shapeRadiiY"/>
-        <property value="0" key="labeling/shapeRotation"/>
-        <property value="0" key="labeling/shapeRotationType"/>
-        <property value="" key="labeling/shapeSVGFile"/>
-        <property value="0,0,0,0,0,0" key="labeling/shapeSizeMapUnitScale"/>
-        <property value="0" key="labeling/shapeSizeType"/>
-        <property value="1" key="labeling/shapeSizeUnits"/>
-        <property value="0" key="labeling/shapeSizeX"/>
-        <property value="0" key="labeling/shapeSizeY"/>
-        <property value="0" key="labeling/shapeTransparency"/>
-        <property value="0" key="labeling/shapeType"/>
-        <property value="255" key="labeling/textColorA"/>
-        <property value="255" key="labeling/textColorB"/>
-        <property value="255" key="labeling/textColorG"/>
-        <property value="255" key="labeling/textColorR"/>
-        <property value="0" key="labeling/textTransp"/>
-        <property value="0" key="labeling/upsidedownLabels"/>
-        <property value="" key="labeling/wrapChar"/>
-        <property value="0" key="labeling/xOffset"/>
-        <property value="0" key="labeling/yOffset"/>
-        <property value="0" key="labeling/zIndex"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="labeling/addDirectionSymbol" value="false"/>
+        <property key="labeling/angleOffset" value="0"/>
+        <property key="labeling/blendMode" value="0"/>
+        <property key="labeling/bufferBlendMode" value="0"/>
+        <property key="labeling/bufferColorA" value="255"/>
+        <property key="labeling/bufferColorB" value="255"/>
+        <property key="labeling/bufferColorG" value="255"/>
+        <property key="labeling/bufferColorR" value="255"/>
+        <property key="labeling/bufferDraw" value="false"/>
+        <property key="labeling/bufferJoinStyle" value="64"/>
+        <property key="labeling/bufferNoFill" value="false"/>
+        <property key="labeling/bufferSize" value="1"/>
+        <property key="labeling/bufferSizeInMapUnits" value="false"/>
+        <property key="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/bufferTransp" value="0"/>
+        <property key="labeling/centroidInside" value="false"/>
+        <property key="labeling/centroidWhole" value="false"/>
+        <property key="labeling/decimals" value="3"/>
+        <property key="labeling/displayAll" value="false"/>
+        <property key="labeling/dist" value="0"/>
+        <property key="labeling/distInMapUnits" value="false"/>
+        <property key="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/drawLabels" value="false"/>
+        <property key="labeling/enabled" value="false"/>
+        <property key="labeling/fieldName" value="position"/>
+        <property key="labeling/fitInPolygonOnly" value="false"/>
+        <property key="labeling/fontCapitals" value="0"/>
+        <property key="labeling/fontFamily" value="Myriad Pro"/>
+        <property key="labeling/fontItalic" value="false"/>
+        <property key="labeling/fontLetterSpacing" value="0"/>
+        <property key="labeling/fontLimitPixelSize" value="false"/>
+        <property key="labeling/fontMaxPixelSize" value="10000"/>
+        <property key="labeling/fontMinPixelSize" value="3"/>
+        <property key="labeling/fontSize" value="10"/>
+        <property key="labeling/fontSizeInMapUnits" value="false"/>
+        <property key="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/fontStrikeout" value="false"/>
+        <property key="labeling/fontUnderline" value="false"/>
+        <property key="labeling/fontWeight" value="63"/>
+        <property key="labeling/fontWordSpacing" value="0"/>
+        <property key="labeling/formatNumbers" value="false"/>
+        <property key="labeling/isExpression" value="false"/>
+        <property key="labeling/labelOffsetInMapUnits" value="true"/>
+        <property key="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/labelPerPart" value="false"/>
+        <property key="labeling/leftDirectionSymbol" value="&lt;"/>
+        <property key="labeling/limitNumLabels" value="false"/>
+        <property key="labeling/maxCurvedCharAngleIn" value="20"/>
+        <property key="labeling/maxCurvedCharAngleOut" value="-20"/>
+        <property key="labeling/maxNumLabels" value="2000"/>
+        <property key="labeling/mergeLines" value="false"/>
+        <property key="labeling/minFeatureSize" value="0"/>
+        <property key="labeling/multilineAlign" value="0"/>
+        <property key="labeling/multilineHeight" value="1"/>
+        <property key="labeling/namedStyle" value="Semibold"/>
+        <property key="labeling/obstacle" value="true"/>
+        <property key="labeling/obstacleFactor" value="1"/>
+        <property key="labeling/obstacleType" value="0"/>
+        <property key="labeling/offsetType" value="0"/>
+        <property key="labeling/placeDirectionSymbol" value="0"/>
+        <property key="labeling/placement" value="0"/>
+        <property key="labeling/placementFlags" value="10"/>
+        <property key="labeling/plussign" value="false"/>
+        <property key="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+        <property key="labeling/preserveRotation" value="true"/>
+        <property key="labeling/previewBkgrdColor" value="#ffffff"/>
+        <property key="labeling/priority" value="5"/>
+        <property key="labeling/quadOffset" value="4"/>
+        <property key="labeling/repeatDistance" value="0"/>
+        <property key="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/repeatDistanceUnit" value="1"/>
+        <property key="labeling/reverseDirectionSymbol" value="false"/>
+        <property key="labeling/rightDirectionSymbol" value=">"/>
+        <property key="labeling/scaleMax" value="10000000"/>
+        <property key="labeling/scaleMin" value="1"/>
+        <property key="labeling/scaleVisibility" value="false"/>
+        <property key="labeling/shadowBlendMode" value="6"/>
+        <property key="labeling/shadowColorB" value="0"/>
+        <property key="labeling/shadowColorG" value="0"/>
+        <property key="labeling/shadowColorR" value="0"/>
+        <property key="labeling/shadowDraw" value="false"/>
+        <property key="labeling/shadowOffsetAngle" value="135"/>
+        <property key="labeling/shadowOffsetDist" value="1"/>
+        <property key="labeling/shadowOffsetGlobal" value="true"/>
+        <property key="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowOffsetUnits" value="1"/>
+        <property key="labeling/shadowRadius" value="1.5"/>
+        <property key="labeling/shadowRadiusAlphaOnly" value="false"/>
+        <property key="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shadowRadiusUnits" value="1"/>
+        <property key="labeling/shadowScale" value="100"/>
+        <property key="labeling/shadowTransparency" value="30"/>
+        <property key="labeling/shadowUnder" value="0"/>
+        <property key="labeling/shapeBlendMode" value="0"/>
+        <property key="labeling/shapeBorderColorA" value="255"/>
+        <property key="labeling/shapeBorderColorB" value="128"/>
+        <property key="labeling/shapeBorderColorG" value="128"/>
+        <property key="labeling/shapeBorderColorR" value="128"/>
+        <property key="labeling/shapeBorderWidth" value="0"/>
+        <property key="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeBorderWidthUnits" value="1"/>
+        <property key="labeling/shapeDraw" value="true"/>
+        <property key="labeling/shapeFillColorA" value="255"/>
+        <property key="labeling/shapeFillColorB" value="138"/>
+        <property key="labeling/shapeFillColorG" value="0"/>
+        <property key="labeling/shapeFillColorR" value="101"/>
+        <property key="labeling/shapeJoinStyle" value="64"/>
+        <property key="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeOffsetUnits" value="1"/>
+        <property key="labeling/shapeOffsetX" value="0"/>
+        <property key="labeling/shapeOffsetY" value="0"/>
+        <property key="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeRadiiUnits" value="1"/>
+        <property key="labeling/shapeRadiiX" value="0"/>
+        <property key="labeling/shapeRadiiY" value="0"/>
+        <property key="labeling/shapeRotation" value="0"/>
+        <property key="labeling/shapeRotationType" value="0"/>
+        <property key="labeling/shapeSVGFile" value=""/>
+        <property key="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+        <property key="labeling/shapeSizeType" value="0"/>
+        <property key="labeling/shapeSizeUnits" value="1"/>
+        <property key="labeling/shapeSizeX" value="0"/>
+        <property key="labeling/shapeSizeY" value="0"/>
+        <property key="labeling/shapeTransparency" value="0"/>
+        <property key="labeling/shapeType" value="0"/>
+        <property key="labeling/textColorA" value="255"/>
+        <property key="labeling/textColorB" value="255"/>
+        <property key="labeling/textColorG" value="255"/>
+        <property key="labeling/textColorR" value="255"/>
+        <property key="labeling/textTransp" value="0"/>
+        <property key="labeling/upsidedownLabels" value="0"/>
+        <property key="labeling/wrapChar" value=""/>
+        <property key="labeling/xOffset" value="0"/>
+        <property key="labeling/yOffset" value="0"/>
+        <property key="labeling/zIndex" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5798,8 +5800,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5808,8 +5810,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" name="IsMultiline" type="bool"/>
+                <Option value="false" name="UseHtml" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -5818,8 +5820,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" name="IsMultiline" type="bool"/>
+                <Option value="false" name="UseHtml" type="bool"/>
               </Option>
             </config>
           </editWidget>
@@ -5828,8 +5830,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5838,8 +5840,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5848,8 +5850,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5865,8 +5867,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5875,8 +5877,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -5918,92 +5920,92 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="oldpositio"/>
-        <alias name="" index="5" field="xyposition"/>
-        <alias name="" index="6" field="csv_positi"/>
-        <alias name="" index="7" field="csv_name"/>
-        <alias name="" index="8" field="csv_club"/>
-        <alias name="" index="9" field="csv_captai"/>
-        <alias name="" index="10" field="csv_capt_1"/>
-        <alias name="" index="11" field="csv_first_"/>
-        <alias name="" index="12" field="csv_last_r"/>
-        <alias name="" index="13" field="csv_instru"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="notes" index="3" name=""/>
+        <alias field="oldpositio" index="4" name=""/>
+        <alias field="xyposition" index="5" name=""/>
+        <alias field="csv_positi" index="6" name=""/>
+        <alias field="csv_name" index="7" name=""/>
+        <alias field="csv_club" index="8" name=""/>
+        <alias field="csv_captai" index="9" name=""/>
+        <alias field="csv_capt_1" index="10" name=""/>
+        <alias field="csv_first_" index="11" name=""/>
+        <alias field="csv_last_r" index="12" name=""/>
+        <alias field="csv_instru" index="13" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="oldpositio"/>
-        <default applyOnUpdate="0" expression="" field="xyposition"/>
-        <default applyOnUpdate="0" expression="" field="csv_positi"/>
-        <default applyOnUpdate="0" expression="" field="csv_name"/>
-        <default applyOnUpdate="0" expression="" field="csv_club"/>
-        <default applyOnUpdate="0" expression="" field="csv_captai"/>
-        <default applyOnUpdate="0" expression="" field="csv_capt_1"/>
-        <default applyOnUpdate="0" expression="" field="csv_first_"/>
-        <default applyOnUpdate="0" expression="" field="csv_last_r"/>
-        <default applyOnUpdate="0" expression="" field="csv_instru"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="notes" applyOnUpdate="0" expression=""/>
+        <default field="oldpositio" applyOnUpdate="0" expression=""/>
+        <default field="xyposition" applyOnUpdate="0" expression=""/>
+        <default field="csv_positi" applyOnUpdate="0" expression=""/>
+        <default field="csv_name" applyOnUpdate="0" expression=""/>
+        <default field="csv_club" applyOnUpdate="0" expression=""/>
+        <default field="csv_captai" applyOnUpdate="0" expression=""/>
+        <default field="csv_capt_1" applyOnUpdate="0" expression=""/>
+        <default field="csv_first_" applyOnUpdate="0" expression=""/>
+        <default field="csv_last_r" applyOnUpdate="0" expression=""/>
+        <default field="csv_instru" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="position"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="notes"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="oldpositio"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="xyposition"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_positi"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_club"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_captai"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_capt_1"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_first_"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_last_r"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="csv_instru"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="notes" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="oldpositio" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="xyposition" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_positi" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_club" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_captai" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_capt_1" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_first_" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_last_r" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_instru" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="notes"/>
-        <constraint desc="" exp="" field="oldpositio"/>
-        <constraint desc="" exp="" field="xyposition"/>
-        <constraint desc="" exp="" field="csv_positi"/>
-        <constraint desc="" exp="" field="csv_name"/>
-        <constraint desc="" exp="" field="csv_club"/>
-        <constraint desc="" exp="" field="csv_captai"/>
-        <constraint desc="" exp="" field="csv_capt_1"/>
-        <constraint desc="" exp="" field="csv_first_"/>
-        <constraint desc="" exp="" field="csv_last_r"/>
-        <constraint desc="" exp="" field="csv_instru"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="notes" exp="" desc=""/>
+        <constraint field="oldpositio" exp="" desc=""/>
+        <constraint field="xyposition" exp="" desc=""/>
+        <constraint field="csv_positi" exp="" desc=""/>
+        <constraint field="csv_name" exp="" desc=""/>
+        <constraint field="csv_club" exp="" desc=""/>
+        <constraint field="csv_captai" exp="" desc=""/>
+        <constraint field="csv_capt_1" exp="" desc=""/>
+        <constraint field="csv_first_" exp="" desc=""/>
+        <constraint field="csv_last_r" exp="" desc=""/>
+        <constraint field="csv_instru" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;csv_club&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;csv_club&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="notes" width="-1" hidden="0"/>
-          <column type="field" name="oldpositio" width="-1" hidden="0"/>
-          <column type="field" name="xyposition" width="-1" hidden="0"/>
-          <column type="field" name="csv_name" width="-1" hidden="0"/>
-          <column type="field" name="csv_club" width="-1" hidden="0"/>
-          <column type="field" name="csv_positi" width="-1" hidden="0"/>
-          <column type="field" name="csv_captai" width="-1" hidden="0"/>
-          <column type="field" name="csv_capt_1" width="-1" hidden="0"/>
-          <column type="field" name="csv_first_" width="-1" hidden="0"/>
-          <column type="field" name="csv_last_r" width="-1" hidden="0"/>
-          <column type="field" name="csv_instru" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="oldpositio" hidden="0" type="field"/>
+          <column width="-1" name="xyposition" hidden="0" type="field"/>
+          <column width="-1" name="csv_name" hidden="0" type="field"/>
+          <column width="-1" name="csv_club" hidden="0" type="field"/>
+          <column width="-1" name="csv_positi" hidden="0" type="field"/>
+          <column width="-1" name="csv_captai" hidden="0" type="field"/>
+          <column width="-1" name="csv_capt_1" hidden="0" type="field"/>
+          <column width="-1" name="csv_first_" hidden="0" type="field"/>
+          <column width="-1" name="csv_last_r" hidden="0" type="field"/>
+          <column width="-1" name="csv_instru" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6034,35 +6036,35 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="csv_10_distance"/>
@@ -6142,7 +6144,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" type="vector" wkbType="NoGeometry" autoRefreshTime="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" geometry="No geometry" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" type="vector" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -6189,11 +6191,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6221,12 +6223,12 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
       </flags>
       <customproperties>
-        <property value="first_name" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="first_name"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6235,8 +6237,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6259,8 +6261,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6269,8 +6271,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6279,8 +6281,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6289,8 +6291,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6299,8 +6301,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6316,8 +6318,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6345,87 +6347,87 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="position"/>
-        <alias name="" index="1" field="firstname"/>
-        <alias name="" index="2" field="surname"/>
-        <alias name="" index="3" field="name"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_phone"/>
-        <alias name="" index="9" field="races"/>
-        <alias name="" index="10" field="first_runner"/>
-        <alias name="" index="11" field="last_runner"/>
-        <alias name="" index="12" field="instructions"/>
+        <alias field="position" index="0" name=""/>
+        <alias field="firstname" index="1" name=""/>
+        <alias field="surname" index="2" name=""/>
+        <alias field="name" index="3" name=""/>
+        <alias field="club" index="4" name=""/>
+        <alias field="phone" index="5" name=""/>
+        <alias field="email" index="6" name=""/>
+        <alias field="captain" index="7" name=""/>
+        <alias field="captain_phone" index="8" name=""/>
+        <alias field="races" index="9" name=""/>
+        <alias field="first_runner" index="10" name=""/>
+        <alias field="last_runner" index="11" name=""/>
+        <alias field="instructions" index="12" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="firstname"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="firstname" applyOnUpdate="0" expression=""/>
+        <default field="surname" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="club" applyOnUpdate="0" expression=""/>
+        <default field="phone" applyOnUpdate="0" expression=""/>
+        <default field="email" applyOnUpdate="0" expression=""/>
+        <default field="captain" applyOnUpdate="0" expression=""/>
+        <default field="captain_phone" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="first_runner" applyOnUpdate="0" expression=""/>
+        <default field="last_runner" applyOnUpdate="0" expression=""/>
+        <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="position"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="firstname"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="surname"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="club"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="phone"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="email"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="captain"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="captain_phone"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="races"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="first_runner"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="last_runner"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="instructions"/>
+        <constraint notnull_strength="0" field="position" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="firstname" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="surname" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="club" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="phone" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="email" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain_phone" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_runner" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_runner" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="instructions" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="position"/>
-        <constraint desc="" exp="" field="firstname"/>
-        <constraint desc="" exp="" field="surname"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="club"/>
-        <constraint desc="" exp="" field="phone"/>
-        <constraint desc="" exp="" field="email"/>
-        <constraint desc="" exp="" field="captain"/>
-        <constraint desc="" exp="" field="captain_phone"/>
-        <constraint desc="" exp="" field="races"/>
-        <constraint desc="" exp="" field="first_runner"/>
-        <constraint desc="" exp="" field="last_runner"/>
-        <constraint desc="" exp="" field="instructions"/>
+        <constraint field="position" exp="" desc=""/>
+        <constraint field="firstname" exp="" desc=""/>
+        <constraint field="surname" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="club" exp="" desc=""/>
+        <constraint field="phone" exp="" desc=""/>
+        <constraint field="email" exp="" desc=""/>
+        <constraint field="captain" exp="" desc=""/>
+        <constraint field="captain_phone" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
+        <constraint field="first_runner" exp="" desc=""/>
+        <constraint field="last_runner" exp="" desc=""/>
+        <constraint field="instructions" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="club" width="-1" hidden="0"/>
-          <column type="field" name="phone" width="-1" hidden="0"/>
-          <column type="field" name="email" width="-1" hidden="0"/>
-          <column type="field" name="captain" width="-1" hidden="0"/>
-          <column type="field" name="races" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="first_runner" width="-1" hidden="0"/>
-          <column type="field" name="last_runner" width="-1" hidden="0"/>
-          <column type="field" name="instructions" width="-1" hidden="0"/>
-          <column type="field" name="firstname" width="-1" hidden="0"/>
-          <column type="field" name="surname" width="-1" hidden="0"/>
-          <column type="field" name="captain_phone" width="-1" hidden="0"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" name="races" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="firstname" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6456,23 +6458,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="10_distance"/>
@@ -6497,7 +6499,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -6550,11 +6552,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6581,70 +6583,70 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.75" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="name" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="8.5">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="64" bufferOpacity="0.6" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1.5"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.75" fontSizeUnit="Point" fieldName="name" fontSize="8.5" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="1" placementFlags="2" offsetType="0" offsetUnits="MapUnit"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_x" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_y" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="&quot;name&quot;" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="&quot;name&quot;"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6653,8 +6655,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6663,8 +6665,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6673,8 +6675,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6683,8 +6685,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6693,8 +6695,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6703,8 +6705,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6713,8 +6715,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6723,8 +6725,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -6733,75 +6735,75 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="osm_id" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="type" index="3" name=""/>
+        <alias field="z_order" index="4" name=""/>
+        <alias field="population" index="5" name=""/>
+        <alias field="label_x" index="6" name=""/>
+        <alias field="label_y" index="7" name=""/>
+        <alias field="label_rota" index="8" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="population" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="osm_id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="z_order"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="population"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_x"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_y"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_rota"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="population" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="population"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="population" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="field" name="population" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6832,15 +6834,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -6857,7 +6859,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -6910,11 +6912,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -6941,61 +6943,61 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="7">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="0.6" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="0.6" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="3" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="0" maxCurvedCharAngleIn="20" priority="3" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" yOffset="0" repeatDistanceUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="5" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="0.3" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="3" geometryGeneratorEnabled="0" repeatDistanceUnits="MapUnit" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="3" placementFlags="4" offsetType="0" offsetUnits="MapUnit"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.3" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="5" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="1" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="always_sho"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="always_sho" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="&quot;&quot;"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="&quot;&quot;" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_x" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="label_y" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="Priority" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="Show" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
@@ -7013,29 +7015,29 @@ def my_form_open(dialog, layer, feature):
           <value>COALESCE( "name", '&lt;NULL>' )</value>
           <value>COALESCE( "name", '&lt;NULL>' )</value>
         </property>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7044,8 +7046,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7054,8 +7056,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7099,8 +7101,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -7163,102 +7165,102 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
-        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
+        <alias field="osm_id" index="0" name=""/>
+        <alias field="name" index="1" name=""/>
+        <alias field="highway" index="2" name=""/>
+        <alias field="waterway" index="3" name=""/>
+        <alias field="aerialway" index="4" name=""/>
+        <alias field="barrier" index="5" name=""/>
+        <alias field="man_made" index="6" name=""/>
+        <alias field="z_order" index="7" name=""/>
+        <alias field="other_tags" index="8" name=""/>
+        <alias field="never_show" index="9" name=""/>
+        <alias field="label_x" index="10" name=""/>
+        <alias field="label_y" index="11" name=""/>
+        <alias field="label_rota" index="12" name=""/>
+        <alias field="always_sho" index="13" name=""/>
+        <alias field="resident_a" index="14" name=""/>
+        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="highway" applyOnUpdate="0" expression=""/>
+        <default field="waterway" applyOnUpdate="0" expression=""/>
+        <default field="aerialway" applyOnUpdate="0" expression=""/>
+        <default field="barrier" applyOnUpdate="0" expression=""/>
+        <default field="man_made" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="other_tags" applyOnUpdate="0" expression=""/>
+        <default field="never_show" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="always_sho" applyOnUpdate="0" expression=""/>
+        <default field="resident_a" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="osm_id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="highway"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="waterway"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="aerialway"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="barrier"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="man_made"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="z_order"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="other_tags"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="never_show"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_x"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_y"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label_rota"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="always_sho"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="resident_a"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_show"/>
+        <constraint notnull_strength="0" field="osm_id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="highway" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="waterway" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="aerialway" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="barrier" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="man_made" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="other_tags" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="never_show" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="always_sho" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="resident_a" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="osm_id"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="highway"/>
-        <constraint desc="" exp="" field="waterway"/>
-        <constraint desc="" exp="" field="aerialway"/>
-        <constraint desc="" exp="" field="barrier"/>
-        <constraint desc="" exp="" field="man_made"/>
-        <constraint desc="" exp="" field="z_order"/>
-        <constraint desc="" exp="" field="other_tags"/>
-        <constraint desc="" exp="" field="never_show"/>
-        <constraint desc="" exp="" field="label_x"/>
-        <constraint desc="" exp="" field="label_y"/>
-        <constraint desc="" exp="" field="label_rota"/>
-        <constraint desc="" exp="" field="always_sho"/>
-        <constraint desc="" exp="" field="resident_a"/>
-        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
+        <constraint field="osm_id" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="highway" exp="" desc=""/>
+        <constraint field="waterway" exp="" desc=""/>
+        <constraint field="aerialway" exp="" desc=""/>
+        <constraint field="barrier" exp="" desc=""/>
+        <constraint field="man_made" exp="" desc=""/>
+        <constraint field="z_order" exp="" desc=""/>
+        <constraint field="other_tags" exp="" desc=""/>
+        <constraint field="never_show" exp="" desc=""/>
+        <constraint field="label_x" exp="" desc=""/>
+        <constraint field="label_y" exp="" desc=""/>
+        <constraint field="label_rota" exp="" desc=""/>
+        <constraint field="always_sho" exp="" desc=""/>
+        <constraint field="resident_a" exp="" desc=""/>
+        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;resident_a&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;resident_a&quot;">
         <columns>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="highway" width="-1" hidden="0"/>
-          <column type="field" name="waterway" width="-1" hidden="0"/>
-          <column type="field" name="aerialway" width="-1" hidden="0"/>
-          <column type="field" name="barrier" width="-1" hidden="0"/>
-          <column type="field" name="man_made" width="-1" hidden="0"/>
-          <column type="field" name="other_tags" width="-1" hidden="0"/>
-          <column type="field" name="never_show" width="-1" hidden="0"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
-          <column type="field" name="always_sho" width="-1" hidden="0"/>
-          <column type="field" name="resident_a" width="-1" hidden="0"/>
-          <column type="field" name="auxiliary_storage_labeling_show" width="-1" hidden="0"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="-1" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7289,40 +7291,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="aerialway"/>
@@ -7407,7 +7409,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -7460,11 +7462,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7488,299 +7490,299 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
+          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
+          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
+          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
+          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="round" k="joinstyle"/>
-              <prop v="star" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.5" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="round"/>
+              <prop k="name" v="star"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.5"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,32,80,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="amenity/amenity_toilets.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,32,80,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="amenity/amenity_toilets.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/gym-bag.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/gym-bag.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="125,139,143,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="../images/road_closure.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="125,139,143,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="../images/road_closure.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="0,12,254,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/transport_bus_stop.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="5" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,12,254,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/transport_bus_stop.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="255,255,255,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="5"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="outerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
                 <effect type="drawSource">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="1" k="enabled"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="1"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerShadow">
-                  <prop v="13" k="blend_mode"/>
-                  <prop v="2.645" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,0,255" k="color"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="135" k="offset_angle"/>
-                  <prop v="2" k="offset_distance"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-                  <prop v="1" k="opacity"/>
+                  <prop k="blend_mode" v="13"/>
+                  <prop k="blur_level" v="2.645"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="offset_angle" v="135"/>
+                  <prop k="offset_distance" v="2"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="opacity" v="1"/>
                 </effect>
                 <effect type="innerGlow">
-                  <prop v="0" k="blend_mode"/>
-                  <prop v="0.7935" k="blur_level"/>
-                  <prop v="MM" k="blur_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-                  <prop v="0,0,255,255" k="color1"/>
-                  <prop v="0,255,0,255" k="color2"/>
-                  <prop v="0" k="color_type"/>
-                  <prop v="0" k="discrete"/>
-                  <prop v="2" k="draw_mode"/>
-                  <prop v="0" k="enabled"/>
-                  <prop v="0.5" k="opacity"/>
-                  <prop v="gradient" k="rampType"/>
-                  <prop v="255,255,255,255" k="single_color"/>
-                  <prop v="2" k="spread"/>
-                  <prop v="MM" k="spread_unit"/>
-                  <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+                  <prop k="blend_mode" v="0"/>
+                  <prop k="blur_level" v="0.7935"/>
+                  <prop k="blur_unit" v="MM"/>
+                  <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="color1" v="0,0,255,255"/>
+                  <prop k="color2" v="0,255,0,255"/>
+                  <prop k="color_type" v="0"/>
+                  <prop k="discrete" v="0"/>
+                  <prop k="draw_mode" v="2"/>
+                  <prop k="enabled" v="0"/>
+                  <prop k="opacity" v="0.5"/>
+                  <prop k="rampType" v="gradient"/>
+                  <prop k="single_color" v="255,255,255,255"/>
+                  <prop k="spread" v="2"/>
+                  <prop k="spread_unit" v="MM"/>
+                  <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" force_rhr="0">
-            <layer class="SvgMarker" enabled="1" pass="0" locked="0">
-              <prop v="0" k="angle"/>
-              <prop v="43,153,41,255" k="color"/>
-              <prop v="0" k="fixedAspectRatio"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="transport/amenity=parking.svg" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="5" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="43,153,41,255"/>
+              <prop k="fixedAspectRatio" v="0"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="name" v="transport/amenity=parking.svg"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="6"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7789,65 +7791,65 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="name" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Semibold" fontSize="10">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="0.8" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="2"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="2" shapeRadiiY="2" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="0.7" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="name" fontSize="10" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="0.8" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="0.7" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="2" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="2" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="2" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="2" dist="3" maxCurvedCharAngleIn="25" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="3" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="10"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="3" yOffset="3" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="10" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="2"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="2" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7882,42 +7884,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="distance"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="name"/>
-        <constraint desc="" exp="" field="distance"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="name" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7948,10 +7950,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="distance"/>
@@ -7963,595 +7965,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
-      <extent>
-        <xmin>18.37564676953091336</xmin>
-        <ymin>-33.94557435997037231</ymin>
-        <xmax>18.41958021754603791</xmax>
-        <ymax>-33.90046742091590914</ymax>
-      </extent>
-      <id>proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;index=yes&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=length_km:Real(10,10)&amp;field=Source:String(20,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route markers</layername>
-      <srs>
-        <spatialrefsys>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>WGS84</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
-      <provider encoding="UTF-8">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="nullSymbol"/>
-      <labeling type="rule-based">
-        <rules key="{221a1642-6e3c-4f39-bb33-a3e2d5fd68bc}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{e8acadf6-cecd-4d6b-8f98-05d691116778}">
-            <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active" active="0" key="{61d3ed28-6049-49a9-ade6-00e281e9218f}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" key="{ea0f4b42-ff8f-4d75-a2af-7472461c25fd}">
-              <settings>
-                <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="210,32,39,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                  <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                  <substitutions/>
-                </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-              </settings>
-            </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" key="{08a26428-d667-4e19-be4b-d866760ee1c4}">
-              <settings>
-                <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="103,34,144,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                  <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                  <substitutions/>
-                </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-              </settings>
-            </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" description="5KM" key="{4017648a-e8e0-4246-b2ce-9c9b91a36b2f}">
-              <settings>
-                <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Semibold" fontSize="10">
-                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="145,211,55,255" shapeBorderWidth="1" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                  <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                  <substitutions/>
-                </text-style>
-                <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-                <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="4" dist="2" maxCurvedCharAngleIn="20" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-                <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-              </settings>
-            </rule>
-          </rule>
-          <rule description="Always Show" key="{e5511335-5f7c-4b02-8678-edc87ff82a4e}">
-            <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" namedStyle="Regular" fontSize="7">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="64" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeSizeX="0.5" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0.1" shapeRadiiY="1" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
-                <substitutions/>
-              </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="6" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="3" dist="3" maxCurvedCharAngleIn="20" priority="4" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.8" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value=""/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-            </settings>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="100000" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration>
-        <field name="Name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="Distance"/>
-        <alias name="" index="6" field="RouteLen"/>
-        <alias name="" index="7" field="length_km"/>
-        <alias name="" index="8" field="Source"/>
-        <alias name="" index="9" field="org_fid"/>
-        <alias name="" index="10" field="distance"/>
-      </aliases>
-      <excludeAttributesWMS/>
-      <excludeAttributesWFS/>
-      <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-      </defaults>
-      <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Name"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="descriptio"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="timestamp"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="begin"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="end"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Distance"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="RouteLen"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="length_km"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Source"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="org_fid"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="distance"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint desc="" exp="" field="Name"/>
-        <constraint desc="" exp="" field="descriptio"/>
-        <constraint desc="" exp="" field="timestamp"/>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="end"/>
-        <constraint desc="" exp="" field="Distance"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="length_km"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="org_fid"/>
-        <constraint desc="" exp="" field="distance"/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;distance&quot;">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
-      </editable>
-      <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
-      </labelOnTop>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
-    </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -8595,7 +8009,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -8615,75 +8029,75 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="LinePatternFill" enabled="1" pass="0" locked="0">
-              <prop v="135" k="angle"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="2" k="distance"/>
-              <prop v="3x:0,0,0,0,0,0" k="distance_map_unit_scale"/>
-              <prop v="MM" k="distance_unit"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="line_width_map_unit_scale"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
+              <prop k="angle" v="135"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="distance" v="2"/>
+              <prop k="distance_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="distance_unit" v="MM"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                  <prop v="square" k="capstyle"/>
-                  <prop v="5;2" k="customdash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                  <prop v="MM" k="customdash_unit"/>
-                  <prop v="0" k="draw_inside_polygon"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="211,134,33,255" k="line_color"/>
-                  <prop v="solid" k="line_style"/>
-                  <prop v="0.3" k="line_width"/>
-                  <prop v="MM" k="line_width_unit"/>
-                  <prop v="0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0" k="ring_filter"/>
-                  <prop v="0" k="use_custom_dash"/>
-                  <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <symbol name="@0@0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                  <prop k="capstyle" v="square"/>
+                  <prop k="customdash" v="5;2"/>
+                  <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="customdash_unit" v="MM"/>
+                  <prop k="draw_inside_polygon" v="0"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="line_color" v="211,134,33,255"/>
+                  <prop k="line_style" v="solid"/>
+                  <prop k="line_width" v="0.3"/>
+                  <prop k="line_width_unit" v="MM"/>
+                  <prop k="offset" v="0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="ring_filter" v="0"/>
+                  <prop k="use_custom_dash" v="0"/>
+                  <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="211,134,33,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.46" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="no" k="style"/>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="211,134,33,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.46"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8693,30 +8107,30 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="1" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8730,28 +8144,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="FID"/>
+        <alias field="FID" index="0" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="FID"/>
+        <constraint notnull_strength="0" field="FID" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="FID"/>
+        <constraint field="FID" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="431" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8782,8 +8196,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -8793,7 +8207,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Line" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiLineString" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -8846,11 +8260,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8874,348 +8288,348 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" filter="&quot;status&quot; = 'open'"/>
+          <rule symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" filter="&quot;status&quot; = 'one-way'"/>
+          <rule symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" force_rhr="0">
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+          <symbol name="1" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="2"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,255,255,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,255,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0.5" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="1" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,255,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,255,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0.5"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="1"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" name="name" type="QString"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="2;1;1;1" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash dot dot" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="2" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="2;1;1;1"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash dot dot"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="3;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="dash" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="3" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="3;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,255,0,255"/>
+              <prop k="line_style" v="dash"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="1"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" enabled="1" pass="0" locked="0">
-              <prop v="4" k="average_angle_length"/>
-              <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-              <prop v="MM" k="average_angle_unit"/>
-              <prop v="250" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MapUnit" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="25" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="250"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MapUnit"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="25"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MapUnit"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" force_rhr="0">
-                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="0,255,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="filled_arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,0" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="3.5" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+              <symbol name="@3@1" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,255,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="3.5"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option value="" name="name" type="QString"/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option value="false" name="active" type="bool"/>
+                          <Option value="1" name="type" type="int"/>
+                          <Option value="" name="val" type="QString"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.75" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+          <symbol name="4" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.75"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9224,49 +8638,49 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings>
-          <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="1" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="times" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" namedStyle="Regular" fontSize="9">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-            <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+          <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="times" fontSize="9" blendMode="0" textColor="0,0,0,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+            <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1"/>
+            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
             <substitutions/>
           </text-style>
-          <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-          <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="2" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="0" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-          <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2000" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+          <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+          <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="5" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+          <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dd_properties>
         </settings>
       </labeling>
       <customproperties>
-        <property value="id" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="id"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" style="0"/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="2" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9301,42 +8715,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" field="times"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="status" applyOnUpdate="0" expression=""/>
+        <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="type"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="status"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="times"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="status" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="times" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="type"/>
-        <constraint desc="" exp="" field="status"/>
-        <constraint desc="" exp="" field="times"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="type" exp="" desc=""/>
+        <constraint field="status" exp="" desc=""/>
+        <constraint field="times" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="202" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="status" width="-1" hidden="0"/>
-          <column type="field" name="times" width="-1" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9367,10 +8781,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -9382,7 +8796,592 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="0" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="100000" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
+      <extent>
+        <xmin>18.37564632736778236</xmin>
+        <ymin>-33.94557692503335744</ymin>
+        <xmax>18.41938719291285409</xmax>
+        <ymax>-33.90033791158612075</ymax>
+      </extent>
+      <id>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:Integer64(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>route markers</layername>
+      <srs>
+        <spatialrefsys>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>WGS84</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="UTF-8">memory</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <legend type="default-vector"/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+      </flags>
+      <renderer-v2 type="nullSymbol"/>
+      <labeling type="rule-based">
+        <rules key="{ef0a4f1c-3683-401e-af50-096e9c122ec2}">
+          <rule key="{89ce512c-f4b6-4593-abdd-e1496b39d38d}" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <settings>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <substitutions/>
+              </text-style>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="quadrant" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="rotation" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                  </Option>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </dd_properties>
+            </settings>
+          </rule>
+          <rule key="{c8fa4d70-045a-495e-8ee0-9e8348c14c1f}" description="List for legends" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule key="{5cc2708e-64e0-43b4-ba64-8c4ce9774fe9}" description="21KM" active="0" filter="&quot;Source&quot; = '21KM'">
+              <settings>
+                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                  <substitutions/>
+                </text-style>
+                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" name="name" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option value="true" name="active" type="bool"/>
+                        <Option value="quadrant" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="rotation" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                    </Option>
+                    <Option value="collection" name="type" type="QString"/>
+                  </Option>
+                </dd_properties>
+              </settings>
+            </rule>
+            <rule key="{159ba16a-95ba-44ad-b846-c28bc7694004}" description="10KM" active="0" filter="&quot;Source&quot; = '10KM'">
+              <settings>
+                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                  <substitutions/>
+                </text-style>
+                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" name="name" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option value="true" name="active" type="bool"/>
+                        <Option value="quadrant" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="rotation" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                    </Option>
+                    <Option value="collection" name="type" type="QString"/>
+                  </Option>
+                </dd_properties>
+              </settings>
+            </rule>
+            <rule key="{4b0221e3-9f99-4b44-b4ff-a02ed7189f03}" description="5KM" active="0" filter="&quot;Source&quot; = '5KM'">
+              <settings>
+                <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                  <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                  <substitutions/>
+                </text-style>
+                <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+                <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="2" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+                <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" name="name" type="QString"/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="1" name="type" type="int"/>
+                        <Option value="" name="val" type="QString"/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option value="true" name="active" type="bool"/>
+                        <Option value="quadrant" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option value="false" name="active" type="bool"/>
+                        <Option value="rotation" name="field" type="QString"/>
+                        <Option value="2" name="type" type="int"/>
+                      </Option>
+                    </Option>
+                    <Option value="collection" name="type" type="QString"/>
+                  </Option>
+                </dd_properties>
+              </settings>
+            </rule>
+          </rule>
+          <rule key="{8cbbbde3-7d35-4f80-89e2-32d6f85fe1dc}" description="Always Show" active="0">
+            <settings>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Regular" fontWeight="50" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="1" fontSizeUnit="Point" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="7" blendMode="0" textColor="255,255,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="1" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="1" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.5" shapeRadiiX="0.1" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
+                <substitutions/>
+              </text-style>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0" wrapChar="" decimals="0"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="6" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" geometryGenerator="" dist="3" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="4" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.8" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="rotation" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
+                    </Option>
+                  </Option>
+                  <Option value="collection" name="type" type="QString"/>
+                </Option>
+              </dd_properties>
+            </settings>
+          </rule>
+        </rules>
+      </labeling>
+      <customproperties>
+        <property key="dualview/previewExpressions" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
+        <properties>
+          <Option type="Map">
+            <Option value="" name="name" type="QString"/>
+            <Option name="properties"/>
+            <Option value="collection" name="type" type="QString"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <fieldConfiguration>
+        <field name="Name">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="descriptio">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="timestamp">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="begin">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="end">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Distance">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="RouteLen">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="length_m" index="8" name=""/>
+        <alias field="length_km" index="9" name=""/>
+        <alias field="org_fid" index="10" name=""/>
+        <alias field="distance" index="11" name=""/>
+      </aliases>
+      <excludeAttributesWMS/>
+      <excludeAttributesWFS/>
+      <defaults>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+      </defaults>
+      <constraints>
+        <constraint notnull_strength="0" field="Name" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="org_fid" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" constraints="0" unique_strength="0" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="descriptio" exp="" desc=""/>
+        <constraint field="timestamp" exp="" desc=""/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="end" exp="" desc=""/>
+        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="org_fid" exp="" desc=""/>
+        <constraint field="distance" exp="" desc=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;distance&quot;">
+        <columns>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath>.</editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
+      </editable>
+      <labelOnTop>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
+      </labelOnTop>
+      <widgets/>
+      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+      <mapTip>Text</mapTip>
+    </maplayer>
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -9426,7 +9425,7 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent/>
@@ -9446,26 +9445,26 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="114,155,111,255" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="114,155,111,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9475,14 +9474,14 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="&quot;id&quot;" key="dualview/previewExpressions"/>
+        <property key="dualview/previewExpressions" value="&quot;id&quot;"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -9510,37 +9509,37 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="area"/>
-        <alias name="" index="2" field="rotation"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="area" index="1" name=""/>
+        <alias field="rotation" index="2" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" field="rotation"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="area" applyOnUpdate="0" expression=""/>
+        <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="area"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="rotation"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="area" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="rotation" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="area"/>
-        <constraint desc="" exp="" field="rotation"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="area" exp="" desc=""/>
+        <constraint field="rotation" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="area" width="-1" hidden="0"/>
-          <column type="field" name="rotation" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9560,7 +9559,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyLocal="1" type="vector" simplifyDrawingHints="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Point" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" wkbType="Point" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37527697005977245</xmin>
         <ymin>-33.94584879231483399</ymin>
@@ -9613,11 +9612,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>true</geographicflag>
+            <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9641,47 +9640,47 @@ def my_form_open(dialog, layer, feature):
         <Removable>1</Removable>
         <Searchable>1</Searchable>
       </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" enableorderby="0" symbollevels="0">
+      <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleMarker" enabled="1" pass="0" locked="1">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,0" k="outline_color"/>
-              <prop v="no" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="0.35" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
+          <symbol name="0" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,0"/>
+              <prop k="outline_style" v="no"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="0.35"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="size" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9692,46 +9691,46 @@ def my_form_open(dialog, layer, feature):
         <rules key="{8209fadf-9c49-4b02-955b-00e6176ca6e7}">
           <rule key="{19b7fab2-9e40-4733-8ee6-00027ba6a037}">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.8" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" isExpression="1" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,255,255" namedStyle="Semibold" fontSize="9">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0.2" shapeSizeX="1" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderColor="0,0,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Semibold" fontWeight="63" useSubstitutions="0" fontItalic="0" isExpression="1" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.8" fontSizeUnit="Point" fieldName="IF(&quot;Distance&quot; IS attribute( @atlas_feature, 'Distance' ), display, '')" fontSize="9" blendMode="0" textColor="0,0,255,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.2" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,255,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="1" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="17" plussign="0" multilineAlign="2" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="LineGeometry" centroidInside="0" offsetType="0" preserveRotation="0" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="0" placement="0" centroidWhole="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" quadOffset="4" dist="0" maxCurvedCharAngleIn="25" priority="10" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontMinPixelSize="3" scaleMax="0" drawLabels="1" upsidedownLabels="0" scaleMin="0" obstacleType="0" displayAll="1" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="2" scaleVisibility="0" labelPerPart="0" zIndex="0"/>
+              <text-format formatNumbers="0" autoWrapLength="17" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="2" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="LineGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" priority="10" placementFlags="10" offsetType="0" offsetUnits="MM"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="0" scaleVisibility="0" scaleMin="0" minFeatureSize="0" maxNumLabels="2" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option value="" name="name" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="1" name="type" type="int"/>
+                      <Option value="" name="val" type="QString"/>
                     </Option>
-                    <Option type="Map" name="Hali">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="'Center'"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Hali" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="'Center'" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value=""/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value=""/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option value="false" name="active" type="bool"/>
+                      <Option value="" name="field" type="QString"/>
+                      <Option value="2" name="type" type="int"/>
                     </Option>
-                    <Option type="Map" name="Vali">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="'Half'"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Vali" type="Map">
+                      <Option value="true" name="active" type="bool"/>
+                      <Option value="'Half'" name="expression" type="QString"/>
+                      <Option value="3" name="type" type="int"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -9739,30 +9738,30 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9771,8 +9770,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9781,8 +9780,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9791,8 +9790,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -9820,66 +9819,66 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="begin"/>
-        <alias name="" index="1" field="RouteLen"/>
-        <alias name="" index="2" field="Source"/>
-        <alias name="" index="3" field="distance_1"/>
-        <alias name="" index="4" field="first_run"/>
-        <alias name="" index="5" field="last_run"/>
+        <alias field="begin" index="0" name=""/>
+        <alias field="RouteLen" index="1" name=""/>
+        <alias field="Source" index="2" name=""/>
+        <alias field="distance_1" index="3" name=""/>
+        <alias field="first_run" index="4" name=""/>
+        <alias field="last_run" index="5" name=""/>
       </aliases>
       <excludeAttributesWMS>
         <attribute>Source</attribute>
-        <attribute>last_run</attribute>
-        <attribute>first_run</attribute>
         <attribute>distance_1</attribute>
-        <attribute>RouteLen</attribute>
+        <attribute>first_run</attribute>
+        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>RouteLen</attribute>
       </excludeAttributesWMS>
       <excludeAttributesWFS>
         <attribute>Source</attribute>
-        <attribute>last_run</attribute>
-        <attribute>first_run</attribute>
         <attribute>distance_1</attribute>
-        <attribute>RouteLen</attribute>
+        <attribute>first_run</attribute>
+        <attribute>last_run</attribute>
         <attribute>begin</attribute>
+        <attribute>RouteLen</attribute>
       </excludeAttributesWFS>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="distance_1"/>
-        <default applyOnUpdate="0" expression="" field="first_run"/>
-        <default applyOnUpdate="0" expression="" field="last_run"/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="distance_1" applyOnUpdate="0" expression=""/>
+        <default field="first_run" applyOnUpdate="0" expression=""/>
+        <default field="last_run" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="begin"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="RouteLen"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="Source"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="distance_1"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="first_run"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="last_run"/>
+        <constraint notnull_strength="0" field="begin" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance_1" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_run" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_run" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="begin"/>
-        <constraint desc="" exp="" field="RouteLen"/>
-        <constraint desc="" exp="" field="Source"/>
-        <constraint desc="" exp="" field="distance_1"/>
-        <constraint desc="" exp="" field="first_run"/>
-        <constraint desc="" exp="" field="last_run"/>
+        <constraint field="begin" exp="" desc=""/>
+        <constraint field="RouteLen" exp="" desc=""/>
+        <constraint field="Source" exp="" desc=""/>
+        <constraint field="distance_1" exp="" desc=""/>
+        <constraint field="first_run" exp="" desc=""/>
+        <constraint field="last_run" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;last_run&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;last_run&quot;">
         <columns>
-          <column type="field" name="begin" width="179" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="distance_1" width="-1" hidden="0"/>
-          <column type="field" name="first_run" width="191" hidden="0"/>
-          <column type="field" name="last_run" width="174" hidden="0"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="distance_1" hidden="0" type="field"/>
+          <column width="191" name="first_run" hidden="0" type="field"/>
+          <column width="174" name="last_run" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9910,30 +9909,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -9965,7 +9964,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyLocal="1" type="vector" simplifyDrawingHints="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" autoRefreshEnabled="0" minScale="1e+08" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="0" simplifyDrawingTol="1" autoRefreshTime="0" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" refreshOnNotifyMessage="">
+    <maplayer maxScale="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" simplifyLocal="1" readOnly="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" wkbType="MultiPolygon" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -10018,11 +10017,11 @@ def my_form_open(dialog, layer, feature):
             <description></description>
             <projectionacronym></projectionacronym>
             <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
+            <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" minx="0" dimensions="2" miny="0" crs="" maxx="0" maxz="0" maxy="0"/>
+          <spatial minx="0" maxx="0" dimensions="2" maxy="0" miny="0" maxz="0" crs="" minz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10049,22 +10048,22 @@ def my_form_open(dialog, layer, feature):
       <renderer-v2 type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}">
+          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings>
-              <text-style fontFamily="Myriad Pro" fontStrikeout="0" fontCapitals="0" textOpacity="0.9" fontSizeUnit="Point" useSubstitutions="0" fontWordSpacing="0" blendMode="0" fieldName="label" isExpression="0" previewBkgrdColor="#ffffff" fontItalic="0" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" fontWeight="75" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="31,120,180,255" namedStyle="Bold" fontSize="8">
-                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="0.4" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferSize="0.75"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRotationType="0" shapeFillColor="255,255,255,204" shapeBorderWidth="0.75" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.3" shapeBorderColor="31,120,206,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="-0.15" shapeOpacity="0.6" shapeRotation="0" shapeSizeType="0"/>
-                <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+              <text-style previewBkgrdColor="#ffffff" namedStyle="Bold" fontWeight="75" useSubstitutions="0" fontItalic="0" isExpression="0" fontFamily="Myriad Pro" fontLetterSpacing="0" fontCapitals="0" fontStrikeout="0" textOpacity="0.9" fontSizeUnit="Point" fieldName="label" fontSize="8" blendMode="0" textColor="31,120,180,255" fontUnderline="0" multilineHeight="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0">
+                <text-buffer bufferOpacity="0.4" bufferNoFill="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75"/>
+                <background shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0.75" shapeOpacity="0.6" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="-0.15" shapeSizeY="0.3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="1" shapeRotationType="0" shapeSizeX="0.75" shapeRadiiX="0.5" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                 <substitutions/>
               </text-style>
-              <text-format formatNumbers="0" autoWrapLength="0" plussign="0" multilineAlign="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar=""/>
-              <placement distUnits="MM" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0" preserveRotation="1" rotationAngle="0" geometryGeneratorEnabled="0" xOffset="1" placement="0" centroidWhole="1" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" quadOffset="1" dist="0" maxCurvedCharAngleIn="25" priority="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" yOffset="0" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0"/>
-              <rendering minFeatureSize="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.76" fontMinPixelSize="3" scaleMax="10000000" drawLabels="1" upsidedownLabels="0" scaleMin="1" obstacleType="0" displayAll="0" obstacle="1" fontLimitPixelSize="0" limitNumLabels="0" maxNumLabels="6" scaleVisibility="0" labelPerPart="0" zIndex="5"/>
+              <text-format formatNumbers="0" autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0" wrapChar="" decimals="3"/>
+              <placement centroidInside="0" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" placement="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" quadOffset="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleIn="25" geometryGenerator="" dist="0" yOffset="0" geometryGeneratorType="PointGeometry" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" priority="5" placementFlags="10" offsetType="0" offsetUnits="MapUnit"/>
+              <rendering labelPerPart="0" obstacleType="0" scaleMax="10000000" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76" upsidedownLabels="0" obstacle="1" fontMaxPixelSize="10000" zIndex="5" scaleVisibility="0" scaleMin="1" minFeatureSize="0" maxNumLabels="6" fontLimitPixelSize="0" fontMinPixelSize="3" mergeLines="0" displayAll="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </dd_properties>
             </settings>
@@ -10072,30 +10071,30 @@ def my_form_open(dialog, layer, feature):
         </rules>
       </labeling>
       <customproperties>
-        <property value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" opacity="1" scaleBasedVisibility="0" sizeType="MM" backgroundColor="#ffffff" width="15" diagramOrientation="Up" minScaleDenominator="0" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penColor="#000000" rotationOffset="270" barWidth="5" penWidth="0" scaleDependency="Area" minimumSize="0" enabled="0" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" height="15">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory minimumSize="0" height="15" width="15" penWidth="0" labelPlacementMethod="XHeight" diagramOrientation="Up" penAlpha="255" scaleDependency="Area" penColor="#000000" backgroundAlpha="255" scaleBasedVisibility="0" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" opacity="1" barWidth="5" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" lineSizeType="MM">
+          <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" obstacle="0" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" priority="0" dist="0" placement="0" obstacle="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" name="name" type="QString"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" name="type" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10104,8 +10103,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10114,8 +10113,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10124,8 +10123,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" name="IsMultiline" type="QString"/>
+                <Option value="0" name="UseHtml" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -10139,42 +10138,42 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
-        <alias name="" index="3" field="races"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="table_set" index="1" name=""/>
+        <alias field="label" index="2" name=""/>
+        <alias field="races" index="3" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="table_set" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="id"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="table_set"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="label"/>
-        <constraint constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0" field="races"/>
+        <constraint notnull_strength="0" field="id" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="table_set" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label" constraints="0" unique_strength="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="races" constraints="0" unique_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" exp="" field="id"/>
-        <constraint desc="" exp="" field="table_set"/>
-        <constraint desc="" exp="" field="label"/>
-        <constraint desc="" exp="" field="races"/>
+        <constraint field="id" exp="" desc=""/>
+        <constraint field="table_set" exp="" desc=""/>
+        <constraint field="label" exp="" desc=""/>
+        <constraint field="races" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="table_set" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="field" name="races" width="130" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10205,10 +10204,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -10240,9 +10239,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
     <layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
     <layer id="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1"/>
-    <layer id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
     <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
     <layer id="timelapse_1e9371ed_fd46_407b_8e2a_21ea46053bfe"/>
+    <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -10418,7 +10417,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/Ask Me/20191010 - Gun Run 2019 - Start Directions rev 1.1.png</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/GunRunMaps/GIS Base Map/Fencing/20191011 - Gun Run 2019 - Fencing rev 2.3.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -10559,255 +10558,248 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="All Routes">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" style="default" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <expanded-legend-nodes id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="default" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="extra_security20170921130834191"/>
-      <expanded-legend-nodes id="extra_security20170921130834191"/>
-      <layer expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="extra_security20170921130834191"/>
+      <expanded-legend-nodes id="extra_security20170921130834191"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal overview">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Proposed Routes">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" style="default" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <expanded-legend-nodes id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Routes">
-      <layer expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" style="default" id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <expanded-legend-nodes id="proposed_route_markers_dacf77cd_ac2e_48aa_8ece_370fcbde67fa"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-group-nodes>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -10834,215 +10826,215 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="Routes" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" position="0,0,mm" type="65638" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="[%&quot;Distance&quot;%]" type="65641" positionOnPage="9.44946,191.611,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" valign="64" htmlState="0" zValue="9" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="14.1764,7.471,mm" position="9.44946,191.611,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" position="9.44946,191.611,mm" type="65641" valign="64" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%&quot;Distance&quot;%]" excludeFromExports="0" positionOnPage="9.44946,191.611,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="RACE ROUTE" type="65641" positionOnPage="24.2445,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="0" frameJoinStyle="miter" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" valign="64" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="29.2025,7.272,mm" position="24.2445,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" position="24.2445,191.81,mm" type="65641" valign="64" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="RACE ROUTE" excludeFromExports="0" positionOnPage="24.2445,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 3.0" type="65641" positionOnPage="204.225,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" valign="64" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="57.4836,6.8714,mm" position="204.225,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 3.0" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="210.038,199.082,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="210.038,199.082,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="17.4074" itemRotation="0" resizeMode="0" type="65640" positionOnPage="262.196,188.218,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="29.7523" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" size="29.7523,17.4718,mm" position="262.196,188.218,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="9.59946,198.832,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" zValue="3" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="251.959,0.1,mm" position="9.59946,198.832,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" position="9.59946,198.832,mm" type="65643" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.86559,4.09761,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" labelMargin="0,mm" zValue="2" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="67.7828,166.874,mm" position="5.86559,4.09761,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11056,102 +11048,102 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="9.44946,9.08557,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" outlineWidthM="0.15,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="282.012,175.592,mm" position="9.44946,9.08557,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816223928584" xmax="18.42303507276718832"/>
+        <Extent xmax="18.42303507276714569" ymin="-33.92999999999999972" ymax="-33.89697816223931426" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -11165,123 +11157,123 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas sortAscending="0" hideCoverage="0" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="length_m" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerName="all_routes" coverageLayerProvider="ogr" enabled="1" filterFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerProvider="ogr" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="1" sortFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="120" name="Marshals" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" type="65638" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -11289,339 +11281,339 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="bevel" opacity="1" groupUuid="" columnSpace="2" position="128.239,3.58,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.1,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="128.239,3.58,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolHeight="4" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="19.9422,26,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="5" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="128" alpha="255" green="128" red="128"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolAlignment="1" frameJoinStyle="bevel" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" equalColumnWidth="1" size="19.9422,26,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="5" rasterBorder="1" fontColor="#000000" position="128.239,3.58,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="128.239,3.58,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.1,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="128" green="128" red="128" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" name="title">
+            <styleFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="1" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Semibold" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="102.986,142.175,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" labelMargin="0,mm" zValue="4" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" outlineWidthM="0.2,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Marshal map - inset" size="50.4055,50.7436,mm" position="102.986,142.175,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="50.4055,50.7436,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" position="102.986,142.175,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal map - inset" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.2,mm" zValue="4" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="102.986,142.175,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.40830605842002043" ymin="-33.90511059368537161" ymax="-33.9047436175620831" xmax="18.40867058941471512"/>
+        <Extent xmax="18.40867058941471512" ymin="-33.90511059368537161" ymax="-33.9047436175620831" xmin="18.40830605842002043"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="1" name="Overview 1" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-            <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-              <prop v="0,65,170,102" k="color"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="35,35,35,102" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.26" k="outline_width"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="solid" k="style"/>
+        <ComposerMapOverview show="1" centered="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" position="3">
+          <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,65,170,102"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="35,35,35,102"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" mapFlags="0" type="65639" positionOnPage="3.53,6.0007,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" labelMargin="0,mm" zValue="3" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="true" followPresetName="Marshal map - main" size="142,181,mm" position="3.53,6.0007,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="142,181,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" position="3.53,6.0007,mm" type="65639" drawCanvasItems="true" followPresetName="Marshal map - main" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.53,6.0007,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.40643444482690683" ymin="-33.90754507826720499" ymax="-33.90230913298024973" xmax="18.41054220300782873"/>
+        <Extent xmax="18.41054220300782873" ymin="-33.90754507826720499" ymax="-33.90230913298024973" xmin="18.40643444482690683"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65647" positionOnPage="277.3,6.0007,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionWidth="127.436" sectionHeight="159.418" zValue="2" frame="false" referencePoint="2" blendMode="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" id="" sectionX="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" visibility="1" hidePageIfEmpty="0" outlineWidthM="0.3,mm" excludeFromExports="0" hideBackgroundIfEmpty="0" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" size="127.436,159.418,mm" position="277.3,6.0007,mm">
-        <FrameColor blue="119" alpha="255" green="119" red="119"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="127.436,159.418,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="159.418" sectionWidth="127.436" position="277.3,6.0007,mm" hideBackgroundIfEmpty="0" type="65647" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" frameJoinStyle="round" positionLock="true" background="false" sectionX="0" outlineWidthM="0.3,mm" zValue="2" visibility="1" sectionY="0" referencePoint="2" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="277.3,6.0007,mm" hidePageIfEmpty="0" itemRotation="0" groupUuid="">
+        <FrameColor blue="119" green="119" red="119" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="27.6" itemRotation="0" resizeMode="0" type="65640" positionOnPage="230.194,167.419,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" anchorPoint="0" svgBorderColor="0,0,0,255" zValue="1" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="27.4317" pictureRotation="0" file="../Gun_Run_Logo_2018.png" mapUuid="" size="47.1065,27.6,mm" position="230.194,167.419,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="230.194,167.419,mm" type="65640" pictureWidth="27.4317" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="1" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo_2018.png" excludeFromExports="0" pictureHeight="27.6" positionOnPage="230.194,167.419,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame type="65648" url="" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" contentMode="1" evaluateExpressions="true" useSmartBreaks="true">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>&lt;b>VOC&lt;/b>&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" type="65648" resizeMode="0" stylesheetEnabled="true">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutMultiFrame>
       <customproperties>
-        <property value="jpg" key="atlasRasterFormat"/>
-        <property value="false" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="0" key="imageCropMarginUnit"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="false" key="rasterize"/>
-        <property value="3.53" key="resizeToContentsBottomMargin"/>
-        <property value="3.53" key="resizeToContentsLeftMargin"/>
-        <property value="3.53" key="resizeToContentsRightMargin"/>
-        <property value="3.53" key="resizeToContentsTopMargin"/>
-        <property value="false" key="singleFile"/>
+        <property key="atlasRasterFormat" value="jpg"/>
+        <property key="forceVector" value="false"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropMarginUnit" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="rasterize" value="false"/>
+        <property key="resizeToContentsBottomMargin" value="3.53"/>
+        <property key="resizeToContentsLeftMargin" value="3.53"/>
+        <property key="resizeToContentsRightMargin" value="3.53"/>
+        <property key="resizeToContentsTopMargin" value="3.53"/>
+        <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="0" sortKey="position" pageNameExpression="&quot;position&quot;" coverageLayer="" enabled="0" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;position&quot;" sortAscending="1" coverageLayer="" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="position" filterFeatures="0" enabled="0" sortFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="120" name="Marshal Plan" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,420,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,420,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" position="0,0,mm" type="65638" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -11629,250 +11621,250 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="15.6525,12.5708,mm" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="15.6525,12.5708,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" legendFilterByAtlas="0" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolHeight="4" type="65642" fontColor="#000000" frame="false" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="18.6109,9,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="8" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="15.6525,12.5708,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="15.6525,12.5708,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="1" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="MARSHAL POSITIONS" type="65641" positionOnPage="5.69321,399.106,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" valign="64" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="45.1194,7.36972,mm" position="5.69321,399.106,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="45.1194,7.36972,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginX="1" position="5.69321,399.106,mm" type="65641" valign="64" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.69321,399.106,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Page [% &quot;page&quot; %]" type="65641" positionOnPage="5.69321,406.988,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" valign="32" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="16.2476,7.80192,mm" position="5.69321,406.988,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="16.2476,7.80192,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginX="1" position="5.69321,406.988,mm" type="65641" valign="32" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% &quot;page&quot; %]" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.1" type="65641" positionOnPage="214.292,406.988,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" valign="32" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="27.7839,7.51682,mm" position="214.292,406.988,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginX="1" position="214.292,406.988,mm" type="65641" valign="32" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="214.292,406.988,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="185.72,399.107,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" valign="64" htmlState="0" zValue="4" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="56.3557,7.36902,mm" position="185.72,399.107,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginX="1" position="185.72,399.107,mm" type="65641" valign="64" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="185.72,399.107,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="28.8527" itemRotation="0" resizeMode="0" type="65640" positionOnPage="243.319,382.696,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" anchorPoint="8" svgBorderColor="0,0,0,255" zValue="3" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="49.3143" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="" size="49.3143,31.2967,mm" position="243.319,382.696,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="49.3143,31.2967,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" position="243.319,382.696,mm" type="65640" pictureWidth="49.3143" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.319,382.696,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="5.84321,406.626,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" zValue="2" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="236.083,0.14328,mm" position="5.84321,406.626,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="236.083,0.14328,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" position="5.84321,406.626,mm" type="65643" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.03,5.9483,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Marshal overview" size="286.94,392.396,mm" position="5.03,5.9483,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="286.94,392.396,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" position="5.03,5.9483,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.03,5.9483,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.4043547521658617" ymin="-33.91857233280978789" ymax="-33.89547273009495854" xmax="18.42124635930919041"/>
+        <Extent xmax="18.42124635930919041" ymin="-33.91857233280978789" ymax="-33.89547273009495854" xmin="18.4043547521658617"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="300" name="Start &amp; Finish Backgrounds" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" type="65638" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -11880,151 +11872,151 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" pictureHeight="7.97477" itemRotation="0" resizeMode="0" type="65640" positionOnPage="286.027,2,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" anchorPoint="0" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="6.31767" pictureRotation="330" file="arrows/NorthArrow_11.svg" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" size="9.45865,11,mm" position="286.027,2,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" type="65640" pictureWidth="6.31767" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" frameJoinStyle="miter" positionLock="true" anchorPoint="0" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" excludeFromExports="0" pictureHeight="7.97477" positionOnPage="286.027,2,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="270" labelText="[%upper( &quot;area&quot; )%]" type="65641" positionOnPage="285.027,205.886,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" htmlState="0" zValue="3" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="142.543,10.3185,mm" position="285.027,205.886,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" position="285.027,205.886,mm" type="65641" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" excludeFromExports="0" positionOnPage="285.027,205.886,mm" itemRotation="270" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem numSegmentsLeft="2" frameJoinStyle="miter" opacity="1" groupUuid="" position="7,189.669,mm" labelBarSpace="3" outlineWidthM="0.3,mm" excludeFromExports="0" unitType="meters" positionOnPage="7,189.669,mm" alignment="0" height="3" lineCapStyle="square" segmentMillimeters="28.5458" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" outlineWidth="0.3" type="65646" numUnitsPerSegment="90" frame="false" background="false" segmentSizeMode="1" lineJoinStyle="miter" style="Single Box" numMapUnitsPerScaleBarUnit="1" itemRotation="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" size="155.102,16.2165,mm" id="" visibility="1" unitLabel="m" zValue="2" referencePoint="0" blendMode="0" positionLock="true" maxBarWidth="150" boxContentSpace="1" minBarWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem lineJoinStyle="miter" visibility="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" style="Single Box" frameJoinStyle="miter" numUnitsPerSegment="90" segmentSizeMode="1" itemRotation="0" outlineWidth="0.3" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" size="155.102,16.2165,mm" id="" type="65646" background="false" segmentMillimeters="28.5458" labelBarSpace="3" numSegments="4" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" zValue="2" alignment="0" unitType="meters" unitLabel="m" position="7,189.669,mm" blendMode="0" positionOnPage="7,189.669,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" minBarWidth="50">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" namedStyle="" fontWeight="50" blendMode="0" fontSize="12" fontCapitals="0" fontLetterSpacing="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" fontFamily="Myriad Pro" fontStrikeout="0">
-          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-          <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
+          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
         </text-style>
-        <fillColor blue="0" alpha="255" green="0" red="0"/>
-        <fillColor2 blue="255" alpha="255" green="255" red="255"/>
-        <strokeColor blue="0" alpha="255" green="0" red="0"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" mapFlags="0" type="65639" positionOnPage="7,5.5,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="330" drawCanvasItems="false" followPresetName="Start/Finish" size="278.027,180.318,mm" position="7,5.5,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" position="7,5.5,mm" type="65639" drawCanvasItems="false" followPresetName="Start/Finish" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="330" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="7,5.5,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="rotation"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="rotation" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="id"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="id" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="angle" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958"/>
+        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="5" topAnnotationDisplay="3" topAnnotationPosition="1" position="3" rightAnnotationDisplay="3" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="1" bottomAnnotationPosition="1" leftAnnotationDisplay="3" bottomAnnotationDisplay="3" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="5">
+        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12040,71 +12032,71 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>WGS84</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
-        <property value="0" key="svgCropMarginBottom"/>
-        <property value="0" key="svgCropMarginLeft"/>
-        <property value="0" key="svgCropMarginRight"/>
-        <property value="0" key="svgCropMarginTop"/>
-        <property value="true" key="svgCropToContents"/>
-        <property value="0" key="svgDisableRasterTiles"/>
-        <property value="false" key="svgGroupLayers"/>
-        <property value="1" key="svgIncludeMetadata"/>
-        <property value="0" key="svgTextFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
+        <property key="svgCropMarginBottom" value="0"/>
+        <property key="svgCropMarginLeft" value="0"/>
+        <property key="svgCropMarginRight" value="0"/>
+        <property key="svgCropMarginTop" value="0"/>
+        <property key="svgCropToContents" value="true"/>
+        <property key="svgDisableRasterTiles" value="0"/>
+        <property key="svgGroupLayers" value="false"/>
+        <property key="svgIncludeMetadata" value="1"/>
+        <property key="svgTextFormat" value="0"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;area&quot;" sortAscending="1" coverageLayerProvider="ogr" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="300" name="Fencing" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" type="65638" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -12112,269 +12104,269 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="FENCING: [% &quot;name&quot; %]" type="65641" positionOnPage="6.76779,190.27,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="64" htmlState="0" zValue="11" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="148.46,7.36972,mm" position="6.76779,190.27,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" position="6.76779,190.27,mm" type="65641" valign="64" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="11" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" excludeFromExports="0" positionOnPage="6.76779,190.27,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 2.2" type="65641" positionOnPage="211.295,197.64,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" htmlState="0" zValue="10" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="27.7839,7.51682,mm" position="211.295,197.64,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" position="211.295,197.64,mm" type="65641" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="10" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 2.3" excludeFromExports="0" positionOnPage="211.295,197.64,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Total cones: [% &quot;cone_length&quot; %]m" type="65641" positionOnPage="115.637,198.083,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" htmlState="0" zValue="9" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="67.0856,7.80192,mm" position="115.637,198.083,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" position="115.637,198.083,mm" type="65641" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="9" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total cones: [% &quot;cone_length&quot; %]m" excludeFromExports="0" positionOnPage="115.637,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Total fencing: [% &quot;fence_length&quot; %]m" type="65641" positionOnPage="59.5581,198.083,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="53.0017,7.80192,mm" position="59.5581,198.083,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" position="59.5581,198.083,mm" type="65641" valign="32" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Total fencing: [% &quot;fence_length&quot; %]m" excludeFromExports="0" positionOnPage="59.5581,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Page [% @atlas_featurenumber %]" type="65641" positionOnPage="6.76779,198.083,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="52.7903,7.80192,mm" position="6.76779,198.083,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" position="6.76779,198.083,mm" type="65641" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Page [% @atlas_featurenumber %]" excludeFromExports="0" positionOnPage="6.76779,198.083,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="28.8527" itemRotation="0" resizeMode="0" type="65640" positionOnPage="243.098,175.353,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" anchorPoint="8" svgBorderColor="0,0,0,255" zValue="6" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="49.3143" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="" size="49.3143,29.8354,mm" position="243.098,175.353,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" type="65640" pictureWidth="49.3143" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="6" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="28.8527" positionOnPage="243.098,175.353,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="182.723,190.271,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="56.3557,7.36902,mm" position="182.723,190.271,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" position="182.723,190.271,mm" type="65641" valign="64" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="182.723,190.271,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="6.91779,197.79,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" zValue="4" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="232.01,0.14328,mm" position="6.91779,197.79,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" type="65643" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem numSegmentsLeft="2" frameJoinStyle="miter" opacity="1" groupUuid="" position="6.76779,2.8482,mm" labelBarSpace="1" outlineWidthM="0.3,mm" excludeFromExports="0" unitType="meters" positionOnPage="6.76779,2.8482,mm" alignment="0" height="2" lineCapStyle="square" segmentMillimeters="28.6552" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" outlineWidth="0.2" type="65646" numUnitsPerSegment="400" frame="false" background="false" segmentSizeMode="1" lineJoinStyle="round" style="Double Box" numMapUnitsPerScaleBarUnit="1" itemRotation="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" size="97.6157,15.8378,mm" id="" visibility="1" unitLabel="m" zValue="3" referencePoint="0" blendMode="0" positionLock="true" maxBarWidth="100" boxContentSpace="0.2" minBarWidth="25">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem lineJoinStyle="round" visibility="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" style="Double Box" frameJoinStyle="miter" numUnitsPerSegment="50" segmentSizeMode="1" itemRotation="0" outlineWidth="0.2" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" size="109.429,15.8378,mm" id="" type="65646" background="false" segmentMillimeters="32.9517" labelBarSpace="1" numSegments="2" positionLock="true" excludeFromExports="0" groupUuid="" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" zValue="3" alignment="0" unitType="meters" unitLabel="m" position="6.76779,2.8482,mm" blendMode="0" positionOnPage="6.76779,2.8482,mm" referencePoint="0" opacity="1" frame="false" numSegmentsLeft="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" minBarWidth="25">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" namedStyle="" fontWeight="50" blendMode="0" fontSize="12" fontCapitals="0" fontLetterSpacing="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" textOpacity="1" multilineHeight="1" fontSizeUnit="Point" fontWordSpacing="0" fontFamily="Myriad Pro" fontStrikeout="0">
-          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferDraw="0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferSize="1"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeUnit="MM" shapeType="0" shapeOffsetY="0" shapeOpacity="1" shapeRotation="0" shapeSizeType="0"/>
-          <shadow shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowBlendMode="6" shadowRadius="1.5" shadowColor="0,0,0,255" shadowDraw="0"/>
+        <text-style textColor="0,0,0,255" fontItalic="0" fontStrikeout="0" fontFamily="Myriad Pro" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSizeUnit="Point" fontWeight="50" namedStyle="" fontCapitals="0" fontSize="12" fontUnderline="0" fontLetterSpacing="0" blendMode="0" multilineHeight="1">
+          <text-buffer bufferOpacity="1" bufferNoFill="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1"/>
+          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeBlendMode="0" shapeOffsetX="0" shapeBorderWidth="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetY="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeOffsetUnit="MM" shapeRadiiY="0" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeDraw="0" shapeRotationType="0" shapeSizeX="0" shapeRadiiX="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowUnder="0" shadowColor="0,0,0,255" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100" shadowDraw="0" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
         </text-style>
-        <fillColor blue="0" alpha="255" green="0" red="0"/>
-        <fillColor2 blue="255" alpha="255" green="255" red="255"/>
-        <strokeColor blue="0" alpha="255" green="0" red="0"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <strokeColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="256.808,2.9982,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="256.808,2.9982,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolHeight="4" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="38.1563,54.9504,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="0" symbolWidth="7" zValue="2" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" equalColumnWidth="1" size="38.1563,54.9504,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="2" rasterBorder="1" fontColor="#000000" position="256.808,2.9982,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="0" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
+          <style alignment="1" name="title">
+            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2.5" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="fencing" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
               <customproperties>
-                <property value="0,1,2" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/node-order" value="0,1,2"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
               <customproperties>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" mapFlags="0" type="65639" positionOnPage="6.76779,9.35102,mm" opacity="0.9" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Fencing" size="283.418,180.92,mm" position="6.76779,9.35102,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" position="6.76779,9.35102,mm" type="65639" drawCanvasItems="false" followPresetName="Fencing" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="0.9" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="6.76779,9.35102,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option value="1" name="exponent" type="double"/>
+                      <Option value="360" name="maxOutput" type="double"/>
+                      <Option value="0" name="maxValue" type="double"/>
+                      <Option value="0" name="minOutput" type="double"/>
+                      <Option value="0" name="minValue" type="double"/>
+                      <Option value="0" name="nullOutput" type="double"/>
                     </Option>
-                    <Option type="int" name="t" value="0"/>
+                    <Option value="0" name="t" type="int"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="angle" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.35783154382262339" ymin="-33.94972755295309952" ymax="-33.92240721182624696" xmax="18.40062995539080148"/>
+        <Extent xmax="18.41630052358666347" ymin="-33.90341671356931386" ymax="-33.9004485589241682" xmin="18.41165079013320849"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12388,62 +12380,62 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="5" topAnnotationDisplay="3" topAnnotationPosition="1" position="3" rightAnnotationDisplay="3" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="1" bottomAnnotationPosition="1" leftAnnotationDisplay="3" bottomAnnotationDisplay="3" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="5">
+        <ComposerMapGrid offsetY="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="5" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="3" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="1" rightAnnotationDisplay="3" intervalX="5" annotationFormat="4" gridFrameStyle="0" bottomAnnotationDisplay="3" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="3" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="195,195,195,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="195,195,195,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12459,274 +12451,274 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>WGS84</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="rasterize"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="rasterize" value="true"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortKey="group" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerName="fence_groups" coverageLayerProvider="virtual" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;name&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="fence_groups_2daa8372_dd22_4979_afdf_08d74ee6b4b1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20[name],%20[group]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortKey="group" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="9" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="9" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" type="65638" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="Directions to Start of Race" type="65641" positionOnPage="4.43449,186.634,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="83.9998,10.4638,mm" position="4.43449,186.634,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" position="4.43449,186.634,mm" type="65641" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Directions to Start of Race" excludeFromExports="0" positionOnPage="4.43449,186.634,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Gun Run" type="65641" positionOnPage="4.43449,197.498,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="48.2923,9.511,mm" position="4.43449,197.498,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" position="4.43449,197.498,mm" type="65641" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="Gun Run" excludeFromExports="0" positionOnPage="4.43449,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" opacity="1" groupUuid="" columnSpace="0" position="10.096,10.8563,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="0" lineSpacing="2" boxSpace="2" wrapChar="" positionOnPage="10.096,10.8563,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolHeight="5" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="59.0766,76,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="9" legendFilterByMap="1" zValue="6" referencePoint="0" blendMode="0" positionLock="false" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="139" alpha="255" green="139" red="139"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolAlignment="1" frameJoinStyle="round" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" equalColumnWidth="0" size="59.0766,76,mm" id="" type="65642" lineSpacing="2" background="true" wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" legendFilterByMap="1" excludeFromExports="0" groupUuid="" zValue="6" rasterBorder="1" fontColor="#000000" position="10.096,10.8563,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="10.096,10.8563,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="0" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="9" resizeToContents="1" symbolHeight="5">
+        <FrameColor blue="139" green="139" red="139" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2.5" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="3" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginTop="2.5" alignment="1" name="symbolLabel" marginLeft="3">
+            <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1">
             <customproperties>
-              <property value="hidden" key="legend/title-style"/>
+              <property key="legend/title-style" value="hidden"/>
             </customproperties>
-            <layer-tree-layer name="poi_labels" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
               <customproperties>
-                <property value="Start/Finish" key="legend/label-0"/>
-                <property value="Toilets" key="legend/label-1"/>
-                <property value="Tog Bag Drop-off" key="legend/label-2"/>
-                <property value="Road Closed to Cars" key="legend/label-3"/>
-                <property value="MyCiti Drop-off" key="legend/label-4"/>
-                <property value="Parking" key="legend/label-5"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="Start/Finish"/>
+                <property key="legend/label-1" value="Toilets"/>
+                <property key="legend/label-2" value="Tog Bag Drop-off"/>
+                <property key="legend/label-3" value="Road Closed to Cars"/>
+                <property key="legend/label-4" value="MyCiti Drop-off"/>
+                <property key="legend/label-5" value="Parking"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
               <customproperties>
-                <property value="To 21KM Start (06:30)" key="legend/label-0"/>
-                <property value="To 10KM Start (07:30)" key="legend/label-1"/>
-                <property value="To 5KM Start (08:30)" key="legend/label-2"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/label-0" value="To 21KM Start (06:30)"/>
+                <property key="legend/label-1" value="To 10KM Start (07:30)"/>
+                <property key="legend/label-2" value="To 5KM Start (08:30)"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.0" type="65641" positionOnPage="221.862,190.027,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="27.7839,6.871,mm" position="221.862,190.027,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" position="221.862,190.027,mm" type="65641" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.0" excludeFromExports="0" positionOnPage="221.862,190.027,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="197.975,197.498,mm" opacity="1" groupUuid="" positionLock="false" marginX="1" frameJoinStyle="miter" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" htmlState="0" zValue="4" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="197.975,197.498,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" position="197.975,197.498,mm" type="65641" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="197.975,197.498,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="24.3824" itemRotation="0" resizeMode="0" type="65640" positionOnPage="249.646,179.724,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="3" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="41.6737" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" size="42.9838,24.3824,mm" position="249.646,179.724,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" type="65640" pictureWidth="41.6737" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" frameJoinStyle="miter" positionLock="false" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="24.3824" positionOnPage="249.646,179.724,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="4.58449,197.248,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" zValue="2" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="244.912,0.1,mm" position="4.58449,197.248,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" type="65643" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frameJoinStyle="miter" positionLock="false" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="4.43449,6.411,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" labelMargin="0,mm" zValue="1" frame="false" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Ask Me" size="288.007,183.616,mm" position="4.43449,6.411,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" position="4.43449,6.411,mm" type="65639" drawCanvasItems="false" followPresetName="Ask Me" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="4.43449,6.411,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151"/>
+        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmin="18.39762336729721071"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -12740,480 +12732,480 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="" coverageLayer="" enabled="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas pageNameExpression="" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" enabled="0" sortFeatures="0" hideCoverage="0"/>
     </Layout>
-    <Layout name="All Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="All Routes" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" type="65638" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.6" type="65641" positionOnPage="204.225,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="64" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="57.4836,6.8714,mm" position="204.225,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.6" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="210.038,199.082,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="210.038,199.082,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="17.4074" itemRotation="0" resizeMode="0" type="65640" positionOnPage="262.196,188.218,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="29.7523" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" size="29.7523,17.4718,mm" position="262.196,188.218,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="9.59946,198.832,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" zValue="3" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="251.959,0.1,mm" position="9.59946,198.832,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.59946,198.832,mm" type="65643" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.86559,4.09761,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" labelMargin="0,mm" zValue="2" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="false" id="" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="67.7828,166.874,mm" position="5.86559,4.09761,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="9.44946,9.08557,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="false" id="" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" outlineWidthM="0.15,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Routes" size="282.012,182.649,mm" position="9.44946,9.08557,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="282.012,182.649,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Routes" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="false" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.368'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.36799999999999855" ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmax="18.42103445111282056"/>
+        <Extent xmax="18.42103445111282056" ymin="-33.92999999999999972" ymax="-33.89565141814492932" xmin="18.36799999999999855"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="true" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="true"/>
       </customproperties>
-      <Atlas sortAscending="0" hideCoverage="0" sortKey="length_m" pageNameExpression="&quot;Distance&quot;" coverageLayer="" enabled="0" filterFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;Distance&quot;" sortAscending="0" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayer="" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="length_m" filterFeatures="1" enabled="0" sortFeatures="1" hideCoverage="0"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="120" name="Marshal Plan A1" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="594,841,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" type="65638" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
@@ -13221,436 +13213,436 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="25.5925,18.7971,mm" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="1" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="25.5925,18.7971,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolHeight="4" type="65642" fontColor="#000000" frame="false" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="18.6109,9,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="8" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" equalColumnWidth="1" size="18.6109,9,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" excludeFromExports="0" groupUuid="" zValue="8" rasterBorder="1" fontColor="#000000" position="25.5925,18.7971,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="25.5925,18.7971,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="false" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="group" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="1" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="all_routes" expanded="1" checked="Qt::Checked" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602">
               <customproperties>
-                <property value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" key="expandedLegendNodes"/>
-                <property value="1,2,3" key="legend/node-order"/>
-                <property value="hidden" key="legend/title-style"/>
-                <property value="0" key="showFeatureCount"/>
+                <property key="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                <property key="legend/node-order" value="1,2,3"/>
+                <property key="legend/title-style" value="hidden"/>
+                <property key="showFeatureCount" value="0"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="MARSHAL POSITIONS" type="65641" positionOnPage="5.2963,808.939,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" htmlState="0" zValue="7" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="91.9494,15.0649,mm" position="5.2963,808.939,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" position="5.2963,808.939,mm" type="65641" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="7" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="MARSHAL POSITIONS" excludeFromExports="0" positionOnPage="5.2963,808.939,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 0.91" type="65641" positionOnPage="430.403,825.052,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="56.6212,15.3656,mm" position="430.403,825.052,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" position="430.403,825.052,mm" type="65641" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 0.91" excludeFromExports="0" positionOnPage="430.403,825.052,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="372.175,808.942,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" htmlState="0" zValue="4" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="114.848,15.0635,mm" position="372.175,808.942,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" position="372.175,808.942,mm" type="65641" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="4" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="372.175,808.942,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="58.7992" itemRotation="0" resizeMode="0" type="65640" positionOnPage="489.557,775.395,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" anchorPoint="8" svgBorderColor="0,0,0,255" zValue="3" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="100.498" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="" size="100.498,63.9757,mm" position="489.557,775.395,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" type="65640" pictureWidth="100.498" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="8" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="3" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="58.7992" positionOnPage="489.557,775.395,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="5.4463,824.155,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" zValue="2" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="481.428,0.606138,mm" position="5.4463,824.155,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" type="65643" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="2" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="3.94474,5.25965,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Marshal overview" size="584.759,811.213,mm" position="3.94474,5.25965,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" position="3.94474,5.25965,mm" type="65639" drawCanvasItems="false" followPresetName="Marshal overview" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="3.94474,5.25965,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="field" type="QString"/>
+                  <Option value="2" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741"/>
+        <Extent xmax="18.42299397558693741" ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
       </customproperties>
-      <Atlas sortAscending="1" hideCoverage="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" enabled="1" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas pageNameExpression="&quot;page&quot;" sortAscending="1" coverageLayerProvider="virtual" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" filterFeatures="0" enabled="1" sortFeatures="1" hideCoverage="1"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" offsetY="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" printResolution="144" name="Access Roads" worldFileMap="">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetX="0" resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="255,255,255,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="no" k="outline_style"/>
-            <prop v="0.26" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <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"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="no"/>
+            <prop k="outline_width" v="0.26"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" itemRotation="0" type="65638" positionOnPage="0,0,mm" opacity="1" groupUuid="" positionLock="false" frameJoinStyle="miter" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" zValue="0" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="297,210,mm" position="0,0,mm">
-          <FrameColor blue="0" alpha="255" green="0" red="0"/>
-          <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+        <LayoutItem frame="false" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" type="65638" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frameJoinStyle="miter" positionLock="false" background="true" outlineWidthM="0.3,mm" zValue="0" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" excludeFromExports="0" positionOnPage="0,0,mm" itemRotation="0" groupUuid="">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </dataDefinedProperties>
             <customproperties/>
           </LayoutObject>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide units="mm" orientation="2" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" opacity="1" groupUuid="" columnSpace="2" position="244.484,130.172,mm" outlineWidthM="0.3,mm" excludeFromExports="0" equalColumnWidth="0" lineSpacing="1" boxSpace="2" wrapChar="" positionOnPage="244.484,130.172,mm" rasterBorder="1" title="" splitLayer="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolHeight="4" type="65642" fontColor="#000000" frame="true" background="true" rasterBorderColor="0,0,0,255" symbolAlignment="1" itemRotation="0" size="34.45,40.8,mm" wmsLegendHeight="25" titleAlignment="1" id="" visibility="1" rasterBorderWidth="0" resizeToContents="1" symbolWidth="7" zValue="15" referencePoint="0" blendMode="0" positionLock="true" columnCount="1" wmsLegendWidth="50">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="185" green="255" red="255"/>
+      <LayoutItem boxSpace="2" visibility="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolAlignment="1" frameJoinStyle="miter" title="" wmsLegendHeight="25" itemRotation="0" splitLayer="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" equalColumnWidth="0" size="34.45,40.8,mm" id="" type="65642" lineSpacing="1" background="true" wrapChar="" positionLock="true" excludeFromExports="0" groupUuid="" zValue="15" rasterBorder="1" fontColor="#000000" position="244.484,130.172,mm" blendMode="0" rasterBorderColor="0,0,0,255" positionOnPage="244.484,130.172,mm" referencePoint="0" legendFilterByAtlas="0" opacity="1" frame="true" columnCount="1" titleAlignment="1" columnSpace="2" rasterBorderWidth="0" outlineWidthM="0.3,mm" wmsLegendWidth="50" symbolWidth="7" resizeToContents="1" symbolHeight="4">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1">
-            <styleFont description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="title">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style marginTop="3" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style marginTop="2.5" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style name="symbolLabel" marginLeft="2" marginTop="2" alignment="1">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties/>
-          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1">
             <customproperties/>
-            <layer-tree-layer name="residents_access_roads" expanded="1" checked="Qt::Checked" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
               <customproperties>
                 <property key="expandedLegendNodes"/>
-                <property value="hidden" key="legend/title-style"/>
+                <property key="legend/title-style" value="hidden"/>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="ACCESS ROUTES FOR RESIDENTS" type="65641" positionOnPage="9.37446,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="0" frameJoinStyle="miter" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" htmlState="0" zValue="8" frame="false" referencePoint="0" blendMode="0" halign="1" id="" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="194.851,7.272,mm" position="9.37446,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" position="9.37446,191.81,mm" type="65641" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="8" visibility="1" referencePoint="0" opacity="1" halign="1" id="" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" excludeFromExports="0" positionOnPage="9.37446,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="REVISION 1.1" type="65641" positionOnPage="204.225,191.81,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" htmlState="0" zValue="6" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="57.4836,6.8714,mm" position="204.225,191.81,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" position="204.225,191.81,mm" type="65641" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="6" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="REVISION 1.1" excludeFromExports="0" positionOnPage="204.225,191.81,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" labelText="Sunday, 20 October 2019" type="65641" positionOnPage="210.038,199.082,mm" opacity="1" groupUuid="" positionLock="true" marginX="1" frameJoinStyle="miter" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" htmlState="0" zValue="5" frame="false" referencePoint="0" blendMode="0" halign="2" id="" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" size="51.6706,6.60801,mm" position="210.038,199.082,mm" marginY="1">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" position="210.038,199.082,mm" type="65641" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="5" visibility="1" referencePoint="0" opacity="1" halign="2" id="" blendMode="0" labelText="Sunday, 20 October 2019" excludeFromExports="0" positionOnPage="210.038,199.082,mm" itemRotation="0" groupUuid="" marginY="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
-        <FontColor blue="0" alpha="255" green="0" red="0"/>
+        <LabelFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
+        <FontColor blue="0" green="0" red="0" alpha="255"/>
       </LayoutItem>
-      <LayoutItem background="false" pictureHeight="17.4074" itemRotation="0" resizeMode="0" type="65640" positionOnPage="262.196,188.218,mm" svgBorderWidth="0.2" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" anchorPoint="4" svgBorderColor="0,0,0,255" zValue="4" frame="false" svgFillColor="255,255,255,255" referencePoint="0" blendMode="0" id="" northMode="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" pictureWidth="29.7523" pictureRotation="0" file="../Gun_Run_Logo.png" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" size="29.7523,17.4718,mm" position="262.196,188.218,mm" northOffset="0">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" type="65640" pictureWidth="29.7523" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" frameJoinStyle="miter" positionLock="true" anchorPoint="4" svgFillColor="255,255,255,255" background="false" resizeMode="0" outlineWidthM="0.3,mm" zValue="4" visibility="1" northMode="0" referencePoint="0" svgBorderWidth="0.2" opacity="1" id="" blendMode="0" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" excludeFromExports="0" pictureHeight="17.4074" positionOnPage="262.196,188.218,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" itemRotation="0" type="65643" positionOnPage="9.59946,198.832,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" zValue="3" frame="false" referencePoint="0" blendMode="0" id="" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" visibility="1" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" size="251.959,0.1,mm" position="9.59946,198.832,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="false" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" type="65643" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frameJoinStyle="miter" positionLock="true" background="false" outlineWidthM="0.3,mm" zValue="3" visibility="1" referencePoint="0" opacity="1" id="" blendMode="0" cornerRadiusMeasure="0,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" name="name" type="QString"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-          <layer class="SimpleFill" enabled="1" pass="0" locked="0">
-            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-            <prop v="0,0,0,255" k="color"/>
-            <prop v="miter" k="joinstyle"/>
-            <prop v="0,0" k="offset"/>
-            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-            <prop v="MM" k="offset_unit"/>
-            <prop v="0,0,0,255" k="outline_color"/>
-            <prop v="solid" k="outline_style"/>
-            <prop v="0.3" k="outline_width"/>
-            <prop v="MM" k="outline_width_unit"/>
-            <prop v="solid" k="style"/>
+        <symbol name="" clip_to_extent="1" force_rhr="0" type="fill" alpha="1">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="joinstyle" v="miter"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0.3"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" name="name" type="QString"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="5.86559,4.09761,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="miter" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" labelMargin="0,mm" zValue="2" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" visibility="1" outlineWidthM="0.3,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Access Routes" size="67.7828,166.874,mm" position="5.86559,4.09761,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" position="5.86559,4.09761,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frameJoinStyle="miter" positionLock="true" background="true" outlineWidthM="0.3,mm" zValue="2" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="5.86559,4.09761,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option value="false" name="active" type="bool"/>
+                  <Option value="1" name="type" type="int"/>
+                  <Option value="" name="val" type="QString"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13664,102 +13656,102 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
       </LayoutItem>
-      <LayoutItem background="true" itemRotation="0" mapFlags="0" type="65639" positionOnPage="9.44946,9.08557,mm" opacity="1" groupUuid="" positionLock="true" frameJoinStyle="round" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" labelMargin="0,mm" zValue="1" frame="true" keepLayerSet="false" referencePoint="0" blendMode="0" followPreset="true" id="" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" visibility="1" outlineWidthM="0.15,mm" excludeFromExports="0" mapRotation="0" drawCanvasItems="false" followPresetName="Access Routes" size="282.012,175.592,mm" position="9.44946,9.08557,mm">
-        <FrameColor blue="0" alpha="255" green="0" red="0"/>
-        <BackgroundColor blue="255" alpha="255" green="255" red="255"/>
+      <LayoutItem frame="true" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" position="9.44946,9.08557,mm" type="65639" drawCanvasItems="false" followPresetName="Access Routes" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frameJoinStyle="round" positionLock="true" background="true" outlineWidthM="0.15,mm" zValue="1" labelMargin="0,mm" followPreset="true" visibility="1" referencePoint="0" opacity="1" mapRotation="0" id="" blendMode="0" excludeFromExports="0" mapFlags="0" positionOnPage="9.44946,9.08557,mm" itemRotation="0" groupUuid="">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option value="" name="name" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option value="true" name="active" type="bool"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
+                  <Option value="3" name="type" type="int"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" name="type" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties/>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431"/>
+        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -13773,87 +13765,87 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenThickness="0.5" gridFrameWidth="2" intervalY="0" topAnnotationDisplay="0" topAnnotationPosition="1" position="3" rightAnnotationDisplay="0" annotationExpression="" leftFrameDivisions="0" offsetX="0" gridFrameSideFlags="15" gridStyle="0" gridFrameMargin="0" rightAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" name="Grid 1" annotationFontColor="0,0,0,255" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationDirection="0" rightFrameDivisions="0" bottomFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" frameAnnotationDistance="1" unit="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" bottomAnnotationDisplay="0" gridFrameStyle="0" leftAnnotationPosition="1" crossLength="3" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" offsetY="0" show="0" annotationPrecision="3" showAnnotation="0" blendMode="0" frameFillColor2="0,0,0,255" bottomAnnotationDirection="0" intervalX="0">
+        <ComposerMapGrid offsetY="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" frameFillColor1="255,255,255,255" gridStyle="0" bottomFrameDivisions="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" gridFrameMargin="0" leftFrameDivisions="0" rightAnnotationPosition="1" rightAnnotationDirection="0" intervalY="0" frameFillColor2="0,0,0,255" leftAnnotationPosition="1" gridFrameSideFlags="15" topAnnotationDisplay="0" frameAnnotationDistance="1" annotationPrecision="3" offsetX="0" topAnnotationPosition="1" bottomAnnotationDirection="0" show="0" unit="0" rightAnnotationDisplay="0" intervalX="0" annotationFormat="0" gridFrameStyle="0" bottomAnnotationDisplay="0" blendMode="0" position="3" rightFrameDivisions="0" showAnnotation="0" topAnnotationDirection="0" crossLength="3" annotationFontColor="0,0,0,255" leftAnnotationDisplay="0" name="Grid 1" bottomAnnotationPosition="1" annotationExpression="" gridFramePenColor="0,0,0,255" topFrameDivisions="0">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleLine" enabled="1" pass="0" locked="0">
-                <prop v="square" k="capstyle"/>
-                <prop v="5;2" k="customdash"/>
-                <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                <prop v="MM" k="customdash_unit"/>
-                <prop v="0" k="draw_inside_polygon"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="0,0,0,255" k="line_color"/>
-                <prop v="solid" k="line_style"/>
-                <prop v="0" k="line_width"/>
-                <prop v="MM" k="line_width_unit"/>
-                <prop v="0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0" k="ring_filter"/>
-                <prop v="0" k="use_custom_dash"/>
-                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="0,0,0,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" force_rhr="0">
-              <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
-                <prop v="0" k="angle"/>
-                <prop v="0,0,0,255" k="color"/>
-                <prop v="1" k="horizontal_anchor_point"/>
-                <prop v="bevel" k="joinstyle"/>
-                <prop v="circle" k="name"/>
-                <prop v="0,0" k="offset"/>
-                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                <prop v="MM" k="offset_unit"/>
-                <prop v="0,0,0,255" k="outline_color"/>
-                <prop v="solid" k="outline_style"/>
-                <prop v="0" k="outline_width"/>
-                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                <prop v="MM" k="outline_width_unit"/>
-                <prop v="diameter" k="scale_method"/>
-                <prop v="2" k="size"/>
-                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                <prop v="MM" k="size_unit"/>
-                <prop v="1" k="vertical_anchor_point"/>
+            <symbol name="" clip_to_extent="1" force_rhr="0" type="marker" alpha="1">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <prop k="angle" v="0"/>
+                <prop k="color" v="0,0,0,255"/>
+                <prop k="horizontal_anchor_point" v="1"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="name" v="circle"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="0,0,0,255"/>
+                <prop k="outline_style" v="solid"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="scale_method" v="diameter"/>
+                <prop k="size" v="2"/>
+                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="size_unit" v="MM"/>
+                <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" name="name" type="QString"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <annotationFontProperties style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
       </LayoutItem>
       <customproperties>
-        <property value="png" key="atlasRasterFormat"/>
-        <property value="0" key="forceVector"/>
-        <property value="true" key="imageAntialias"/>
-        <property value="0" key="imageCropMarginBottom"/>
-        <property value="0" key="imageCropMarginLeft"/>
-        <property value="0" key="imageCropMarginRight"/>
-        <property value="0" key="imageCropMarginTop"/>
-        <property value="false" key="imageCropToContents"/>
-        <property value="0" key="pdfDisableRasterTiles"/>
-        <property value="1" key="pdfIncludeMetadata"/>
-        <property value="0" key="pdfTextFormat"/>
-        <property value="false" key="singleFile"/>
+        <property key="atlasRasterFormat" value="png"/>
+        <property key="forceVector" value="0"/>
+        <property key="imageAntialias" value="true"/>
+        <property key="imageCropMarginBottom" value="0"/>
+        <property key="imageCropMarginLeft" value="0"/>
+        <property key="imageCropMarginRight" value="0"/>
+        <property key="imageCropMarginTop" value="0"/>
+        <property key="imageCropToContents" value="false"/>
+        <property key="pdfDisableRasterTiles" value="0"/>
+        <property key="pdfIncludeMetadata" value="1"/>
+        <property key="pdfTextFormat" value="0"/>
+        <property key="singleFile" value="false"/>
       </customproperties>
-      <Atlas hideCoverage="1" coverageLayerSource="/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" coverageLayerProvider="ogr" enabled="1" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/GunRunMaps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" filterFeatures="0" enabled="1" sortFeatures="0" hideCoverage="1"/>
     </Layout>
   </Layouts>
 </qgis>
diff --git a/GIS Base Map/fencing.dbf b/GIS Base Map/fencing.dbf
index a28fb20..d6ee18c 100644
Binary files a/GIS Base Map/fencing.dbf and b/GIS Base Map/fencing.dbf differ
diff --git a/GIS Base Map/fencing.shp b/GIS Base Map/fencing.shp
index 7be6c0c..b8ea1f7 100644
Binary files a/GIS Base Map/fencing.shp and b/GIS Base Map/fencing.shp differ
diff --git a/GIS Base Map/fencing.shx b/GIS Base Map/fencing.shx
index 52a56f2..44b2b1e 100644
Binary files a/GIS Base Map/fencing.shx and b/GIS Base Map/fencing.shx differ