Skip to content

Commit

Permalink
NHIRS-54: Change default aggregate output format to GeoJSON (#42)
Browse files Browse the repository at this point in the history
Co-authored-by: Callum McKenna <[email protected]>
  • Loading branch information
c-mckenna and c-mckenna authored Mar 1, 2021
1 parent a230e08 commit b69f5f4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion hazimp/jobs/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/jobs/test_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit b69f5f4

Please sign in to comment.