From f15c59607a440add2732b0912f0349e203e4a38e Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Sat, 25 Aug 2012 06:46:55 +0200
Subject: [PATCH] In progress keyword multilayer support updates

---
 .idea/workspace.xml          | 341 +++++++++++++++--------------------
 safe/engine/test_engine.py   |   1 -
 safe_qgis/keyword_io.py      |  71 +++++++-
 safe_qgis/keywords_dialog.py |  10 +-
 safe_qgis/safe_interface.py  |   5 +-
 5 files changed, 221 insertions(+), 207 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0acab11093..99b3c47aa0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,41 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6815cb5a-e0e1-41b6-b799-f6f1722d6a68" name="Default" comment="Added link to complete list of pylint codes">
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/BNPB_flood_building_impact.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/BNPB_flood_building_impact.py" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/__init__.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/__init__.py" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/ashload_population_impact.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/ashload_population_impact.py" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/flood_population_evacuation_worldbank_request.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/flood_population_evacuation_worldbank_request.py" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/general_volcanic_population_impact.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/general_volcanic_population_impact.py" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/mappings.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/mappings.py" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/tsunami_building_impact.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/tsunami_building_impact.py" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/safe/impact_functions/experimental/tsunami_population_impact.py" afterPath="$PROJECT_DIR$/extras/retired_impact_functions/tsunami_population_impact.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Makefile" afterPath="$PROJECT_DIR$/Makefile" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/metadata.txt" afterPath="$PROJECT_DIR$/metadata.txt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pylintrc" afterPath="$PROJECT_DIR$/pylintrc" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/__init__.py" afterPath="$PROJECT_DIR$/safe/__init__.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/common/version.py" afterPath="$PROJECT_DIR$/safe/common/version.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/engine/core.py" afterPath="$PROJECT_DIR$/safe/engine/core.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/engine/test_engine.py" afterPath="$PROJECT_DIR$/safe/engine/test_engine.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/__init__.py" afterPath="$PROJECT_DIR$/safe/impact_functions/__init__.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/core.py" afterPath="$PROJECT_DIR$/safe/impact_functions/core.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/earthquake/earthquake_impact_on_women.py" afterPath="$PROJECT_DIR$/safe/impact_functions/earthquake/earthquake_impact_on_women.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/earthquake/itb_building_impact_model.py" afterPath="$PROJECT_DIR$/safe/impact_functions/earthquake/itb_building_impact_model.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/earthquake/itb_earthquake_fatality_model.py" afterPath="$PROJECT_DIR$/safe/impact_functions/earthquake/itb_earthquake_fatality_model.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/generic/categorised_hazard_building_impact.py" afterPath="$PROJECT_DIR$/safe/impact_functions/generic/categorised_hazard_building_impact.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/inundation/flood_population_evacuation_polygon_hazard.py" afterPath="$PROJECT_DIR$/safe/impact_functions/inundation/flood_population_evacuation_polygon_hazard.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/mappings.py" afterPath="$PROJECT_DIR$/safe/impact_functions/mappings.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/test_mappings.py" afterPath="$PROJECT_DIR$/safe/impact_functions/test_mappings.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/test_plugin_core.py" afterPath="$PROJECT_DIR$/safe/impact_functions/test_plugin_core.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/test_plugins.py" afterPath="$PROJECT_DIR$/safe/impact_functions/test_plugins.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/test_real_impact_functions.py" afterPath="$PROJECT_DIR$/safe/impact_functions/test_real_impact_functions.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/impact_functions/utilities.py" afterPath="$PROJECT_DIR$/safe/impact_functions/utilities.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/storage/raster.py" afterPath="$PROJECT_DIR$/safe/storage/raster.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/storage/test_io.py" afterPath="$PROJECT_DIR$/safe/storage/test_io.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/storage/utilities.py" afterPath="$PROJECT_DIR$/safe/storage/utilities.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe/storage/vector.py" afterPath="$PROJECT_DIR$/safe/storage/vector.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/resources.py" afterPath="$PROJECT_DIR$/safe_qgis/resources.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/resources_rc.py" afterPath="$PROJECT_DIR$/safe_qgis/resources_rc.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/test_utilities.py" afterPath="$PROJECT_DIR$/safe_qgis/test_utilities.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/keyword_io.py" afterPath="$PROJECT_DIR$/safe_qgis/keyword_io.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/keywords_dialog.py" afterPath="$PROJECT_DIR$/safe_qgis/keywords_dialog.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/safe_qgis/safe_interface.py" afterPath="$PROJECT_DIR$/safe_qgis/safe_interface.py" />
     </list>
     <ignored path="inasafe-dev.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -56,78 +26,73 @@
   <component name="DaemonCodeAnalyzer">
     <disable_hints />
   </component>
+  <component name="DatabaseView">
+    <flatten value="false" />
+    <groupTables value="false" />
+  </component>
   <component name="FavoritesManager">
     <favorites_list name="inasafe-dev" />
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="dock.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/safe_qgis/dock.py">
+      <file leaf-file-name="keywords_dialog.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/safe_qgis/keywords_dialog.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="988" column="52" selection-start="38113" selection-end="38131" vertical-scroll-proportion="0.0">
+            <state line="519" column="0" selection-start="19513" selection-end="19513" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="clipper.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/safe_qgis/clipper.py">
+      <file leaf-file-name="keyword_io.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/safe_qgis/keyword_io.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="388" column="0" selection-start="14926" selection-end="14926" vertical-scroll-proportion="0.0">
+            <state line="360" column="42" selection-start="13249" selection-end="13249" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="test_dock.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/safe_qgis/test_dock.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="568" column="44" selection-start="22345" selection-end="22345" vertical-scroll-proportion="10.338983">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="utilities.py" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/safe/common/utilities.py">
+      <file leaf-file-name="test_utilities.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/safe/storage/test_utilities.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="85" column="4" selection-start="2226" selection-end="2226" vertical-scroll-proportion="0.92849034">
+            <state line="61" column="59" selection-start="2123" selection-end="2124" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="exceptions.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/safe/common/exceptions.py">
+      <file leaf-file-name="test_vector.py" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/safe/storage/test_vector.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="22" column="0" selection-start="663" selection-end="663" vertical-scroll-proportion="0.0">
+            <state line="67" column="33" selection-start="2624" selection-end="2624" vertical-scroll-proportion="0.72420263">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="utilities.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/safe/storage/utilities.py">
+      <file leaf-file-name="test_keyword_io.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/safe_qgis/test_keyword_io.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="42" column="0" selection-start="1376" selection-end="1376" vertical-scroll-proportion="0.0">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="utilities_test.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/safe/storage/utilities_test.py">
+      <file leaf-file-name="safe_interface.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/safe_qgis/safe_interface.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+            <state line="255" column="4" selection-start="8754" selection-end="8754" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="test_utilities.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/safe/storage/test_utilities.py">
+      <file leaf-file-name="utilities.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/safe/storage/utilities.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="48" column="53" selection-start="1579" selection-end="1597" vertical-scroll-proportion="0.0">
+            <state line="198" column="4" selection-start="6370" selection-end="6370" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -146,30 +111,30 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/safe/storage/vector.py" />
-        <option value="$PROJECT_DIR$/safe/impact_functions/inundation/flood_OSM_building_impact.py" />
-        <option value="$PROJECT_DIR$/safe/api.py" />
-        <option value="$PROJECT_DIR$/safe_qgis/safe_interface.py" />
-        <option value="$PROJECT_DIR$/safe_qgis/dock.py" />
         <option value="$PROJECT_DIR$/safe_qgis/map.py" />
         <option value="$PROJECT_DIR$/safe_qgis/test_keyword_io.py" />
         <option value="$PROJECT_DIR$/safe_qgis/test_map.py" />
         <option value="$PROJECT_DIR$/safe_qgis/test_dock.py" />
         <option value="$PROJECT_DIR$/safe/storage/test_utilities.py" />
-        <option value="$PROJECT_DIR$/safe/storage/test_vector.py" />
         <option value="$PROJECT_DIR$/safe_qgis/utilities.py" />
         <option value="$PROJECT_DIR$/safe_qgis/clipper.py" />
         <option value="$PROJECT_DIR$/safe/storage/utilities.py" />
         <option value="$PROJECT_DIR$/safe/common/exceptions.py" />
         <option value="$PROJECT_DIR$/safe/common/utilities.py" />
+        <option value="$PROJECT_DIR$/scripts/inasafe-install" />
+        <option value="$PROJECT_DIR$/safe_qgis/safe_interface.py" />
+        <option value="$PROJECT_DIR$/safe_qgis/keywords_dialog.py" />
+        <option value="$PROJECT_DIR$/safe_qgis/keyword_io.py" />
+        <option value="$PROJECT_DIR$/safe/storage/test_vector.py" />
+        <option value="$PROJECT_DIR$/safe/engine/test_engine.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-1" />
     <option name="y" value="26" />
-    <option name="width" value="1922" />
-    <option name="height" value="1055" />
+    <option name="width" value="1368" />
+    <option name="height" value="743" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -225,6 +190,20 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="inasafe-dev" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="inasafe-dev" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scripts" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="inasafe-dev" />
@@ -267,7 +246,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="storage" />
+              <option name="myItemId" value="engine" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -285,7 +264,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="common" />
+              <option name="myItemId" value="engine" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="impact_functions_for_testing" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -296,11 +279,11 @@
   <component name="PropertiesComponent">
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="recentsLimit" value="5" />
     <property name="options.lastSelected" value="reference.settingsdialog.IDE.editor.colors.Font" />
+    <property name="recentsLimit" value="5" />
     <property name="last_opened_file_path" value="/tmp" />
-    <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.31698564" />
+    <property name="options.searchVisible" value="true" />
   </component>
   <component name="PyConsoleOptionsProvider">
     <option name="myPythonConsoleState">
@@ -325,8 +308,8 @@
       <recent name="$PROJECT_DIR$/safe/common" />
     </key>
   </component>
-  <component name="RunManager" selected="Python's test.Nosetests in test_utilities">
-    <configuration default="false" name="Nosetests in test_utilities" type="tests" factoryName="Nosetests" temporary="true">
+  <component name="RunManager" selected="Python's test.Nosetests in Test_Engine.test_interpolation_tsunami">
+    <configuration default="false" name="Nosetests in test_vector" type="tests" factoryName="Nosetests" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs />
@@ -335,7 +318,7 @@
       <option name="IS_MODULE_SDK" value="true" />
       <module name="inasafe-dev" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/storage/test_utilities.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/storage/test_vector.py" />
       <option name="CLASS_NAME" value="" />
       <option name="METHOD_NAME" value="" />
       <option name="FOLDER_NAME" value="" />
@@ -344,13 +327,13 @@
       <option name="USE_PATTERN" value="false" />
       <option name="PARAMS" value="" />
       <option name="USE_PARAM" value="false" />
-      <RunnerSettings RunnerId="PyDebugRunner" />
+      <RunnerSettings RunnerId="PythonCover" />
       <RunnerSettings RunnerId="PythonRunner" />
-      <ConfigurationWrapper RunnerId="PyDebugRunner" />
+      <ConfigurationWrapper RunnerId="PythonCover" />
       <ConfigurationWrapper RunnerId="PythonRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="Nosetests in CommonUtilitiesTest" type="tests" factoryName="Nosetests" temporary="true">
+    <configuration default="false" name="Nosetests in CommonUtilitiesTest.test_write_keywords" type="tests" factoryName="Nosetests" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs />
@@ -361,9 +344,9 @@
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/storage/test_utilities.py" />
       <option name="CLASS_NAME" value="CommonUtilitiesTest" />
-      <option name="METHOD_NAME" value="test_read_keywords" />
+      <option name="METHOD_NAME" value="test_write_keywords" />
       <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_CLASS" />
+      <option name="TEST_TYPE" value="TEST_METHOD" />
       <option name="PATTERN" value="" />
       <option name="USE_PATTERN" value="false" />
       <option name="PARAMS" value="" />
@@ -374,77 +357,73 @@
       <ConfigurationWrapper RunnerId="PythonRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="Nosetests in test_vector" type="tests" factoryName="Nosetests" temporary="true">
+    <configuration default="false" name="Nosetests in DockTest.test_runTsunamiBuildingImpactFunction" type="tests" factoryName="Nosetests" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs />
+      <envs>
+        <env name="QGISPATH" value="/usr/local/qgis1.8" />
+      </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe/storage" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe_qgis" />
       <option name="IS_MODULE_SDK" value="true" />
       <module name="inasafe-dev" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/storage/test_vector.py" />
-      <option name="CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe_qgis/test_dock.py" />
+      <option name="CLASS_NAME" value="DockTest" />
+      <option name="METHOD_NAME" value="test_runTsunamiBuildingImpactFunction" />
       <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="TEST_TYPE" value="TEST_METHOD" />
       <option name="PATTERN" value="" />
       <option name="USE_PATTERN" value="false" />
       <option name="PARAMS" value="" />
       <option name="USE_PARAM" value="false" />
-      <RunnerSettings RunnerId="PythonCover" />
+      <RunnerSettings RunnerId="PyDebugRunner" />
       <RunnerSettings RunnerId="PythonRunner" />
-      <ConfigurationWrapper RunnerId="PythonCover" />
+      <ConfigurationWrapper RunnerId="PyDebugRunner" />
       <ConfigurationWrapper RunnerId="PythonRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="Nosetests in CommonUtilitiesTest.test_write_keywords" type="tests" factoryName="Nosetests" temporary="true">
+    <configuration default="false" name="Nosetests in test_engine" type="tests" factoryName="Nosetests" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs />
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe/storage" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe/engine" />
       <option name="IS_MODULE_SDK" value="true" />
       <module name="inasafe-dev" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/storage/test_utilities.py" />
-      <option name="CLASS_NAME" value="CommonUtilitiesTest" />
-      <option name="METHOD_NAME" value="test_write_keywords" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/engine/test_engine.py" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
       <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_METHOD" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
       <option name="PATTERN" value="" />
       <option name="USE_PATTERN" value="false" />
       <option name="PARAMS" value="" />
       <option name="USE_PARAM" value="false" />
-      <RunnerSettings RunnerId="PyDebugRunner" />
       <RunnerSettings RunnerId="PythonRunner" />
-      <ConfigurationWrapper RunnerId="PyDebugRunner" />
       <ConfigurationWrapper RunnerId="PythonRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="Nosetests in DockTest.test_runTsunamiBuildingImpactFunction" type="tests" factoryName="Nosetests" temporary="true">
+    <configuration default="false" name="Nosetests in Test_Engine.test_interpolation_tsunami" type="tests" factoryName="Nosetests" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="QGISPATH" value="/usr/local/qgis1.8" />
-      </envs>
+      <envs />
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe_qgis" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe/engine" />
       <option name="IS_MODULE_SDK" value="true" />
       <module name="inasafe-dev" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe_qgis/test_dock.py" />
-      <option name="CLASS_NAME" value="DockTest" />
-      <option name="METHOD_NAME" value="test_runTsunamiBuildingImpactFunction" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/engine/test_engine.py" />
+      <option name="CLASS_NAME" value="Test_Engine" />
+      <option name="METHOD_NAME" value="test_interpolation_tsunami" />
       <option name="FOLDER_NAME" value="" />
       <option name="TEST_TYPE" value="TEST_METHOD" />
       <option name="PATTERN" value="" />
       <option name="USE_PATTERN" value="false" />
       <option name="PARAMS" value="" />
       <option name="USE_PARAM" value="false" />
-      <RunnerSettings RunnerId="PyDebugRunner" />
       <RunnerSettings RunnerId="PythonRunner" />
-      <ConfigurationWrapper RunnerId="PyDebugRunner" />
       <ConfigurationWrapper RunnerId="PythonRunner" />
       <method />
     </configuration>
@@ -468,36 +447,36 @@
       <option name="USE_PARAM" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="docs" factoryName="Docutils task">
+    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
       <option name="SDK_HOME" value="" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <module name="inasafe-dev" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="docutils_input_file" value="" />
-      <option name="docutils_output_file" value="" />
-      <option name="docutils_params" value="" />
-      <option name="docutils_task" value="" />
-      <option name="docutils_open_in_browser" value="false" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <option name="MULTIPROCESS" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
+    <configuration default="true" type="docs" factoryName="Docutils task">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
+      <envs />
       <option name="SDK_HOME" value="" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <module name="inasafe-dev" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="MULTIPROCESS" value="false" />
+      <option name="docutils_input_file" value="" />
+      <option name="docutils_output_file" value="" />
+      <option name="docutils_params" value="" />
+      <option name="docutils_task" value="" />
+      <option name="docutils_open_in_browser" value="false" />
       <method />
     </configuration>
     <configuration default="true" type="docs" factoryName="Sphinx task">
@@ -588,12 +567,12 @@
       <item index="3" class="java.lang.String" itemvalue="Python's test.NoseTests GUI I18N" />
       <item index="4" class="java.lang.String" itemvalue="Python's test.NoseTests SAFE_QGIS" />
       <item index="5" class="java.lang.String" itemvalue="Python's test.NoseTests Dock" />
-      <item index="6" class="java.lang.String" itemvalue="Python's test.Nosetests in test_utilities" />
-      <item index="7" class="java.lang.String" itemvalue="Python's test.Nosetests in CommonUtilitiesTest" />
-      <item index="8" class="java.lang.String" itemvalue="Python's test.Nosetests in test_vector" />
-      <item index="9" class="java.lang.String" itemvalue="Python's test.NoseTest VectorTest" />
-      <item index="10" class="java.lang.String" itemvalue="Python's test.Nosetests in CommonUtilitiesTest.test_write_keywords" />
-      <item index="11" class="java.lang.String" itemvalue="Python's test.Nosetests in DockTest.test_runTsunamiBuildingImpactFunction" />
+      <item index="6" class="java.lang.String" itemvalue="Python's test.Nosetests in test_vector" />
+      <item index="7" class="java.lang.String" itemvalue="Python's test.NoseTest VectorTest" />
+      <item index="8" class="java.lang.String" itemvalue="Python's test.Nosetests in CommonUtilitiesTest.test_write_keywords" />
+      <item index="9" class="java.lang.String" itemvalue="Python's test.Nosetests in DockTest.test_runTsunamiBuildingImpactFunction" />
+      <item index="10" class="java.lang.String" itemvalue="Python's test.Nosetests in test_engine" />
+      <item index="11" class="java.lang.String" itemvalue="Python's test.Nosetests in Test_Engine.test_interpolation_tsunami" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
@@ -681,24 +660,24 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1" y="26" width="1922" height="1055" extended-state="6" />
+    <frame x="-1" y="26" width="1368" height="743" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32959402" sideWeight="0.6105611" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32893288" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33663365" sideWeight="0.49786323" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20886752" sideWeight="0.38833883" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20886752" sideWeight="0.6039604" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3323217" sideWeight="0.75711894" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3323217" sideWeight="0.23115578" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28162816" sideWeight="0.6655983" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16115262" sideWeight="0.21922246" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.60946095" sideWeight="0.5261752" order="11" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38943896" sideWeight="0.47008547" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5929648" sideWeight="0.47008547" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Pomodoro" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32663316" sideWeight="0.48504272" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33663365" sideWeight="0.49786323" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32869378" sideWeight="0.49358973" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.59955996" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -777,114 +756,88 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/safe_qgis/safe_interface.py">
+    <entry file="file://$PROJECT_DIR$/safe_qgis/clipper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="40" column="70" selection-start="1545" selection-end="1545" vertical-scroll-proportion="0.3813848">
-          <folding />
-        </state>
+        <state line="388" column="0" selection-start="14925" selection-end="14925" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe/api.py">
+    <entry file="file://$PROJECT_DIR$/scripts/inasafe-install">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="27" column="60" selection-start="1107" selection-end="1107" vertical-scroll-proportion="0.5709421">
-          <folding />
-        </state>
+        <state line="29" column="30" selection-start="1316" selection-end="1316" vertical-scroll-proportion="0.4177515" />
       </provider>
     </entry>
-    <entry file="file:///usr/lib/python2.7/dist-packages/nose/failure.py">
+    <entry file="file://$PROJECT_DIR$/safe/storage/utilities_test.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="0" selection-start="1071" selection-end="1071" vertical-scroll-proportion="0.7205323">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe_qgis/test_utilities.py">
+    <entry file="file://$PROJECT_DIR$/safe/common/exceptions.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="0" selection-start="828" selection-end="828" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="23" column="0" selection-start="664" selection-end="664" vertical-scroll-proportion="0.54824066" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe/storage/test_vector.py">
+    <entry file="file://$PROJECT_DIR$/safe/common/utilities.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="28" column="0" selection-start="824" selection-end="824" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="85" column="0" selection-start="2166" selection-end="2166" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/helpers/pycharm/nose_utils.py">
+    <entry file="file://$PROJECT_DIR$/safe/impact_functions/test_real_impact_functions.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="0" selection-start="2073" selection-end="2073" vertical-scroll-proportion="-4.4832">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.24825175" />
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.PyCharm20/system/python_stubs/-1247972723/qgis/core.py">
+    <entry file="file://$PROJECT_DIR$/safe/engine/core.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3416" column="8" selection-start="95601" selection-end="95601" vertical-scroll-proportion="0.3328">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-8.75" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe_qgis/utilities.py">
+    <entry file="file://$PROJECT_DIR$/safe_qgis/test_dock.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="327" column="0" selection-start="13111" selection-end="13111" vertical-scroll-proportion="0.3328">
-          <folding />
-        </state>
+        <state line="568" column="44" selection-start="22345" selection-end="22345" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe_qgis/test_dock.py">
+    <entry file="file://$PROJECT_DIR$/safe_qgis/keywords_dialog.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="568" column="44" selection-start="22345" selection-end="22345" vertical-scroll-proportion="10.338983">
-          <folding />
-        </state>
+        <state line="519" column="0" selection-start="19513" selection-end="19513" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe/storage/utilities_test.py">
+    <entry file="file://$PROJECT_DIR$/safe_qgis/keyword_io.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="360" column="42" selection-start="13249" selection-end="13249" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/safe/storage/test_utilities.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="53" selection-start="1579" selection-end="1597" vertical-scroll-proportion="0.0">
+        <state line="61" column="59" selection-start="2123" selection-end="2124" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe_qgis/clipper.py">
+    <entry file="file://$PROJECT_DIR$/safe/engine/test_engine.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="388" column="0" selection-start="14926" selection-end="14926" vertical-scroll-proportion="0.0">
+        <state line="39" column="22" selection-start="1697" selection-end="1697" vertical-scroll-proportion="0.039399624">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe_qgis/dock.py">
+    <entry file="file://$PROJECT_DIR$/safe_qgis/test_keyword_io.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="988" column="52" selection-start="38113" selection-end="38131" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe/storage/utilities.py">
+    <entry file="file://$PROJECT_DIR$/safe_qgis/safe_interface.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="0" selection-start="1376" selection-end="1376" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="255" column="4" selection-start="8754" selection-end="8754" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe/common/exceptions.py">
+    <entry file="file://$PROJECT_DIR$/safe/storage/utilities.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="0" selection-start="663" selection-end="663" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="198" column="4" selection-start="6370" selection-end="6370" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/safe/common/utilities.py">
+    <entry file="file://$PROJECT_DIR$/safe/storage/test_vector.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="85" column="4" selection-start="2226" selection-end="2226" vertical-scroll-proportion="0.92849034">
+        <state line="67" column="33" selection-start="2624" selection-end="2624" vertical-scroll-proportion="0.72420263">
           <folding />
         </state>
       </provider>
diff --git a/safe/engine/test_engine.py b/safe/engine/test_engine.py
index b1e9a3094e..d6aa0f8839 100644
--- a/safe/engine/test_engine.py
+++ b/safe/engine/test_engine.py
@@ -39,7 +39,6 @@
 from impact_functions_for_testing import flood_road_impact
 # pylint: enable=W0611
 
-
 def linear_function(x, y):
     """Auxiliary function for use with interpolation test
     """
diff --git a/safe_qgis/keyword_io.py b/safe_qgis/keyword_io.py
index 5b33c9eadc..6c2542f819 100644
--- a/safe_qgis/keyword_io.py
+++ b/safe_qgis/keyword_io.py
@@ -72,7 +72,7 @@ def setKeywordDbPath(self, thePath):
         """
         self.keywordDbPath = str(thePath)
 
-    def readKeywords(self, theLayer, theKeyword=None):
+    def readKeywords(self, theLayer, theKeyword=None, theSubLayer):
         """Read keywords for a datasource and return them as a dictionary.
         This is a wrapper method that will 'do the right thing' to fetch
         keywords for the given datasource. In particular, if the datasource
@@ -82,7 +82,8 @@ def readKeywords(self, theLayer, theKeyword=None):
         Args:
             * theLayer - A QGIS QgsMapLayer instance.
             * theKeyword - optional - will extract only the specified keyword
-              from the keywords dict.
+                  from the keywords dict.
+            * theSubLayer - optional - sublayer to read the keywords for.
         Returns:
             A dict if theKeyword is omitted, otherwise the value for the
             given key if it is present.
@@ -94,9 +95,11 @@ def readKeywords(self, theLayer, theKeyword=None):
         myKeywords = None
         try:
             if myFlag:
-                myKeywords = readKeywordsFromFile(mySource, theKeyword)
+                myKeywords = readKeywordsFromFile(mySource, theKeyword,
+                                                  theSubLayer)
             else:
-                myKeywords = self.readKeywordFromUri(mySource, theKeyword)
+                myKeywords = self.readKeywordFromUri(mySource, theKeyword,
+                                                     theSubLayer)
             return myKeywords
         except Exception:
             raise
@@ -129,7 +132,8 @@ def writeKeywords(self, theLayer, theKeywords):
             raise
 
     def copyKeywords(self, theSourceLayer,
-                     theDestinationFile, theExtraKeywords=None):
+                     theDestinationFile, theExtraKeywords=None,
+                     theSubLayer=None):
         """Helper to copy the keywords file from a source dataset
         to a destination dataset.
 
@@ -155,12 +159,13 @@ def copyKeywords(self, theSourceLayer,
               original keywords from the source layer's keywords file and
               and the extra keywords (which will replace the source layers
               keywords if the key is identical).
+            * theSubLayer - optional - sublayer to read the keywords for.
         Returns:
             None.
         Raises:
             None
         """
-        myKeywords = self.readKeywords(theSourceLayer)
+        myKeywords = self.readKeywords(theSourceLayer, theSubLayer)
         if theExtraKeywords is None:
             theExtraKeywords = {}
         myMessage = self.tr('Expected extraKeywords to be a dictionary. Got %s'
@@ -173,7 +178,7 @@ def copyKeywords(self, theSourceLayer,
         try:
             for key in theExtraKeywords:
                 myKeywords[key] = theExtraKeywords[key]
-            writeKeywordsToFile(myNewDestination, myKeywords)
+            writeKeywordsToFile(myNewDestination, myKeywords, theSubLayer)
         except Exception, e:
             myMessage = self.tr('Failed to copy keywords file from :'
                            '\n%s\nto\%s: %s' %
@@ -323,7 +328,7 @@ def areKeywordsFileBased(self, theLayer):
                           'gdal': True,
                           'gpx': False,
                           'wms': False,
-                          'spatialite': False,
+                          'spatialite': True,
                           'delimitedtext': True,
                           'postgres': False}
         myFileBasedKeywords = False
@@ -331,6 +336,53 @@ def areKeywordsFileBased(self, theLayer):
             myFileBasedKeywords = myProviderDict[myProviderType]
         return myFileBasedKeywords
 
+    def subLayerName(self, theDataSource):
+        """Given datasource, determine its sublayer name.
+
+        Args:
+            theDataSource: str optional. Datasource URI that will be used
+                to determine what the sublayer name is.
+        Returns:
+            str: A string containing the sub layer name or None as applicable.
+
+        Raises:
+            No exceptions raised explicitly, any exceptions will be propogated.
+
+        The sublayer name might be a hash or a physical layer name according
+        to the following logic:
+
+        * If the datasource is a shapefile with no query, the sublayer will be
+          the file basename with the .shp removed and a hash of the subquery
+          gumpf added to the path by QGIS. For example:
+
+            Source        :  c:\tmp\foo.shp
+            Sub layer name: 'foo'
+
+            Source        : c:\tmp\foo.shp|layerid=0|subset="KAB_NAME"
+                             = \'JAKARTA TIMUR\'
+            Sub layer name: foo-7667ds676
+
+        * If the datasource is a sqlite or pg database and there is no sql
+          query provided, the sublayer  will be the table or view name.
+          Examples:
+
+            Source        : dbname=\'c:\tmp\foo.sqlite\' table="osm_buildings"
+                            (Geometry) sql=''
+            Sub Layer Name: osm_buildings
+
+
+        * If the datasource is a sqlite or pg database and there *is* an
+          sql query provided, the sublayer name will be in the format
+          '<table or view name>-<hash>' where the hash is an md5 sum of the
+          query.
+
+        """
+        myURI = QgsDataSourceURI(theDataSource)
+        myDB = str(myURI.database())
+        myDBPath = os.path.split(myDB)[0]
+
+        pass
+
     def getHashForDatasource(self, theDataSource):
         """Given a datasource, return its hash.
 
@@ -440,7 +492,7 @@ def writeKeywordsForUri(self, theUri, theKeywords):
         finally:
             self.closeConnection()
 
-    def readKeywordFromUri(self, theUri, theKeyword=None):
+    def readKeywordFromUri(self, theUri, theKeyword=None, theSubLayer=None):
         """Get metadata from the keywords file associated with a
         non local layer (e.g. postgresql connection).
 
@@ -456,6 +508,7 @@ def readKeywordFromUri(self, theUri, theKeyword=None):
              .e.g. 'dbname=\'osm\' host=localhost port=5432 user=\'foo\'
              password=\'bar\' sslmode=disable key=\'id\' srid=4326
            * keyword - optional - the metadata keyword to retrieve e.g. 'title'
+           * theSubLayer - optional - sublayer to read the keywords for.
 
         Returns:
            A string containing the retrieved value for the keyword if
diff --git a/safe_qgis/keywords_dialog.py b/safe_qgis/keywords_dialog.py
index d955056aab..ca02f07a20 100644
--- a/safe_qgis/keywords_dialog.py
+++ b/safe_qgis/keywords_dialog.py
@@ -513,7 +513,15 @@ def loadStateFromKeywords(self):
         Raises:
            no exceptions explicitly raised."""
         try:
-            myKeywords = self.keywordIO.readKeywords(self.layer)
+            # First see if we could have sublayers
+            # move this to a shared location
+            mySubLayer = None
+            mySource = self.layer.source()
+
+
+            # Now read the layer with sub layer if needed
+            myKeywords = self.keywordIO.readKeywords(self.layer,
+                                                     theSubLayer=mySubLayer)
         except:
             # layer has no keywords file so just start with a blank slate
             # so that subcategory gets populated nicely & we will assume
diff --git a/safe_qgis/safe_interface.py b/safe_qgis/safe_interface.py
index 05d8d9295f..382cb0209a 100644
--- a/safe_qgis/safe_interface.py
+++ b/safe_qgis/safe_interface.py
@@ -253,7 +253,7 @@ def readKeywordsFromLayer(theLayer, keyword):
     return myValue
 
 
-def readKeywordsFromFile(theLayerPath, theKeyword=None):
+def readKeywordsFromFile(theLayerPath, theKeyword=None, theSubLayer=None):
     """Get metadata from the keywords file associated with a local
      file in the file system.
 
@@ -268,6 +268,7 @@ def readKeywordsFromFile(theLayerPath, theKeyword=None):
        * theLayerPath - a string representing a path to a layer
            (e.g. '/tmp/foo.shp', '/tmp/foo.tif')
        * theKeyword - optional - the metadata keyword to retrieve e.g. 'title'
+       * theSubLayer - optional - sublayer to read the keywords for.
 
     Returns:
        A string containing the retrieved value for the keyword if
@@ -293,7 +294,7 @@ def readKeywordsFromFile(theLayerPath, theKeyword=None):
     #now get the requested keyword using the inasafe library
     myDictionary = None
     try:
-        myDictionary = read_keywords(myKeywordFilePath)
+        myDictionary = read_keywords(myKeywordFilePath, sublayer=theSubLayer)
     except Exception, e:
         myMessage = tr('Keyword retrieval failed for %s (%s) \n %s' % (
                 myKeywordFilePath, theKeyword, str(e)))