Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix VIIRS EDR Flood file patterns not working for AOI files #993

Merged
merged 1 commit into from
Dec 3, 2019
Merged

Fix VIIRS EDR Flood file patterns not working for AOI files #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions satpy/etc/readers/viirs_edr_flood.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ file_types:
viirs_edr:
file_reader: !!python/name:satpy.readers.viirs_edr_flood.VIIRSEDRFlood
file_patterns:
- 'WATER_VIIRS_Prj_SVI_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_{source:8s}_{dim0}_{dim1}_01.hdf'
- 'WATER_VIIRS_Prj_SVI_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_{source:8s}_{aoi:3s}_{dim0}_{dim1}_01.hdf'
- 'WATER_VIIRS_Prj_SVI_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_{source:8s}_{dim0:d}_{dim1:d}_01.hdf'
- 'WATER_VIIRS_Prj_SVI_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_{source:8s}_{aoi:3s}_{dim0:d}_{dim1:d}_01.hdf'

datasets:
water_detection:
Expand Down
33 changes: 24 additions & 9 deletions satpy/tests/reader_tests/test_viirs_edr_flood.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#
# You should have received a copy of the GNU General Public License along with
# satpy. If not, see <http://www.gnu.org/licenses/>.
"""Tests for the VIIRS EDR Flood reader."""
import sys
import os
import numpy as np
Expand All @@ -37,9 +38,10 @@


class FakeHDF4FileHandler2(FakeHDF4FileHandler):
"""Swap in HDF4 file handler"""
"""Swap in HDF4 file handler."""

def get_test_content(self, filename, filename_info, filename_type):
"""Mimic reader input file content"""
"""Mimic reader input file content."""
file_content = {}
file_content['/attr/Satellitename'] = filename_info['platform_shortname']
file_content['/attr/SensorIdentifyCode'] = 'VIIRS'
Expand Down Expand Up @@ -76,11 +78,12 @@ def get_test_content(self, filename, filename_info, filename_type):


class TestVIIRSEDRFloodReader(unittest.TestCase):
"""Test VIIRS EDR Flood Reader"""
"""Test VIIRS EDR Flood Reader."""

yaml_file = 'viirs_edr_flood.yaml'

def setUp(self):
"""Wrap HDF4 file handler with own fake file handler"""
"""Wrap HDF4 file handler with own fake file handler."""
from satpy.config import config_search_paths
from satpy.readers.viirs_edr_flood import VIIRSEDRFlood
self.reader_configs = config_search_paths(os.path.join('readers', self.yaml_file))
Expand All @@ -89,11 +92,11 @@ def setUp(self):
self.p.is_local = True

def tearDown(self):
"""Stop wrapping the HDF4 file handler"""
"""Stop wrapping the HDF4 file handler."""
self.p.stop()

def test_init(self):
"""Test basic init with no extra parameters"""
"""Test basic init with no extra parameters."""
from satpy.readers import load_reader
r = load_reader(self.reader_configs)
loadables = r.select_files_from_pathnames([
Expand All @@ -104,7 +107,7 @@ def test_init(self):
self.assertTrue(r.file_handlers)

def test_load_dataset(self):
"""Test loading all datasets"""
"""Test loading all datasets from a full swath file."""
from satpy.readers import load_reader
r = load_reader(self.reader_configs)
loadables = r.select_files_from_pathnames([
Expand All @@ -116,10 +119,22 @@ def test_load_dataset(self):
for v in datasets.values():
self.assertEqual(v.attrs['units'], 'none')

def test_load_dataset_aoi(self):
"""Test loading all datasets from an area of interest file."""
from satpy.readers import load_reader
r = load_reader(self.reader_configs)
loadables = r.select_files_from_pathnames([
'WATER_VIIRS_Prj_SVI_npp_d20180824_t1828213_e1839433_b35361_cspp_dev_001_10_300_01.hdf'
])
r.create_filehandlers(loadables)
datasets = r.load(['WaterDetection'])
self.assertEqual(len(datasets), 1)
for v in datasets.values():
self.assertEqual(v.attrs['units'], 'none')


def suite():
"""The test suite for test_viirs_flood
"""
"""Create the test suite for test_viirs_edr_flood."""
loader = unittest.TestLoader()
mysuite = unittest.TestSuite()
mysuite.addTest(loader.loadTestsFromTestCase(TestVIIRSEDRFloodReader))
Expand Down