From eb0c7fc49b01f51f58dc6e408afc5c01f89fb58c Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 29 May 2015 18:25:56 +0100 Subject: [PATCH] download band 8 when pansharpen fixes #73 --- landsat/landsat.py | 6 +++++- landsat/tests/test_landsat.py | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/landsat/landsat.py b/landsat/landsat.py index 2ba073d..bb034df 100755 --- a/landsat/landsat.py +++ b/landsat/landsat.py @@ -277,7 +277,11 @@ def main(args): elif args.subs == 'download': d = Downloader(download_dir=args.dest) try: - downloaded = d.download(args.scenes, convert_to_integer_list(args.bands)) + bands = convert_to_integer_list(args.bands) + if args.pansharpen: + bands.append(8) + + downloaded = d.download(args.scenes, bands) if args.process: force_unzip = True if args.force_unzip else False diff --git a/landsat/tests/test_landsat.py b/landsat/tests/test_landsat.py index 0a35641..6d8d9a3 100644 --- a/landsat/tests/test_landsat.py +++ b/landsat/tests/test_landsat.py @@ -112,6 +112,14 @@ def test_download_process_continuous(self, mock_downloader, mock_process): mock_process.assert_called_with('path/to/folder/LC80010092014051LGN00', '432', False, False, True) self.assertEquals(output, ["Image Processing Completed", 0]) + # Call with pansharpen + args = ['download', 'LC80010092015051LGN00', 'LC80010092014051LGN00', '-b', '432', '-d', + self.mock_path, '-p', '--pansharpen'] + output = landsat.main(self.parser.parse_args(args)) + mock_downloader.assert_called_with(['LC80010092015051LGN00', 'LC80010092014051LGN00'], ['4', '3', '2', 8]) + mock_process.assert_called_with('path/to/folder/LC80010092014051LGN00', '432', False, True, False) + self.assertEquals(output, ["Image Processing Completed", 0]) + @mock.patch('landsat.landsat.Uploader') @mock.patch('landsat.landsat.process_image') @mock.patch('landsat.landsat.Downloader.download')