NHIRS-54: Change default aggregate output format to GeoJSON (#42)

c-mckenna · web-flow · commit b69f5f484b71 · 2021-03-02T10:35:38.000+11:00
Co-authored-by: Callum McKenna &lt;callum.mckenna@ga.gov.au&gt;
diff --git a/hazimp/jobs/jobs.py b/hazimp/jobs/jobs.py
@@ -735,7 +735,7 @@ def __call__(self, context, filename=None, boundaries=None,
                  fields=None, use_parallel=True):
         # Default filename to use when no output filename is specified
         if filename is None:
-            filename = 'output.shp'
+            filename = 'output.json'
 
         # Defaults fields to use when none are provided to maintain
         # backwards compatibility
diff --git a/tests/jobs/test_jobs.py b/tests/jobs/test_jobs.py
@@ -772,7 +772,7 @@ def test_default_aggregate_filename(self):
         instance(context, None, 'boundaries.json', 'MESHBLOCK_CODE_2011', 'MB_CODE11', True, {}, False)
 
         context.save_aggregation.assert_called_once_with(
-            'output.shp', 'boundaries.json', 'MESHBLOCK_CODE_2011', 'MB_CODE11', True, {}, use_parallel=False
+            'output.json', 'boundaries.json', 'MESHBLOCK_CODE_2011', 'MB_CODE11', True, {}, use_parallel=False
         )
 
     def test_default_aggregate_fields(self):

Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ def test_default_aggregate_filename(self):`
`772`	`772`	`instance(context, None, 'boundaries.json', 'MESHBLOCK_CODE_2011', 'MB_CODE11', True, {}, False)`
`773`	`773`
`774`	`774`	`context.save_aggregation.assert_called_once_with(`
`775`		`- 'output.shp', 'boundaries.json', 'MESHBLOCK_CODE_2011', 'MB_CODE11', True, {}, use_parallel=False`
	`775`	`+ 'output.json', 'boundaries.json', 'MESHBLOCK_CODE_2011', 'MB_CODE11', True, {}, use_parallel=False`
`776`	`776`	`)`
`777`	`777`
`778`	`778`	`def test_default_aggregate_fields(self):`