From 0ec34b50850abc6cfe0fbf2195e92112b85e8b6d Mon Sep 17 00:00:00 2001
From: tomasMizera <tomas.mizera2@gmail.com>
Date: Tue, 31 Aug 2021 08:41:28 +0200
Subject: [PATCH 1/2] remove useless repetitive log

---
 core/merginprojectmetadata.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/merginprojectmetadata.cpp b/core/merginprojectmetadata.cpp
index e79bd454a..85673b4f2 100644
--- a/core/merginprojectmetadata.cpp
+++ b/core/merginprojectmetadata.cpp
@@ -174,10 +174,6 @@ MerginConfig MerginConfig::fromFile( const QString &filePath )
     QByteArray data = file.readAll();
     config = MerginConfig::fromJson( data );
   }
-  else
-  {
-    CoreUtils::log( QStringLiteral( "MerginConfig" ), QStringLiteral( "Project does not contain a config file on path: %1" ).arg( filePath ) );
-  }
 
   return config;
 }

From 910c0e4583d4e43b42f8b1ed1be68091da094171 Mon Sep 17 00:00:00 2001
From: tomasMizera <tomas.mizera2@gmail.com>
Date: Tue, 31 Aug 2021 12:04:44 +0200
Subject: [PATCH 2/2] discover relations in autogenerated layout

---
 app/attributes/attributecontroller.cpp     |   57 +
 app/attributes/attributecontroller.h       |    1 +
 app/inpututils.cpp                         |    8 +-
 app/inpututils.h                           |    2 +-
 app/test/testformeditors.cpp               |   74 +
 app/test/testformeditors.h                 |    1 +
 test/test_data/planes/geo-layers.gpkg      |  Bin 0 -> 118784 bytes
 test/test_data/planes/quickapp_project.qgs | 1950 ++++++++++++++++----
 8 files changed, 1723 insertions(+), 370 deletions(-)
 create mode 100644 test/test_data/planes/geo-layers.gpkg

diff --git a/app/attributes/attributecontroller.cpp b/app/attributes/attributecontroller.cpp
index e941bfca4..1cce3172c 100644
--- a/app/attributes/attributecontroller.cpp
+++ b/app/attributes/attributecontroller.cpp
@@ -407,6 +407,11 @@ void AttributeController::updateOnLayerChange()
       // Auto-Generated Layout
       // We create fake root tab
       QgsAttributeEditorContainer *tab = autoLayoutTabContainer();
+
+      // We need to look for relations and include them into form,
+      // in auto-generated layout they are not included in form config
+      discoverRelations( tab );
+
       createTab( tab );
     }
 
@@ -987,6 +992,58 @@ void AttributeController::setFieldValuesValid( bool valid )
   }
 }
 
+void AttributeController::discoverRelations( QgsAttributeEditorContainer *container )
+{
+  QgsRelationManager *rManager = QgsProject::instance()->relationManager();
+
+  if ( !rManager || !mFeatureLayerPair.layer() )
+    return;
+
+  // find relation references (add relation reference widgets)
+  const QList<QgsRelation> childRelations = rManager->referencingRelations( mFeatureLayerPair.layer() );
+
+  for ( const QgsRelation &relation : childRelations )
+  {
+    for ( QgsAttributeEditorElement *child : container->children() )
+    {
+      if ( child->name() == relation.fieldPairs().at( 0 ).first )
+      {
+        CoreUtils::log( QStringLiteral( "DiscoverRelations" ), QStringLiteral( "Changing field %1 to RelationReference" ) );
+        QgsAttributeEditorField *editorField = static_cast<QgsAttributeEditorField *>( child );
+
+        if ( editorField )
+        {
+          int fieldIdx = editorField->idx();
+          QgsField field = mFeatureLayerPair.layer()->fields().at( fieldIdx );
+          QVariantMap additionalArgs = { { "ReferencedLayerId", relation.referencedLayerId() } };
+
+          // relation reference fields in autogenerated fields have empty config, we need to set needed properties here
+          if ( mFeatureLayerPair.layer()->editorWidgetSetup( fieldIdx ).config().isEmpty() )
+          {
+            const QgsEditorWidgetSetup newWidgetSetup = InputUtils::getEditorWidgetSetup( field, QStringLiteral( "RelationReference" ), additionalArgs );
+            mFeatureLayerPair.layer()->setEditorWidgetSetup( fieldIdx, newWidgetSetup );
+          }
+        }
+      }
+    }
+  }
+
+  // find relations (add relation widgets)
+  const QList<QgsRelation> referencingRelations = rManager->referencedRelations( mFeatureLayerPair.layer() );
+
+  for ( const QgsRelation &relation : referencingRelations )
+  {
+    std::unique_ptr<QgsAttributeEditorRelation> relationEditor = std::unique_ptr<QgsAttributeEditorRelation>( new QgsAttributeEditorRelation( relation, container ) );
+    if ( relationEditor->label().isEmpty() && relation.name().isEmpty() )
+    {
+      // relation does not have a name nor field have label, set label based on child layer
+      QString label = relation.referencingLayer()->name();
+      relationEditor->setLabel( label );
+    }
+    container->addChildElement( relationEditor.release() );
+  }
+}
+
 bool AttributeController::isValidFormId( const QUuid &id ) const
 {
   return mFormItems.contains( id );
diff --git a/app/attributes/attributecontroller.h b/app/attributes/attributecontroller.h
index ff44fdf03..83aa2338c 100644
--- a/app/attributes/attributecontroller.h
+++ b/app/attributes/attributecontroller.h
@@ -181,6 +181,7 @@ class  AttributeController : public QObject
     void setHasAnyChanges( bool hasChanges );
     void updateFieldValuesValidity();
     void setFieldValuesValid( bool valid );
+    void discoverRelations( QgsAttributeEditorContainer *container );
 
     bool isValidTabId( int id ) const;
     bool isValidFormId( const QUuid &id ) const;
diff --git a/app/inpututils.cpp b/app/inpututils.cpp
index 1c83c4185..2183e7ba0 100644
--- a/app/inpututils.cpp
+++ b/app/inpututils.cpp
@@ -804,7 +804,7 @@ const QgsEditorWidgetSetup InputUtils::getEditorWidgetSetup( const QgsField &fie
     return getEditorWidgetSetup( field, QStringLiteral( "TextEdit" ) );
 }
 
-const QgsEditorWidgetSetup InputUtils::getEditorWidgetSetup( const QgsField &field, const QString &widgetType )
+const QgsEditorWidgetSetup InputUtils::getEditorWidgetSetup( const QgsField &field, const QString &widgetType, const QVariantMap &additionalArgs )
 {
   if ( field.name() == QStringLiteral( "fid" ) )
     return QgsEditorWidgetSetup( QStringLiteral( "Hidden" ), QVariantMap() );
@@ -816,6 +816,8 @@ const QgsEditorWidgetSetup InputUtils::getEditorWidgetSetup( const QgsField &fie
   else
   {
     QVariantMap config;
+    config = config.unite( additionalArgs );
+
     if ( widgetType == QStringLiteral( "TextEdit" ) )
     {
       config.insert( QStringLiteral( "isMultiline" ), false );
@@ -842,6 +844,10 @@ const QgsEditorWidgetSetup InputUtils::getEditorWidgetSetup( const QgsField &fie
       QgsPropertyCollection collection;
       config.insert( QStringLiteral( "PropertyCollection" ), collection.toVariant( QgsPropertiesDefinition() ) );
     }
+    else if ( widgetType == QStringLiteral( "RelationReference" ) )
+    {
+      config.insert( QStringLiteral( "AllowNULL" ), true );
+    }
 
     return QgsEditorWidgetSetup( widgetType, config );
   }
diff --git a/app/inpututils.h b/app/inpututils.h
index 66b650de9..7c5aa001e 100644
--- a/app/inpututils.h
+++ b/app/inpututils.h
@@ -392,7 +392,7 @@ class InputUtils: public QObject
      * @return QgsEditorWidgetSetup for given field.
      */
     static const QgsEditorWidgetSetup getEditorWidgetSetup( const QgsField &field );
-    static const QgsEditorWidgetSetup getEditorWidgetSetup( const QgsField &field, const QString &widgetType );
+    static const QgsEditorWidgetSetup getEditorWidgetSetup( const QgsField &field, const QString &widgetType, const QVariantMap &additionalArgs = QVariantMap() );
 
     // Returns geometry type in form that qml understands
     Q_INVOKABLE static QString geometryFromLayer( QgsVectorLayer *layer );
diff --git a/app/test/testformeditors.cpp b/app/test/testformeditors.cpp
index 3243dd752..faa0989db 100644
--- a/app/test/testformeditors.cpp
+++ b/app/test/testformeditors.cpp
@@ -17,6 +17,7 @@
 #include <memory>
 
 #include "qgsvectorlayer.h"
+#include "qgsrelationmanager.h"
 
 void TestFormEditors::init()
 {
@@ -156,3 +157,76 @@ void TestFormEditors::testNumericFields()
   // field "Cabin Crew" stayed with invalid input, check controller flag of values validity
   QCOMPARE( controller.fieldValuesValid(), false );
 }
+
+void TestFormEditors::testRelationsWidgetPresence()
+{
+  QString projectDir = TestUtils::testDataDir() + "/planes";
+  QString projectName = "quickapp_project.qgs";
+
+  QString layersDb = projectDir + "/geo-layers.gpkg";
+
+  QSignalSpy spy( QgsProject::instance()->relationManager(), &QgsRelationManager::relationsLoaded );
+  QVERIFY( QgsProject::instance()->read( projectDir + "/" + projectName ) );
+  QCOMPARE( spy.count(), 1 );
+
+
+  QgsMapLayer *airportsLayer = QgsProject::instance()->mapLayersByName( QStringLiteral( "airports" ) ).at( 0 );
+  QgsVectorLayer *airportsVLayer = static_cast<QgsVectorLayer *>( airportsLayer );
+
+  QgsMapLayer *airportTowersLayer = QgsProject::instance()->mapLayersByName( QStringLiteral( "airport-towers" ) ).at( 0 );
+  QgsVectorLayer *airportTowersVLayer = static_cast<QgsVectorLayer *>( airportTowersLayer );
+
+  QVERIFY( airportsVLayer && airportsVLayer->isValid() );
+  QVERIFY( airportTowersVLayer && airportTowersVLayer->isValid() );
+
+  // check if we added exactly one relation widget when project has autogenerated layout
+
+  QgsFeature f = airportsVLayer->getFeature( 1 );
+  FeatureLayerPair pair( f, airportsVLayer );
+
+  AttributeController controller;
+  controller.setFeatureLayerPair( pair );
+
+  const TabItem *tabItem = controller.tabItem( 0 );
+  QVector<QUuid> formItems = tabItem->formItems();
+
+  int relationsCount = 0;
+  int relationReferencesCount = 0;
+
+  for ( const auto &itemId : formItems )
+  {
+    const FormItem *item = controller.formItem( itemId );
+    if ( item->editorWidgetType() == QStringLiteral( "relation" ) )
+      relationsCount++;
+    else if ( item->editorWidgetType() == QStringLiteral( "RelationReference" ) )
+      relationReferencesCount++;
+  }
+
+  QVERIFY( relationsCount == 1 );
+  QVERIFY( relationReferencesCount == 0 );
+
+  // check if we added exactly one relation reference widget when project has autogenerated layout
+
+  QgsFeature ft = airportTowersVLayer->getFeature( 1 );
+  FeatureLayerPair pairTower( ft, airportTowersVLayer );
+
+  controller.setFeatureLayerPair( pairTower );
+
+  const TabItem *tabItemTower = controller.tabItem( 0 );
+  formItems = tabItemTower->formItems();
+
+  relationsCount = 0;
+  relationReferencesCount = 0;
+
+  for ( const auto &itemId : formItems )
+  {
+    const FormItem *item = controller.formItem( itemId );
+    if ( item->editorWidgetType() == QStringLiteral( "relation" ) )
+      relationsCount++;
+    else if ( item->editorWidgetType() == QStringLiteral( "RelationReference" ) )
+      relationReferencesCount++;
+  }
+
+  QVERIFY( relationsCount == 0 );
+  QVERIFY( relationReferencesCount == 1 );
+}
diff --git a/app/test/testformeditors.h b/app/test/testformeditors.h
index 66071972c..4f11c6152 100644
--- a/app/test/testformeditors.h
+++ b/app/test/testformeditors.h
@@ -20,6 +20,7 @@ class TestFormEditors : public QObject
     void cleanup(); // will be called after every testfunction.
 
     void testNumericFields();
+    void testRelationsWidgetPresence();
 };
 
 #endif // TESTFORMEDITORS_H
diff --git a/test/test_data/planes/geo-layers.gpkg b/test/test_data/planes/geo-layers.gpkg
new file mode 100644
index 0000000000000000000000000000000000000000..b1c9b9cd3951a84311916571c0edb44b6044f047
GIT binary patch
literal 118784
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
LCTeErW+wW7DbU5c

literal 0
HcmV?d00001

diff --git a/test/test_data/planes/quickapp_project.qgs b/test/test_data/planes/quickapp_project.qgs
index 5cc9aa6a5..4c85d6aee 100644
--- a/test/test_data/planes/quickapp_project.qgs
+++ b/test/test_data/planes/quickapp_project.qgs
@@ -1,47 +1,76 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis projectname="" version="3.1.0-Master">
+<qgis saveDateTime="2021-08-31T12:03:57" version="3.20.1-Odense" saveUser="tomasmizera" saveUserFull="tomasmizera" projectname="">
+  <homePath path=""/>
   <title></title>
   <autotransaction active="0"/>
   <evaluateDefaultValues active="0"/>
   <trust active="0"/>
   <projectCrs>
     <spatialrefsys>
+      <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
       <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>
+      <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
   <layer-tree-group>
-    <customproperties/>
-    <layer-tree-layer name="Planes" id="points20151123133104693" expanded="1" checked="Qt::Checked" source="./points.shp" providerKey="ogr">
-      <customproperties/>
+    <customproperties>
+      <Option/>
+    </customproperties>
+    <layer-tree-layer legend_exp="" legend_split_behavior="0" checked="Qt::Checked" patch_size="-1,-1" name="airport-towers" providerKey="ogr" source="./geo-layers.gpkg|layername=airport-towers" expanded="1" id="airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c">
+      <customproperties>
+        <Option/>
+      </customproperties>
+    </layer-tree-layer>
+    <layer-tree-layer legend_exp="" legend_split_behavior="0" checked="Qt::Checked" patch_size="-1,-1" name="airports" providerKey="ogr" source="./geo-layers.gpkg|layername=airports" expanded="1" id="airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a">
+      <customproperties>
+        <Option/>
+      </customproperties>
     </layer-tree-layer>
-    <layer-tree-layer name="Land" id="polys20151123133114244" expanded="1" checked="Qt::Checked" source="./polys.shp" providerKey="ogr">
-      <customproperties/>
+    <layer-tree-layer legend_exp="" legend_split_behavior="0" checked="Qt::Checked" patch_size="0,0" name="Planes" providerKey="ogr" source="./points.shp" expanded="1" id="points20151123133104693">
+      <customproperties>
+        <Option/>
+      </customproperties>
     </layer-tree-layer>
-    <layer-tree-layer name="Roads" id="lines20151123133101198" expanded="1" checked="Qt::Checked" source="./lines.shp" providerKey="ogr">
-      <customproperties/>
+    <layer-tree-layer legend_exp="" legend_split_behavior="0" checked="Qt::Checked" patch_size="0,0" name="Land" providerKey="ogr" source="./polys.shp" expanded="1" id="polys20151123133114244">
+      <customproperties>
+        <Option/>
+      </customproperties>
+    </layer-tree-layer>
+    <layer-tree-layer legend_exp="" legend_split_behavior="0" checked="Qt::Checked" patch_size="0,0" name="Roads" providerKey="ogr" source="./lines.shp" expanded="1" id="lines20151123133101198">
+      <customproperties>
+        <Option/>
+      </customproperties>
     </layer-tree-layer>
     <custom-order enabled="0">
       <item>points20151123133104693</item>
       <item>polys20151123133114244</item>
       <item>lines20151123133101198</item>
+      <item>airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a</item>
+      <item>airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings tolerance="20" mode="1" type="2" enabled="1" unit="1" intersection-snapping="0">
+  <snapping-settings intersection-snapping="0" minScale="0" maxScale="0" scaleDependencyMode="0" type="3" unit="1" mode="1" tolerance="20" enabled="1" self-snapping="0">
     <individual-layer-settings>
-      <layer-setting tolerance="20" units="1" id="lines20151123133101198" type="2" enabled="1"/>
-      <layer-setting tolerance="20" units="1" id="polys20151123133114244" type="2" enabled="1"/>
-      <layer-setting tolerance="20" units="1" id="points20151123133104693" type="2" enabled="1"/>
+      <layer-setting units="1" minScale="0" maxScale="0" type="1" tolerance="12" enabled="0" id="airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a"/>
+      <layer-setting units="1" minScale="0" maxScale="0" type="2" tolerance="20" enabled="1" id="polys20151123133114244"/>
+      <layer-setting units="1" minScale="0" maxScale="0" type="1" tolerance="12" enabled="0" id="airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c"/>
+      <layer-setting units="1" minScale="0" maxScale="0" type="2" tolerance="20" enabled="1" id="points20151123133104693"/>
+      <layer-setting units="1" minScale="0" maxScale="0" type="2" tolerance="20" enabled="1" id="lines20151123133101198"/>
     </individual-layer-settings>
   </snapping-settings>
-  <relations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <relations>
+    <relation name="towers" id="airport_to_airport_fk_airports_3_fid" referencingLayer="airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c" referencedLayer="airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a" strength="Association">
+      <fieldRef referencedField="fid" referencingField="airport_fk"/>
+    </relation>
+  </relations>
+  <polymorphicRelations/>
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
       <xmin>-119.35580667290255974</xmin>
@@ -52,45 +81,596 @@
     <rotation>0</rotation>
     <destinationsrs>
       <spatialrefsys>
+        <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
         <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>
+        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
         <geographicflag>true</geographicflag>
       </spatialrefsys>
     </destinationsrs>
     <rendermaptile>0</rendermaptile>
+    <expressionContextScope/>
   </mapcanvas>
+  <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendlayer name="Planes" drawingOrder="-1" open="true" checked="Qt::Checked" showFeatureCount="0">
-      <filegroup open="true" hidden="false">
-        <legendlayerfile layerid="points20151123133104693" isInOverview="0" visible="1"/>
+    <legendlayer open="true" checked="Qt::Checked" name="airport-towers" showFeatureCount="0" drawingOrder="-1">
+      <filegroup hidden="false" open="true">
+        <legendlayerfile isInOverview="0" layerid="airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c" visible="1"/>
       </filegroup>
     </legendlayer>
-    <legendlayer name="Land" drawingOrder="-1" open="true" checked="Qt::Checked" showFeatureCount="0">
-      <filegroup open="true" hidden="false">
-        <legendlayerfile layerid="polys20151123133114244" isInOverview="0" visible="1"/>
+    <legendlayer open="true" checked="Qt::Checked" name="airports" showFeatureCount="0" drawingOrder="-1">
+      <filegroup hidden="false" open="true">
+        <legendlayerfile isInOverview="0" layerid="airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a" visible="1"/>
       </filegroup>
     </legendlayer>
-    <legendlayer name="Roads" drawingOrder="-1" open="true" checked="Qt::Checked" showFeatureCount="0">
-      <filegroup open="true" hidden="false">
-        <legendlayerfile layerid="lines20151123133101198" isInOverview="0" visible="1"/>
+    <legendlayer open="true" checked="Qt::Checked" name="Planes" showFeatureCount="0" drawingOrder="-1">
+      <filegroup hidden="false" open="true">
+        <legendlayerfile isInOverview="0" layerid="points20151123133104693" visible="1"/>
+      </filegroup>
+    </legendlayer>
+    <legendlayer open="true" checked="Qt::Checked" name="Land" showFeatureCount="0" drawingOrder="-1">
+      <filegroup hidden="false" open="true">
+        <legendlayerfile isInOverview="0" layerid="polys20151123133114244" visible="1"/>
+      </filegroup>
+    </legendlayer>
+    <legendlayer open="true" checked="Qt::Checked" name="Roads" showFeatureCount="0" drawingOrder="-1">
+      <filegroup hidden="false" open="true">
+        <legendlayerfile isInOverview="0" layerid="lines20151123133101198" visible="1"/>
       </filegroup>
     </legendlayer>
   </legend>
   <mapViewDocks/>
   <mapViewDocks3D/>
+  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
+    <units>degrees</units>
+    <extent>
+      <xmin>0</xmin>
+      <ymin>0</ymin>
+      <xmax>0</xmax>
+      <ymax>0</ymax>
+    </extent>
+    <rotation>0</rotation>
+    <destinationsrs>
+      <spatialrefsys>
+        <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <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>EPSG:7030</ellipsoidacronym>
+        <geographicflag>true</geographicflag>
+      </spatialrefsys>
+    </destinationsrs>
+    <rendermaptile>0</rendermaptile>
+    <expressionContextScope/>
+  </mapcanvas>
+  <main-annotation-layer autoRefreshEnabled="0" type="annotation" autoRefreshTime="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="">
+    <id>Annotations_1dbb1cec_4a27_4855_b748_cf6f68d2afe3</id>
+    <datasource></datasource>
+    <keywordList>
+      <value></value>
+    </keywordList>
+    <layername></layername>
+    <srs>
+      <spatialrefsys>
+        <wkt></wkt>
+        <proj4></proj4>
+        <srsid>0</srsid>
+        <srid>0</srid>
+        <authid></authid>
+        <description></description>
+        <projectionacronym></projectionacronym>
+        <ellipsoidacronym></ellipsoidacronym>
+        <geographicflag>false</geographicflag>
+      </spatialrefsys>
+    </srs>
+    <resourceMetadata>
+      <identifier></identifier>
+      <parentidentifier></parentidentifier>
+      <language></language>
+      <type></type>
+      <title></title>
+      <abstract></abstract>
+      <links/>
+      <fees></fees>
+      <encoding></encoding>
+      <crs>
+        <spatialrefsys>
+          <wkt></wkt>
+          <proj4></proj4>
+          <srsid>0</srsid>
+          <srid>0</srid>
+          <authid></authid>
+          <description></description>
+          <projectionacronym></projectionacronym>
+          <ellipsoidacronym></ellipsoidacronym>
+          <geographicflag>false</geographicflag>
+        </spatialrefsys>
+      </crs>
+      <extent/>
+    </resourceMetadata>
+    <items/>
+    <layerOpacity>1</layerOpacity>
+    <blendMode>0</blendMode>
+  </main-annotation-layer>
   <projectlayers>
-    <maplayer simplifyLocal="1" autoRefreshEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" type="vector" simplifyMaxScale="1" maxScale="1" readOnly="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+8" simplifyAlgorithm="0" geometry="Line" labelsEnabled="1">
+    <maplayer autoRefreshTime="0" styleCategories="AllStyleCategories" type="vector" refreshOnNotifyMessage="" geometry="Point" autoRefreshEnabled="0" simplifyLocal="1" simplifyAlgorithm="0" wkbType="Point" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" labelsEnabled="0" maxScale="0" readOnly="0" minScale="100000000" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0">
+      <extent>
+        <xmin>-109.63379669189500021</xmin>
+        <ymin>41.35957717895509944</ymin>
+        <xmax>-105.26393890380799689</xmax>
+        <ymax>41.46120834350590201</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>-109.63379669189500021</xmin>
+        <ymin>41.35957717895509944</ymin>
+        <xmax>-105.26393890380799689</xmax>
+        <ymax>41.46120834350590201</ymax>
+      </wgs84extent>
+      <id>airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c</id>
+      <datasource>./geo-layers.gpkg|layername=airport-towers</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>airport-towers</layername>
+      <srs>
+        <spatialrefsys>
+          <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <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>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type>dataset</type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys>
+            <wkt></wkt>
+            <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">ogr</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <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>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" durationUnit="min" accumulate="0" startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" startField="" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <renderer-v2 enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+        <symbols>
+          <symbol force_rhr="0" alpha="1" name="0" type="marker" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="2"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <prop v="0" k="angle"/>
+              <prop v="square" k="cap_style"/>
+              <prop v="190,207,80,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="2" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </symbols>
+        <rotation/>
+        <sizescale/>
+      </renderer-v2>
+      <customproperties>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;Code&quot;"/>
+          </Option>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks type="StringList">
+          <Option type="QString" value=""/>
+        </activeChecks>
+        <checkConfiguration/>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers>
+        <relation name="towers" providerKey="ogr" layerId="airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a" dataSource="./geo-layers.gpkg|layername=airports" id="airport_to_airport_fk_airports_3_fid" referencingLayer="airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c" referencedLayer="airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a" strength="Association" layerName="airports">
+          <fieldRef referencedField="fid" referencingField="airport_fk"/>
+        </relation>
+      </referencedLayers>
+      <fieldConfiguration>
+        <field name="fid" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Code" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="airport_fk" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias index="0" name="" field="fid"/>
+        <alias index="1" name="" field="Code"/>
+        <alias index="2" name="" field="airport_fk"/>
+      </aliases>
+      <defaults>
+        <default expression="" applyOnUpdate="0" field="fid"/>
+        <default expression="" applyOnUpdate="0" field="Code"/>
+        <default expression="" applyOnUpdate="0" field="airport_fk"/>
+      </defaults>
+      <constraints>
+        <constraint constraints="3" notnull_strength="1" unique_strength="1" field="fid" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Code" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="airport_fk" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="fid" exp="" desc=""/>
+        <constraint field="Code" exp="" desc=""/>
+        <constraint field="airport_fk" exp="" desc=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column hidden="0" width="-1" name="fid" type="field"/>
+          <column hidden="0" width="-1" name="Code" type="field"/>
+          <column hidden="0" width="-1" name="airport_fk" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></editforminitfilepath>
+      <editforminitcode><![CDATA[]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable/>
+      <labelOnTop/>
+      <reuseLastValue/>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>"Code"</previewExpression>
+      <mapTip></mapTip>
+    </maplayer>
+    <maplayer autoRefreshTime="0" styleCategories="AllStyleCategories" type="vector" refreshOnNotifyMessage="" geometry="Polygon" autoRefreshEnabled="0" simplifyLocal="1" simplifyAlgorithm="0" wkbType="Polygon" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" labelsEnabled="0" maxScale="0" readOnly="0" minScale="100000000" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0">
+      <extent>
+        <xmin>-110.14191436767599441</xmin>
+        <ymin>40.74982833862299714</ymin>
+        <xmax>-104.3154602050779971</xmax>
+        <ymax>41.96932220458980112</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>-110.14191436767599441</xmin>
+        <ymin>40.74982833862299714</ymin>
+        <xmax>-104.3154602050779971</xmax>
+        <ymax>41.96932220458980112</ymax>
+      </wgs84extent>
+      <id>airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a</id>
+      <datasource>./geo-layers.gpkg|layername=airports</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>airports</layername>
+      <srs>
+        <spatialrefsys>
+          <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <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>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type>dataset</type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys>
+            <wkt></wkt>
+            <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">ogr</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <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>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" durationUnit="min" accumulate="0" startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" startField="" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <renderer-v2 enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+        <symbols>
+          <symbol force_rhr="0" alpha="1" name="0" type="fill" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
+              </Option>
+              <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"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </symbols>
+        <rotation/>
+        <sizescale/>
+      </renderer-v2>
+      <customproperties>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;Name&quot;"/>
+          </Option>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks type="StringList">
+          <Option type="QString" value=""/>
+        </activeChecks>
+        <checkConfiguration/>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
+      <fieldConfiguration>
+        <field name="fid" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Name" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Size (area)" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias index="0" name="" field="fid"/>
+        <alias index="1" name="" field="Name"/>
+        <alias index="2" name="" field="Size (area)"/>
+      </aliases>
+      <defaults>
+        <default expression="" applyOnUpdate="0" field="fid"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="Size (area)"/>
+      </defaults>
+      <constraints>
+        <constraint constraints="3" notnull_strength="1" unique_strength="1" field="fid" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Name" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Size (area)" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="fid" exp="" desc=""/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="Size (area)" exp="" desc=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column hidden="0" width="-1" name="fid" type="field"/>
+          <column hidden="0" width="-1" name="Name" type="field"/>
+          <column hidden="0" width="-1" name="Size (area)" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></editforminitfilepath>
+      <editforminitcode><![CDATA[]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable/>
+      <labelOnTop/>
+      <reuseLastValue/>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>"Name"</previewExpression>
+      <mapTip></mapTip>
+    </maplayer>
+    <maplayer autoRefreshTime="0" styleCategories="AllStyleCategories" type="vector" refreshOnNotifyMessage="" geometry="Line" autoRefreshEnabled="0" simplifyLocal="1" simplifyAlgorithm="0" wkbType="MultiLineString" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" labelsEnabled="1" maxScale="1" readOnly="0" minScale="100000000" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-117.62319839219053108</xmin>
-        <ymin>23.20820580488508966</ymin>
+        <ymin>30.41924429435494659</ymin>
         <xmax>-82.32264950769274492</xmax>
         <ymax>46.18290982947509349</ymax>
       </extent>
+      <wgs84extent>
+        <xmin>-117.62319839219053108</xmin>
+        <ymin>30.41924429435494659</ymin>
+        <xmax>-82.32264950769274492</xmax>
+        <ymax>46.18290982947509349</ymax>
+      </wgs84extent>
       <id>lines20151123133101198</id>
       <datasource>./lines.shp</datasource>
       <keywordList>
@@ -99,13 +679,14 @@
       <layername>Roads</layername>
       <srs>
         <spatialrefsys>
+          <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
           <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>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
@@ -116,10 +697,12 @@
         <type></type>
         <title></title>
         <abstract></abstract>
+        <links/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys>
+            <wkt></wkt>
             <proj4></proj4>
             <srsid>0</srsid>
             <srid>0</srid>
@@ -131,7 +714,6 @@
           </spatialrefsys>
         </crs>
         <extent/>
-        <links/>
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
@@ -142,29 +724,89 @@
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="categorizedSymbol" enableorderby="0" attr="Name" symbollevels="0" forceraster="0">
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" durationUnit="min" accumulate="0" startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" startField="" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <renderer-v2 attr="Name" enableorderby="0" symbollevels="0" type="categorizedSymbol" forceraster="0">
         <categories>
-          <category symbol="0" label="Arterial" value="Arterial" render="true"/>
-          <category symbol="1" label="Highway" value="Highway" render="true"/>
+          <category label="Arterial" value="Arterial" render="true" symbol="0"/>
+          <category label="Highway" value="Highway" render="true" symbol="1"/>
         </categories>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" alpha="1">
-            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
-              <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="154,139,116,255"/>
-              <prop k="line_style" v="dash dot 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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol force_rhr="0" alpha="1" name="0" type="line" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="154,139,116,255"/>
+                <Option name="line_style" type="QString" value="dash dot dot"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="154,139,116,255" k="line_color"/>
+              <prop v="dash dot 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="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -174,23 +816,71 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" type="line" alpha="1">
-            <layer pass="0" locked="0" enabled="1" class="SimpleLine">
-              <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="94,89,55,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="1.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="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <symbol force_rhr="0" alpha="1" name="1" type="line" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="94,89,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="94,89,55,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="1.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="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -205,20 +895,98 @@
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
+        </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+8" scaleDependency="Area" opacity="1" sizeType="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penColor="#000000" barWidth="5" minimumSize="0" enabled="0" rotationOffset="270" minScaleDenominator="1" penAlpha="255" lineSizeType="MM" diagramOrientation="Up" height="15" scaleBasedVisibility="0" width="15" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0">
-          <fontProperties description="Ubuntu,13,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory showAxis="0" backgroundColor="#ffffff" enabled="0" height="15" scaleBasedVisibility="0" penWidth="0" opacity="1" barWidth="5" sizeType="MM" minScaleDenominator="1" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" rotationOffset="270" penAlpha="255" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" spacing="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" scaleDependency="Area" width="15" direction="1" penColor="#000000" spacingUnit="MM">
+          <fontProperties style="" description="Ubuntu,13,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
+          <axisSymbol>
+            <symbol force_rhr="0" alpha="1" name="" type="line" clip_to_extent="1">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                </Option>
+                <prop v="0" k="align_dash_pattern"/>
+                <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="dash_pattern_offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+                <prop v="MM" k="dash_pattern_offset_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="35,35,35,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0.26" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="trim_distance_end"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_end_unit"/>
+                <prop v="0" k="trim_distance_start"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_start_unit"/>
+                <prop v="0" k="tweak_dash_pattern_on_corners"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="10" zIndex="0" obstacle="0" dist="0">
+      <DiagramLayerSettings obstacle="0" showAll="1" placement="2" dist="0" zIndex="0" priority="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
             <Option name="name" type="QString" value=""/>
@@ -233,8 +1001,14 @@
           </Option>
         </properties>
       </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -244,7 +1018,7 @@
             </config>
           </editWidget>
         </field>
-        <field name="Value">
+        <field name="Value" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -256,35 +1030,39 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="Value" index="1"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="Value"/>
       </aliases>
-      <excludeAttributesWMS/>
-      <excludeAttributesWFS/>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="Value" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="Value"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Value" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Name" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Value" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="Value"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="Value" exp="" desc=""/>
       </constraintExpressions>
+      <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="Name" type="field" hidden="0" width="-1"/>
-          <column name="Value" type="field" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column name="Blocked" type="field" hidden="0" width="-1"/>
-          <column name="Situation" type="field" hidden="0" width="-1"/>
-          <column name="BlockStart" type="field" hidden="0" width="-1"/>
+          <column hidden="0" width="-1" name="Name" type="field"/>
+          <column hidden="0" width="-1" name="Value" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" name="Blocked" type="field"/>
+          <column hidden="0" width="-1" name="Situation" type="field"/>
+          <column hidden="0" width="-1" name="BlockStart" type="field"/>
         </columns>
       </attributetableconfig>
-      <editform>../src/quickgui/app/qgis-data</editform>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>../src/quickgui/app/qgis-data</editforminitfilepath>
@@ -308,23 +1086,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable/>
-      <labelOnTop/>
-      <widgets/>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <expressionfields/>
+      <labelOnTop/>
+      <reuseLastValue/>
+      <dataDefinedFieldProperties/>
+      <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" autoRefreshEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" type="vector" simplifyMaxScale="1" maxScale="1" readOnly="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+8" simplifyAlgorithm="0" geometry="Point" labelsEnabled="1">
+    <maplayer autoRefreshTime="0" styleCategories="AllStyleCategories" type="vector" refreshOnNotifyMessage="" geometry="Point" autoRefreshEnabled="0" simplifyLocal="1" simplifyAlgorithm="0" wkbType="Point" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" labelsEnabled="1" maxScale="1" readOnly="0" minScale="100000000" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-118.88888888888877204</xmin>
         <ymin>22.80020703933767834</ymin>
         <xmax>-83.33333333333315807</xmax>
         <ymax>46.87198067632875365</ymax>
       </extent>
+      <wgs84extent>
+        <xmin>-118.88888888888877204</xmin>
+        <ymin>22.80020703933767834</ymin>
+        <xmax>-83.33333333333315807</xmax>
+        <ymax>46.87198067632875365</ymax>
+      </wgs84extent>
       <id>points20151123133104693</id>
       <datasource>./points.shp</datasource>
       <keywordList>
@@ -333,13 +1114,14 @@ def my_form_open(dialog, layer, feature):
       <layername>Planes</layername>
       <srs>
         <spatialrefsys>
+          <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
           <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>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
@@ -350,10 +1132,12 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <links/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys>
+            <wkt></wkt>
             <proj4></proj4>
             <srsid>0</srsid>
             <srid>0</srid>
@@ -365,7 +1149,6 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent/>
-        <links/>
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
@@ -376,32 +1159,72 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="categorizedSymbol" enableorderby="0" attr="Class" symbollevels="0" forceraster="0">
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" durationUnit="min" accumulate="0" startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" startField="" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <renderer-v2 attr="Class" enableorderby="0" symbollevels="0" type="categorizedSymbol" forceraster="0">
         <categories>
-          <category symbol="0" label="B52" value="B52" render="true"/>
-          <category symbol="1" label="Biplane" value="Biplane" render="true"/>
-          <category symbol="2" label="Jet" value="Jet" render="true"/>
+          <category label="B52" value="B52" render="true" symbol="0"/>
+          <category label="Biplane" value="Biplane" render="true" symbol="1"/>
+          <category label="Jet" value="Jet" render="true" symbol="2"/>
         </categories>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" alpha="1">
-            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="189,189,189,255"/>
-              <prop k="fixedAspectRatio" v="0"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="name" v="gpsicons/plane.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="11"/>
-              <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"/>
+          <symbol force_rhr="0" alpha="1" name="0" type="marker" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="189,189,189,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="gpsicons/plane.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="parameters"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="11"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <prop v="0" k="angle"/>
+              <prop v="189,189,189,255" k="color"/>
+              <prop v="0" k="fixedAspectRatio"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="gpsicons/plane.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="" k="parameters"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="11" 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"/>
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -417,25 +1240,53 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" type="marker" alpha="1">
-            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="124,124,124,255"/>
-              <prop k="fixedAspectRatio" v="0"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="name" v="transport/transport_airport.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="18"/>
-              <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"/>
+          <symbol force_rhr="0" alpha="1" name="1" type="marker" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="124,124,124,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_airport.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="parameters"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="18"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <prop v="0" k="angle"/>
+              <prop v="124,124,124,255" k="color"/>
+              <prop v="0" k="fixedAspectRatio"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="transport/transport_airport.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="" k="parameters"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="18" 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"/>
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -451,25 +1302,53 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="2" clip_to_extent="1" type="marker" alpha="1">
-            <layer pass="0" locked="0" enabled="1" class="SvgMarker">
-              <prop k="angle" v="0"/>
-              <prop k="color" v="178,223,138,255"/>
-              <prop k="fixedAspectRatio" v="0"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="name" v="transport/transport_airport2.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="11"/>
-              <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"/>
+          <symbol force_rhr="0" alpha="1" name="2" type="marker" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="178,223,138,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_airport2.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="parameters"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="11"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <prop v="0" k="angle"/>
+              <prop v="178,223,138,255" k="color"/>
+              <prop v="0" k="fixedAspectRatio"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="transport/transport_airport2.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="" k="parameters"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="11" 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"/>
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -490,20 +1369,98 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
+        </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+8" scaleDependency="Area" opacity="1" sizeType="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penColor="#000000" barWidth="5" minimumSize="0" enabled="0" rotationOffset="270" minScaleDenominator="1" penAlpha="255" lineSizeType="MM" diagramOrientation="Up" height="15" scaleBasedVisibility="0" width="15" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0">
-          <fontProperties description="Ubuntu,13,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory showAxis="0" backgroundColor="#ffffff" enabled="0" height="15" scaleBasedVisibility="0" penWidth="0" opacity="1" barWidth="5" sizeType="MM" minScaleDenominator="1" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" rotationOffset="270" penAlpha="255" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" spacing="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" scaleDependency="Area" width="15" direction="1" penColor="#000000" spacingUnit="MM">
+          <fontProperties style="" description="Ubuntu,13,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
+          <axisSymbol>
+            <symbol force_rhr="0" alpha="1" name="" type="line" clip_to_extent="1">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                </Option>
+                <prop v="0" k="align_dash_pattern"/>
+                <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="dash_pattern_offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+                <prop v="MM" k="dash_pattern_offset_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="35,35,35,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0.26" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="trim_distance_end"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_end_unit"/>
+                <prop v="0" k="trim_distance_start"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_start_unit"/>
+                <prop v="0" k="tweak_dash_pattern_on_corners"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="10" zIndex="0" obstacle="0" dist="0">
+      <DiagramLayerSettings obstacle="0" showAll="1" placement="0" dist="0" zIndex="0" priority="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
             <Option name="name" type="QString" value=""/>
@@ -518,8 +1475,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
       <fieldConfiguration>
-        <field name="Class">
+        <field name="Class" configurationFlags="None">
           <editWidget type="ValueMap">
             <config>
               <Option type="Map">
@@ -532,7 +1495,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="Heading">
+        <field name="Heading" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -542,7 +1505,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="Importance">
+        <field name="Importance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -552,7 +1515,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="Pilots">
+        <field name="Pilots" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -562,7 +1525,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="Cabin Crew">
+        <field name="Cabin Crew" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -572,7 +1535,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="Staff">
+        <field name="Staff" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -584,52 +1547,58 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Class" index="0"/>
-        <alias name="" field="Heading" index="1"/>
-        <alias name="" field="Importance" index="2"/>
-        <alias name="" field="Pilots" index="3"/>
-        <alias name="" field="Cabin Crew" index="4"/>
-        <alias name="" field="Staff" index="5"/>
+        <alias index="0" name="" field="Class"/>
+        <alias index="1" name="" field="Heading"/>
+        <alias index="2" name="" field="Importance"/>
+        <alias index="3" name="" field="Pilots"/>
+        <alias index="4" name="" field="Cabin Crew"/>
+        <alias index="5" name="" field="Staff"/>
       </aliases>
-      <excludeAttributesWMS/>
-      <excludeAttributesWFS/>
       <defaults>
-        <default field="Class" applyOnUpdate="0" expression=""/>
-        <default field="Heading" applyOnUpdate="0" expression=""/>
-        <default field="Importance" applyOnUpdate="0" expression=""/>
-        <default field="Pilots" applyOnUpdate="0" expression=""/>
-        <default field="Cabin Crew" applyOnUpdate="0" expression=""/>
-        <default field="Staff" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="Class"/>
+        <default expression="" applyOnUpdate="0" field="Heading"/>
+        <default expression="" applyOnUpdate="0" field="Importance"/>
+        <default expression="" applyOnUpdate="0" field="Pilots"/>
+        <default expression="" applyOnUpdate="0" field="Cabin Crew"/>
+        <default expression="" applyOnUpdate="0" field="Staff"/>
       </defaults>
       <constraints>
-        <constraint field="Class" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Heading" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Importance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Pilots" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Cabin Crew" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Staff" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Class" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Heading" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Importance" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Pilots" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Cabin Crew" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Staff" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Class"/>
-        <constraint exp="" desc="" field="Heading"/>
-        <constraint exp="" desc="" field="Importance"/>
-        <constraint exp="" desc="" field="Pilots"/>
-        <constraint exp="" desc="" field="Cabin Crew"/>
-        <constraint exp="" desc="" field="Staff"/>
+        <constraint field="Class" exp="" desc=""/>
+        <constraint field="Heading" exp="" desc=""/>
+        <constraint field="Importance" exp="" desc=""/>
+        <constraint field="Pilots" exp="" desc=""/>
+        <constraint field="Cabin Crew" exp="" desc=""/>
+        <constraint field="Staff" exp="" desc=""/>
       </constraintExpressions>
-      <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="Class" type="field" hidden="0" width="-1"/>
-          <column name="Heading" type="field" hidden="0" width="-1"/>
-          <column name="Importance" type="field" hidden="0" width="-1"/>
-          <column name="Pilots" type="field" hidden="0" width="-1"/>
-          <column name="Cabin Crew" type="field" hidden="0" width="-1"/>
-          <column name="Staff" type="field" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" width="-1" name="Class" type="field"/>
+          <column hidden="0" width="-1" name="Heading" type="field"/>
+          <column hidden="0" width="-1" name="Importance" type="field"/>
+          <column hidden="0" width="-1" name="Pilots" type="field"/>
+          <column hidden="0" width="-1" name="Cabin Crew" type="field"/>
+          <column hidden="0" width="-1" name="Staff" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
-      <editform>../src/quickgui/app/qgis-data</editform>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>../src/quickgui/app/qgis-data</editforminitfilepath>
@@ -654,22 +1623,25 @@ def my_form_open(dialog, layer, feature):
       <editorlayout>generatedlayout</editorlayout>
       <editable/>
       <labelOnTop/>
+      <reuseLastValue/>
+      <dataDefinedFieldProperties/>
       <widgets/>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <expressionfields/>
       <previewExpression>COALESCE( "Class", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" autoRefreshEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" type="vector" simplifyMaxScale="1" maxScale="1" readOnly="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+8" simplifyAlgorithm="0" geometry="Polygon" labelsEnabled="1">
+    <maplayer autoRefreshTime="0" styleCategories="AllStyleCategories" type="vector" refreshOnNotifyMessage="" geometry="Polygon" autoRefreshEnabled="0" simplifyLocal="1" simplifyAlgorithm="0" wkbType="MultiPolygon" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" labelsEnabled="1" maxScale="1" readOnly="0" minScale="100000000" simplifyMaxScale="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-118.92286230599032137</xmin>
         <ymin>24.50786971868489061</ymin>
         <xmax>-83.79001199101509201</xmax>
         <ymax>46.72617265077044379</ymax>
       </extent>
+      <wgs84extent>
+        <xmin>-118.92286230599032137</xmin>
+        <ymin>24.50786971868489061</ymin>
+        <xmax>-83.79001199101509201</xmax>
+        <ymax>46.72617265077044379</ymax>
+      </wgs84extent>
       <id>polys20151123133114244</id>
       <datasource>./polys.shp</datasource>
       <keywordList>
@@ -678,13 +1650,14 @@ def my_form_open(dialog, layer, feature):
       <layername>Land</layername>
       <srs>
         <spatialrefsys>
+          <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
           <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>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
@@ -695,10 +1668,12 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <links/>
         <fees></fees>
         <encoding></encoding>
         <crs>
           <spatialrefsys>
+            <wkt></wkt>
             <proj4></proj4>
             <srsid>0</srsid>
             <srid>0</srid>
@@ -710,7 +1685,6 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent/>
-        <links/>
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
@@ -721,25 +1695,57 @@ def my_form_open(dialog, layer, feature):
         <map-layer-style name="default"/>
       </map-layer-style-manager>
       <auxiliaryLayer/>
-      <renderer-v2 type="categorizedSymbol" enableorderby="0" attr="Name" symbollevels="0" forceraster="0">
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" durationUnit="min" accumulate="0" startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" startField="" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <renderer-v2 attr="Name" enableorderby="0" symbollevels="0" type="categorizedSymbol" forceraster="0">
         <categories>
-          <category symbol="0" label="Dam" value="Dam" render="true"/>
-          <category symbol="1" label="Lake" value="Lake" render="true"/>
+          <category label="Dam" value="Dam" render="true" symbol="0"/>
+          <category label="Lake" value="Lake" render="true" symbol="1"/>
         </categories>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" alpha="1">
-            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="118,191,227,132"/>
-              <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="31,120,180,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol force_rhr="0" alpha="1" name="0" type="fill" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="118,191,227,132"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="31,120,180,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.66"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="118,191,227,132" 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="31,120,180,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -749,19 +1755,39 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol name="1" clip_to_extent="1" type="fill" alpha="1">
-            <layer pass="0" locked="0" enabled="1" class="SimpleFill">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="110,194,217,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="144,144,144,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.66"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
+          <symbol force_rhr="0" alpha="1" name="1" type="fill" clip_to_extent="1">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="110,194,217,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="144,144,144,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.66"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="110,194,217,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="144,144,144,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.66" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -776,20 +1802,98 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
+        </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Pie" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+8" scaleDependency="Area" opacity="1" sizeType="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" penColor="#000000" barWidth="5" minimumSize="0" enabled="0" rotationOffset="270" minScaleDenominator="1" penAlpha="255" lineSizeType="MM" diagramOrientation="Up" height="15" scaleBasedVisibility="0" width="15" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0">
-          <fontProperties description="Ubuntu,13,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute color="#000000" field="" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Pie">
+        <DiagramCategory showAxis="0" backgroundColor="#ffffff" enabled="0" height="15" scaleBasedVisibility="0" penWidth="0" opacity="1" barWidth="5" sizeType="MM" minScaleDenominator="1" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" rotationOffset="270" penAlpha="255" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" spacing="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" scaleDependency="Area" width="15" direction="1" penColor="#000000" spacingUnit="MM">
+          <fontProperties style="" description="Ubuntu,13,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" label="" field=""/>
+          <axisSymbol>
+            <symbol force_rhr="0" alpha="1" name="" type="line" clip_to_extent="1">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                </Option>
+                <prop v="0" k="align_dash_pattern"/>
+                <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="dash_pattern_offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+                <prop v="MM" k="dash_pattern_offset_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="35,35,35,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0.26" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="trim_distance_end"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_end_unit"/>
+                <prop v="0" k="trim_distance_start"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_start_unit"/>
+                <prop v="0" k="tweak_dash_pattern_on_corners"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="10" zIndex="0" obstacle="0" dist="0">
+      <DiagramLayerSettings obstacle="0" showAll="1" placement="0" dist="0" zIndex="0" priority="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
             <Option name="name" type="QString" value=""/>
@@ -804,8 +1908,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="ValueMap">
             <config>
               <Option type="Map">
@@ -817,7 +1927,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="Value">
+        <field name="Value" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -829,32 +1939,36 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="Value" index="1"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="Value"/>
       </aliases>
-      <excludeAttributesWMS/>
-      <excludeAttributesWFS/>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="Value" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="Value"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Value" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Name" exp_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" unique_strength="0" field="Value" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="Value"/>
+        <constraint field="Name" exp="" desc=""/>
+        <constraint field="Value" exp="" desc=""/>
       </constraintExpressions>
+      <expressionfields/>
       <attributeactions/>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="Name" type="field" hidden="0" width="-1"/>
-          <column name="Value" type="field" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" width="-1" name="Name" type="field"/>
+          <column hidden="0" width="-1" name="Value" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
-      <editform>../src/quickgui/app/qgis-data</editform>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>../src/quickgui/app/qgis-data</editforminitfilepath>
@@ -879,12 +1993,9 @@ def my_form_open(dialog, layer, feature):
       <editorlayout>generatedlayout</editorlayout>
       <editable/>
       <labelOnTop/>
+      <reuseLastValue/>
+      <dataDefinedFieldProperties/>
       <widgets/>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <expressionfields/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
@@ -893,126 +2004,229 @@ def my_form_open(dialog, layer, feature):
     <layer id="points20151123133104693"/>
     <layer id="polys20151123133114244"/>
     <layer id="lines20151123133101198"/>
+    <layer id="airports_3c14ef82_e3d0_440d_a8ce_48455d0d700a"/>
+    <layer id="airport_towers_701598d1_bc0c_4378_9524_9a7b66c0a10c"/>
   </layerorder>
   <properties>
-    <WMSPrecision type="QString">8</WMSPrecision>
-    <WMSContactMail type="QString"></WMSContactMail>
-    <WMSFees type="QString">conditions unknown</WMSFees>
-    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
-    <Paths>
-      <Absolute type="bool">false</Absolute>
-    </Paths>
-    <WMSUrl type="QString"></WMSUrl>
-    <Legend>
-      <filterByMap type="bool">false</filterByMap>
-    </Legend>
-    <WMSContactPosition type="QString"></WMSContactPosition>
-    <ddt2>
-      <designs type="QString"></designs>
-    </ddt2>
-    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
-    <WMSContactPerson type="QString"></WMSContactPerson>
-    <WMSOnlineResource type="QString"></WMSOnlineResource>
-    <WFSTLayers>
-      <Insert type="QStringList"/>
-      <Update type="QStringList"/>
-      <Delete type="QStringList"/>
-    </WFSTLayers>
-    <Variables>
-      <variableValues type="QStringList"/>
-      <variableNames type="QStringList"/>
-    </Variables>
-    <PositionPrecision>
-      <DegreeFormat type="QString">MU</DegreeFormat>
-      <DecimalPlaces type="int">2</DecimalPlaces>
-      <Automatic type="bool">true</Automatic>
-    </PositionPrecision>
-    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
-    <Macros>
-      <pythonCode type="QString"></pythonCode>
-    </Macros>
-    <WMSContactOrganization type="QString"></WMSContactOrganization>
-    <Identify>
-      <disabledLayers type="QStringList"/>
-    </Identify>
     <DefaultStyles>
-      <ColorRamp type="QString"></ColorRamp>
       <AlphaInt type="int">255</AlphaInt>
-      <Marker type="QString"></Marker>
-      <Line type="QString"></Line>
+      <ColorRamp type="QString"></ColorRamp>
       <Fill type="QString"></Fill>
+      <Line type="QString"></Line>
+      <Marker type="QString"></Marker>
+      <Opacity type="double">0</Opacity>
       <RandomColors type="bool">true</RandomColors>
     </DefaultStyles>
-    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
-    <WMSServiceTitle type="QString"></WMSServiceTitle>
-    <WCSLayers type="QStringList"/>
-    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
-    <SpatialRefSys>
-      <ProjectCrs type="QString">EPSG:4326</ProjectCrs>
-      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
-      <ProjectCRSID type="int">3452</ProjectCRSID>
-      <ProjectCRSProj4String type="QString">+proj=longlat +datum=WGS84 +no_defs</ProjectCRSProj4String>
-    </SpatialRefSys>
-    <Measure>
-      <Ellipsoid type="QString">NONE</Ellipsoid>
-    </Measure>
-    <WMSKeywordList type="QStringList">
-      <value></value>
-    </WMSKeywordList>
-    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
-    <WMSContactPhone type="QString"></WMSContactPhone>
-    <WFSLayers type="QStringList"/>
-    <Measurement>
-      <AreaUnits type="QString">m2</AreaUnits>
-      <DistanceUnits type="QString">meters</DistanceUnits>
-    </Measurement>
     <Digitizing>
-      <DefaultSnapType type="QString">to vertex and segment</DefaultSnapType>
+      <AvoidIntersectionsList type="QStringList"/>
+      <AvoidIntersectionsMode type="int">2</AvoidIntersectionsMode>
+      <DefaultSnapTolerance type="double">20</DefaultSnapTolerance>
       <DefaultSnapToleranceUnit type="int">1</DefaultSnapToleranceUnit>
+      <DefaultSnapType type="QString">to vertex and segment</DefaultSnapType>
+      <LayerSnapToList type="QStringList">
+        <value>to_vertex_and_segment</value>
+        <value>to_vertex_and_segment</value>
+        <value>to_vertex_and_segment</value>
+      </LayerSnapToList>
+      <LayerSnappingEnabledList type="QStringList">
+        <value>enabled</value>
+        <value>enabled</value>
+        <value>enabled</value>
+      </LayerSnappingEnabledList>
       <LayerSnappingList type="QStringList">
         <value>lines20151123133101198</value>
         <value>points20151123133104693</value>
         <value>polys20151123133114244</value>
       </LayerSnappingList>
-      <DefaultSnapTolerance type="double">20</DefaultSnapTolerance>
       <LayerSnappingToleranceList type="QStringList">
         <value>20.000000</value>
         <value>20.000000</value>
         <value>20.000000</value>
       </LayerSnappingToleranceList>
-      <LayerSnapToList type="QStringList">
-        <value>to_vertex_and_segment</value>
-        <value>to_vertex_and_segment</value>
-        <value>to_vertex_and_segment</value>
-      </LayerSnapToList>
-      <SnappingMode type="QString">current_layer</SnappingMode>
-      <AvoidIntersectionsList type="QStringList"/>
       <LayerSnappingToleranceUnitList type="QStringList">
         <value>1</value>
         <value>1</value>
         <value>1</value>
       </LayerSnappingToleranceUnitList>
-      <LayerSnappingEnabledList type="QStringList">
-        <value>enabled</value>
-        <value>enabled</value>
-        <value>enabled</value>
-      </LayerSnappingEnabledList>
+      <SnappingMode type="QString">current_layer</SnappingMode>
     </Digitizing>
-    <WFSUrl type="QString"></WFSUrl>
-    <WMSImageQuality type="int">90</WMSImageQuality>
     <Gui>
-      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
-      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
+      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
+      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
       <CanvasColorRedPart type="int">255</CanvasColorRedPart>
       <SelectionColorAlphaPart type="int">255</SelectionColorAlphaPart>
-      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
       <SelectionColorBluePart type="int">0</SelectionColorBluePart>
-      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
+      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
+      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
     </Gui>
+    <Identify>
+      <disabledLayers type="QStringList"/>
+    </Identify>
+    <Legend>
+      <filterByMap type="bool">false</filterByMap>
+    </Legend>
+    <Macros>
+      <pythonCode type="QString"></pythonCode>
+    </Macros>
+    <Measure>
+      <Ellipsoid type="QString">NONE</Ellipsoid>
+    </Measure>
+    <Measurement>
+      <AreaUnits type="QString">m2</AreaUnits>
+      <DistanceUnits type="QString">meters</DistanceUnits>
+    </Measurement>
+    <PAL>
+      <CandidatesLinePerCM type="double">5</CandidatesLinePerCM>
+      <CandidatesPolygonPerCM type="double">2.5</CandidatesPolygonPerCM>
+      <DrawRectOnly type="bool">false</DrawRectOnly>
+      <DrawUnplaced type="bool">false</DrawUnplaced>
+      <PlacementEngineVersion type="int">0</PlacementEngineVersion>
+      <SearchMethod type="int">0</SearchMethod>
+      <ShowingAllLabels type="bool">false</ShowingAllLabels>
+      <ShowingCandidates type="bool">false</ShowingCandidates>
+      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
+      <TextFormat type="int">0</TextFormat>
+      <UnplacedColor type="QString">255,0,0,255</UnplacedColor>
+    </PAL>
+    <Paths>
+      <Absolute type="bool">false</Absolute>
+    </Paths>
+    <PositionPrecision>
+      <Automatic type="bool">true</Automatic>
+      <DecimalPlaces type="int">2</DecimalPlaces>
+      <DegreeFormat type="QString">MU</DegreeFormat>
+    </PositionPrecision>
+    <RenderMapTile type="bool">false</RenderMapTile>
+    <SpatialRefSys>
+      <ProjectCRSID type="int">3452</ProjectCRSID>
+      <ProjectCRSProj4String type="QString">+proj=longlat +datum=WGS84 +no_defs</ProjectCRSProj4String>
+      <ProjectCrs type="QString">EPSG:4326</ProjectCrs>
+      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
+    </SpatialRefSys>
+    <Variables>
+      <variableNames type="QStringList"/>
+      <variableValues type="QStringList"/>
+    </Variables>
+    <WCSLayers type="QStringList"/>
     <WCSUrl type="QString"></WCSUrl>
+    <WFSLayers type="QStringList"/>
+    <WFSTLayers>
+      <Delete type="QStringList"/>
+      <Insert type="QStringList"/>
+      <Update type="QStringList"/>
+    </WFSTLayers>
+    <WFSUrl type="QString"></WFSUrl>
+    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
+    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
+    <WMSContactMail type="QString"></WMSContactMail>
+    <WMSContactOrganization type="QString"></WMSContactOrganization>
+    <WMSContactPerson type="QString"></WMSContactPerson>
+    <WMSContactPhone type="QString"></WMSContactPhone>
+    <WMSContactPosition type="QString"></WMSContactPosition>
+    <WMSDefaultMapUnitsPerMm type="double">1</WMSDefaultMapUnitsPerMm>
+    <WMSFeatureInfoUseAttributeFormSettings type="bool">false</WMSFeatureInfoUseAttributeFormSettings>
+    <WMSFees type="QString">conditions unknown</WMSFees>
+    <WMSImageQuality type="int">90</WMSImageQuality>
+    <WMSKeywordList type="QStringList">
+      <value></value>
+    </WMSKeywordList>
+    <WMSMaxAtlasFeatures type="int">1</WMSMaxAtlasFeatures>
+    <WMSOnlineResource type="QString"></WMSOnlineResource>
+    <WMSPrecision type="QString">8</WMSPrecision>
+    <WMSRootName type="QString"></WMSRootName>
+    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
+    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
+    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
+    <WMSServiceTitle type="QString"></WMSServiceTitle>
+    <WMSTileBuffer type="int">0</WMSTileBuffer>
+    <WMSUrl type="QString"></WMSUrl>
+    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
+    <WMTSGrids>
+      <CRS type="QStringList"/>
+      <Config type="QStringList"/>
+    </WMTSGrids>
+    <WMTSJpegLayers>
+      <Group type="QStringList"/>
+      <Layer type="QStringList"/>
+      <Project type="bool">false</Project>
+    </WMTSJpegLayers>
+    <WMTSLayers>
+      <Group type="QStringList"/>
+      <Layer type="QStringList"/>
+      <Project type="bool">false</Project>
+    </WMTSLayers>
+    <WMTSMinScale type="int">5000</WMTSMinScale>
+    <WMTSPngLayers>
+      <Group type="QStringList"/>
+      <Layer type="QStringList"/>
+      <Project type="bool">false</Project>
+    </WMTSPngLayers>
+    <WMTSUrl type="QString"></WMTSUrl>
+    <ddt2>
+      <designs type="QString"></designs>
+    </ddt2>
   </properties>
+  <dataDefinedServerProperties>
+    <Option type="Map">
+      <Option name="name" type="QString" value=""/>
+      <Option name="properties"/>
+      <Option name="type" type="QString" value="collection"/>
+    </Option>
+  </dataDefinedServerProperties>
   <visibility-presets/>
   <transformContext/>
+  <projectMetadata>
+    <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/>
+    <author></author>
+    <creation>2000-01-01T00:00:00</creation>
+  </projectMetadata>
   <Annotations/>
   <Layouts/>
+  <Bookmarks/>
+  <ProjectViewSettings UseProjectScales="0">
+    <Scales/>
+    <DefaultViewExtent xmax="-82.46631384217860727" ymax="53.45282776997493102" xmin="-119.35580667290255974" ymin="20.72991677412613853">
+      <spatialrefsys>
+        <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <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>EPSG:7030</ellipsoidacronym>
+        <geographicflag>true</geographicflag>
+      </spatialrefsys>
+    </DefaultViewExtent>
+  </ProjectViewSettings>
+  <ProjectTimeSettings timeStepUnit="h" frameRate="1" cumulativeTemporalRange="0" timeStep="1"/>
+  <ProjectDisplaySettings>
+    <BearingFormat id="bearing">
+      <Option type="Map">
+        <Option name="decimal_separator" type="QChar" value=""/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="direction_format" type="int" value="0"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="QChar" value=""/>
+      </Option>
+    </BearingFormat>
+  </ProjectDisplaySettings>
 </qgis>