Merge pull request #2072 from ismailsunni/develop

Keyword Version
inasafe · Jun 29, 2015 · e160a2f · e160a2f
2 parents 0741cfe + 9ac9ab7
commit e160a2f
Show file tree

Hide file tree

Showing 63 changed files with 669 additions and 327 deletions.
diff --git a/Makefile b/Makefile
@@ -173,7 +173,7 @@ testdata:
 	@echo "Updating inasafe_data - public test and demo data repository"
 	@echo "Update the hash to check out a specific data version        "
 	@echo "------------------------------------------------------------"
-	@scripts/update-test-data.sh b42e2449fc91dbd1b10a3dbb72c5ab424354f16b 2>&1 | tee tmp_warnings.txt; [ $${PIPESTATUS[0]} -eq 0 ] && rm -f tmp_warnings.txt || echo "Stored update warnings in tmp_warnings.txt";
+	@scripts/update-test-data.sh f29505f728ff31dcefa58c048138ea298bb9f332 2>&1 | tee tmp_warnings.txt; [ $${PIPESTATUS[0]} -eq 0 ] && rm -f tmp_warnings.txt || echo "Stored update warnings in tmp_warnings.txt";
 
 #check and show if there was an error retrieving the test data
 testdata_errorcheck:

diff --git a/bin/test_inasafe.py b/bin/test_inasafe.py
@@ -1,4 +1,4 @@
-
+# coding=utf-8
 __author__ = 'Jannes123'
 __project_name__ = 'inasafe'
 __filename__ = 'test_inasafe.py'
@@ -37,7 +37,8 @@ def setUp(self):
             '--layers': None,
             '--list-functions': False,
             '--output-file': '/tmp/inasafe/flood_on_buildings.shp',
-            '--report-template': '../inasafe/resources/qgis-composer-templates/'
+            '--report-template': '../inasafe/resources/'
+                                 'qgis-composer-templates/'
                                  'inasafe-portrait-a4.qpt',
             '--version': False,
             'LAYER_NAME': []})

diff --git a/safe/definitions.py b/safe/definitions.py
@@ -20,6 +20,9 @@
 # Please group them and sort them alphabetical
 from safe.utilities.i18n import tr
 
+inasafe_keyword_version_key = 'keyword_version'
+inasafe_keyword_version = 3.2
+
 # constants
 small_number = 2 ** -53  # I think this is small enough
 

diff --git a/safe/gui/tools/osm_downloader_dialog.py b/safe/gui/tools/osm_downloader_dialog.py
@@ -18,7 +18,6 @@
                  'Disaster Reduction')
 
 import os
-import tempfile
 import logging
 
 # noinspection PyUnresolvedReferences

diff --git a/safe/gui/tools/test/test_osm_downloader_dialog.py b/safe/gui/tools/test/test_osm_downloader_dialog.py
@@ -26,12 +26,9 @@
 # This import is to enable SIP API V2
 # noinspection PyUnresolvedReferences
 import qgis  # pylint: disable=unused-import
-# noinspection PyPackageRequirements
-from PyQt4.QtGui import QDialog
 
 from safe.gui.tools.osm_downloader_dialog import OsmDownloaderDialog
 from safe.test.utilities import get_qgis_app
-from safe.common.version import get_version
 
 QGIS_APP, CANVAS, IFACE, PARENT = get_qgis_app()
 LOGGER = logging.getLogger('InaSAFE')
@@ -163,6 +160,6 @@ def test_suffix_extracting_shapefile(self):
 
 
 if __name__ == '__main__':
-    suite = unittest.makeSuite(ImportDialogTest, 'test')
+    suite = unittest.makeSuite(OsmDownloaderDialogTest, 'test')
     runner = unittest.TextTestRunner(verbosity=2)
     runner.run(suite)
diff --git a/safe/gui/tools/test/test_wizard_dialog.py b/safe/gui/tools/test/test_wizard_dialog.py
@@ -45,6 +45,7 @@
 # safe.gui.tools.wizard_dialog
 QGIS_APP, CANVAS, IFACE, PARENT = get_qgis_app()
 
+from safe.definitions import inasafe_keyword_version
 from safe.gui.tools.wizard_dialog import (
     WizardDialog,
     step_kw_source,
@@ -176,7 +177,8 @@ def test_keywords_creation_wizard(self):
                 'flood_vector_hazard_classes',
             'value_map': {'wet': ['YES'], 'dry': ['NO']},
             'source': 'some source',
-            'title': 'some title'
+            'title': 'some title',
+            'keyword_version': inasafe_keyword_version
         }
 
         layer = clone_shp_layer(

diff --git a/safe/storage/utilities.py b/safe/storage/utilities.py
@@ -99,19 +99,19 @@ def _keywords_to_string(keywords, sublayer=None):
     result = get_unicode('')
     if sublayer is not None:
         result = '[%s]\n' % sublayer
-    for k, value in keywords.items():
+    # Sort so that less changes when run the test
+    for key in sorted(keywords.iterkeys()):
         # Create key
         msg = ('Key in keywords dictionary must be a string. '
-               'I got %s with type %s' % (k, str(type(k))[1:-1]))
-        verify(isinstance(k, basestring), msg)
+               'I got %s with type %s' % (key, str(type(key))[1:-1]))
+        verify(isinstance(key, basestring), msg)
 
-        key = k
         msg = ('Key in keywords dictionary must not contain the ":" '
                'character. I got "%s"' % key)
         verify(':' not in key, msg)
 
         # Store
-        result += '%s: %s\n' % (key, value)
+        result += '%s: %s\n' % (key, keywords[key])
     return result
 
 

diff --git a/safe/test/data/boundaries/district_osm_jakarta.keywords b/safe/test/data/boundaries/district_osm_jakarta.keywords
@@ -1,11 +1,12 @@
+adult ratio attribute: Global default
+adult ratio default: 0.66
 aggregation attribute: KAB_NAME
-title: Dístríct's of Jakarta
 elderly ratio attribute: Global default
-youth ratio default: 0.26
 elderly ratio default: 0.08
-layer_mode: classified
-adult ratio attribute: Global default
 female ratio attribute: PEREMPUAN
-youth ratio attribute: Global default
+keyword_version: 3.2
+layer_mode: classified
 layer_purpose: aggregation
-adult ratio default: 0.66
+title: Dístríct's of Jakarta
+youth ratio attribute: Global default
+youth ratio default: 0.26
diff --git a/safe/test/data/boundaries/district_osm_jakarta.xml b/safe/test/data/boundaries/district_osm_jakarta.xml
@@ -171,17 +171,18 @@
             </gmd:extent>
             <gmd:supplementalInformation>
                 <inasafe_keywords>
-<![CDATA[aggregation attribute: KAB_NAME
-title: Dístríct's of Jakarta
+<![CDATA[adult ratio attribute: Global default
+adult ratio default: 0.66
+aggregation attribute: KAB_NAME
 elderly ratio attribute: Global default
-youth ratio default: 0.26
 elderly ratio default: 0.08
-layer_mode: classified
-adult ratio attribute: Global default
 female ratio attribute: PEREMPUAN
-youth ratio attribute: Global default
+keyword_version: 3.2
+layer_mode: classified
 layer_purpose: aggregation
-adult ratio default: 0.66
+title: Dístríct's of Jakarta
+youth ratio attribute: Global default
+youth ratio default: 0.26
 ]]>
 </inasafe_keywords>
             </gmd:supplementalInformation>

diff --git a/safe/test/data/exposure/building-points.keywords b/safe/test/data/exposure/building-points.keywords
@@ -1,9 +1,10 @@
-license: Open Data Commons Open Database License (ODbL)
-title: Building centroids
-structure_class_field: TYPE
-source: OpenStreetMap - www.openstreetmap.org
-layer_geometry: point
 date: 02-04-2015 03:23
-layer_purpose: exposure
-layer_mode: classified
 exposure: structure
+keyword_version: 3.2
+layer_geometry: point
+layer_mode: classified
+layer_purpose: exposure
+license: Open Data Commons Open Database License (ODbL)
+source: OpenStreetMap - www.openstreetmap.org
+structure_class_field: TYPE
+title: Building centroids
diff --git a/safe/test/data/exposure/building-points.xml b/safe/test/data/exposure/building-points.xml
@@ -172,15 +172,16 @@
             </gmd:extent>
             <gmd:supplementalInformation>
                 <inasafe_keywords>
-<![CDATA[license: Open Data Commons Open Database License (ODbL)
-title: Building centroids
-structure_class_field: TYPE
-source: OpenStreetMap - www.openstreetmap.org
+<![CDATA[date: 02-04-2015 03:23
+exposure: structure
+keyword_version: 3.2
 layer_geometry: point
-date: 02-04-2015 03:23
-layer_purpose: exposure
 layer_mode: classified
-exposure: structure
+layer_purpose: exposure
+license: Open Data Commons Open Database License (ODbL)
+source: OpenStreetMap - www.openstreetmap.org
+structure_class_field: TYPE
+title: Building centroids
 ]]>
 </inasafe_keywords>
             </gmd:supplementalInformation>

diff --git a/safe/test/data/exposure/buildings.keywords b/safe/test/data/exposure/buildings.keywords
@@ -1,9 +1,10 @@
-license: Open Data Commons Open Database License (ODbL)
-title: Buildings
-structure_class_field: TYPE
-source: OpenStreetMap - www.openstreetmap.org
-layer_geometry: polygon
 date: 26-03-2015 14:03
-layer_purpose: exposure
-layer_mode: classified
 exposure: structure
+keyword_version: 3.2
+layer_geometry: polygon
+layer_mode: classified
+layer_purpose: exposure
+license: Open Data Commons Open Database License (ODbL)
+source: OpenStreetMap - www.openstreetmap.org
+structure_class_field: TYPE
+title: Buildings
diff --git a/safe/test/data/exposure/buildings.xml b/safe/test/data/exposure/buildings.xml
@@ -172,15 +172,16 @@
             </gmd:extent>
             <gmd:supplementalInformation>
                 <inasafe_keywords>
-<![CDATA[license: Open Data Commons Open Database License (ODbL)
-title: Buildings
-structure_class_field: TYPE
-source: OpenStreetMap - www.openstreetmap.org
+<![CDATA[date: 26-03-2015 14:03
+exposure: structure
+keyword_version: 3.2
 layer_geometry: polygon
-date: 26-03-2015 14:03
-layer_purpose: exposure
 layer_mode: classified
-exposure: structure
+layer_purpose: exposure
+license: Open Data Commons Open Database License (ODbL)
+source: OpenStreetMap - www.openstreetmap.org
+structure_class_field: TYPE
+title: Buildings
 ]]>
 </inasafe_keywords>
             </gmd:supplementalInformation>

diff --git a/safe/test/data/exposure/buildings_osm_4326.keywords b/safe/test/data/exposure/buildings_osm_4326.keywords
@@ -1,5 +1,7 @@
-datatype: osm
-category: exposure
-subcategory: structure
-purpose: dki
 title: buildings_osm_4326
+structure_class_field: FLOODED
+keyword_version: 3.2
+layer_geometry: polygon
+layer_purpose: exposure
+layer_mode: classified
+exposure: structure
diff --git a/safe/test/data/exposure/buildings_osm_4326.xml b/safe/test/data/exposure/buildings_osm_4326.xml
@@ -171,12 +171,13 @@
             </gmd:extent>
             <gmd:supplementalInformation>
                 <inasafe_keywords>
-<![CDATA[datatype: osm
+<![CDATA[title: buildings_osm_4326
+structure_class_field: FLOODED
+keyword_version: 3.2
+layer_geometry: polygon
 layer_purpose: exposure
-exposure: structure
-purpose: dki
-title: buildings_osm_4326
 layer_mode: classified
+exposure: structure
 ]]>
 </inasafe_keywords>
             </gmd:supplementalInformation>

diff --git a/safe/test/data/exposure/exposure.keywords b/safe/test/data/exposure/exposure.keywords
@@ -1,6 +1,8 @@
 [buildings_osm_4326]
-datatype: osm
-category: exposure
-subcategory: structure
-purpose: dki
 title: buildings_osm_4326
+structure_class_field: FLOODED
+keyword_version: 3.2
+layer_geometry: polygon
+layer_purpose: exposure
+layer_mode: classified
+exposure: structure
diff --git a/safe/test/data/exposure/exposure.xml b/safe/test/data/exposure/exposure.xml
@@ -173,11 +173,13 @@
                 <inasafe_keywords>
 
 <![CDATA[[buildings_osm_4326]
-datatype: osm
-category: exposure
-subcategory: structure
-purpose: dki
 title: buildings_osm_4326
+structure_class_field: FLOODED
+keyword_version: 3.2
+layer_geometry: polygon
+layer_purpose: exposure
+layer_mode: classified
+exposure: structure
 ]]>
 </inasafe_keywords>
             </gmd:supplementalInformation>

diff --git a/safe/test/data/exposure/pop_binary_raster_20_20.keywords b/safe/test/data/exposure/pop_binary_raster_20_20.keywords
@@ -1,6 +1,7 @@
+exposure: population
 exposure_unit: count
-title: Population
+keyword_version: 3.2
 layer_geometry: raster
-layer_purpose: exposure
 layer_mode: continuous
-exposure: population
+layer_purpose: exposure
+title: Population
diff --git a/safe/test/data/exposure/pop_binary_raster_20_20.xml b/safe/test/data/exposure/pop_binary_raster_20_20.xml
@@ -171,12 +171,13 @@
             </gmd:extent>
             <gmd:supplementalInformation>
                 <inasafe_keywords>
-<![CDATA[exposure_unit: count
-title: Population
+<![CDATA[exposure: population
+exposure_unit: count
+keyword_version: 3.2
 layer_geometry: raster
-layer_purpose: exposure
 layer_mode: continuous
-exposure: population
+layer_purpose: exposure
+title: Population
 ]]>
 </inasafe_keywords>
             </gmd:supplementalInformation>

diff --git a/safe/test/data/exposure/roads.keywords b/safe/test/data/exposure/roads.keywords
@@ -1,7 +1,8 @@
-title: Roads
-source: OpenStreetMap - www.openstreetmap.org
+exposure: road
+keyword_version: 3.2
 layer_geometry: line
-layer_purpose: exposure
 layer_mode: classified
+layer_purpose: exposure
 road_class_field: TYPE
-exposure: road
+source: OpenStreetMap - www.openstreetmap.org
+title: Roads
diff --git a/safe/test/data/exposure/roads.xml b/safe/test/data/exposure/roads.xml
@@ -172,13 +172,14 @@
             </gmd:extent>
             <gmd:supplementalInformation>
                 <inasafe_keywords>
-<![CDATA[title: Roads
-source: OpenStreetMap - www.openstreetmap.org
+<![CDATA[exposure: road
+keyword_version: 3.2
 layer_geometry: line
-layer_purpose: exposure
 layer_mode: classified
+layer_purpose: exposure
 road_class_field: TYPE
-exposure: road
+source: OpenStreetMap - www.openstreetmap.org
+title: Roads
 ]]>
 </inasafe_keywords>
             </gmd:supplementalInformation>

diff --git a/safe/test/data/exposure/roads_osm_4326.keywords b/safe/test/data/exposure/roads_osm_4326.keywords
@@ -1,6 +1,10 @@
-category: exposure
-subcategory: road
+date: 24-01-2014 17:10
 license: Open Data Commons Open Database License (ODbL)
 title: Roads
+keyword_version: 3.2
 source: OpenStreetMap - www.openstreetmap.org
-date: 24-01-2014 17:10
+layer_geometry: line
+layer_purpose: exposure
+layer_mode: classified
+road_class_field: OSM_TYPE
+exposure: road