From ced2271bd1b67bf69eb1c42be0052cd964523406 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 10 Mar 2021 08:28:55 -0700
Subject: [PATCH] cleanup
---
.../nshmp/netcdf/parsers/data_path_parser.py | 61 +------------------
1 file changed, 1 insertion(+), 60 deletions(-)
diff --git a/src/main/python/gov/usgs/earthquake/nshmp/netcdf/parsers/data_path_parser.py b/src/main/python/gov/usgs/earthquake/nshmp/netcdf/parsers/data_path_parser.py
index a39dec0..4aa3d16 100644
--- a/src/main/python/gov/usgs/earthquake/nshmp/netcdf/parsers/data_path_parser.py
+++ b/src/main/python/gov/usgs/earthquake/nshmp/netcdf/parsers/data_path_parser.py
@@ -72,21 +72,9 @@ class DataPathParser:
curve_info = DataPathParser._parse_curve_file(
nshm=database_info.nshm, imt=imt, curve_file=curve_file
)
- # curve_info = DataPathParser._scan_data_dir(nshm=database_info.nshm, data_dir=data_dir)
site_class = SiteClass.of_string(site_class_str)
- # imt_directories = dict(
- # sorted(curve_info.imt_directories.items(), key=lambda item: item[0].value)
- # )
-
- # Reduce locations
- # latitudes_list = tuple(map(lambda loc: loc.latitudes, curve_info.locations))
- # latitudes = tuple(sorted(set(sum(latitudes_list, ()))))
- # longitudes_list = tuple(map(lambda loc: loc.longitudes, curve_info.locations))
- # longitudes = tuple(sorted(set(sum(longitudes_list, ()))))
+
data_info = DataInfo(
- # directories=SiteClassDirectories(
- # site_class=site_class, imt_directories=imt_directories
- # ),
curve_file=curve_file,
grid_step=float(grid_step_str.lower().replace("p", ".")),
imls=curve_info.imls,
@@ -124,50 +112,3 @@ class DataPathParser:
return Region.WUS
else:
raise ValueError(f"Region not found in path name ({name})")
-
- # @staticmethod
- # def _scan_data_dir(nshm: Nshm, data_dir: Path) -> _ScanDirInfo:
- # futures: list[Future[_CurveFileInfo]] = []
- # imls: dict[Imt, list[float]] = dict()
- # imts: list[Imt] = []
- # imt_directories: dict[Imt, Path] = {}
- # locations: list[Locations] = []
-
- # with ThreadPoolExecutor() as executor:
- # for _imt_entry in os.scandir(data_dir):
- # imt_entry: os.DirEntry = _imt_entry
- # dir_name = imt_entry.name
-
- # if (
- # dir_name.startswith(Imt.PGA.name)
- # or dir_name.startswith(Imt.PGV.name)
- # or dir_name.startswith("SA")
- # ):
- # imt = Imt.from_string(dir_name)
- # imts.append(imt)
-
- # for _file_entry in os.scandir(imt_entry.path):
- # file_entry: os.DirEntry = _file_entry
- # imt_directories.setdefault(imt, Path(file_entry.path).parent)
-
- # if NetcdfKeys.CURVES_FILE in file_entry.name:
- # future = executor.submit(
- # DataPathParser._parse_curve_file,
- # nshm=nshm,
- # imt=imt,
- # file_entry=file_entry,
- # )
- # futures.append(future)
-
- # for _future in futures:
- # future: Future[_CurveFileInfo] = _future
- # curve_values = future.result(timeout=30)
- # imls.setdefault(curve_values.imt, curve_values.imls)
- # locations.append(curve_values.locations)
-
- # return _ScanDirInfo(
- # imls=imls,
- # imt_directories=imt_directories,
- # imts=imts,
- # locations=locations,
- # )
--
GitLab