CLIMATE-353 Bounds doesnt cast input values into proper format
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8443eca1 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8443eca1 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8443eca1 Branch: refs/heads/master Commit: 8443eca1d000d2c84cd0d377ad05677dc43a5772 Parents: f7346ad Author: michaelarthuranderson <michael.arthur.ander...@gmail.com> Authored: Sun Jan 21 12:11:51 2018 -0500 Committer: michaelarthuranderson <michael.arthur.ander...@gmail.com> Committed: Sun Jan 21 12:11:51 2018 -0500 ---------------------------------------------------------------------- ocw/dataset.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/8443eca1/ocw/dataset.py ---------------------------------------------------------------------- diff --git a/ocw/dataset.py b/ocw/dataset.py index 5df5017..bb06443 100644 --- a/ocw/dataset.py +++ b/ocw/dataset.py @@ -297,6 +297,10 @@ class Bounds(object): self._start = None self._end = None + self.lat_min = None + self.lat_max = None + self.lon_min = None + self.lon_max = None if start and self._validate_start(start): self._start = start @@ -305,12 +309,15 @@ class Bounds(object): self._end = end if boundary_type == 'us_states': + self.masked_regions = utils.shapefile_boundary(boundary_type, us_states) if boundary_type == 'countries': + self.masked_regions = utils.shapefile_boundary(boundary_type, countries) if boundary_type == 'user': + file_object = netCDF4.Dataset(user_mask_file) self.mask_variable = file_object.variables[mask_variable_name][:] mask_longitude = file_object.variables[longitude_name][:] @@ -331,9 +338,16 @@ class Bounds(object): self.lon_max = float(lon_max) if boundary_type[:6].upper() == 'CORDEX': - self.lat_min, self.lat_max, self.lon_min, self.lon_max = \ + + lat_min, lat_max, lon_min, lon_max = \ utils.CORDEX_boundary(boundary_type[6:].replace(" ", "").lower()) + if self._validate_lat_lon(lat_max=lat_max, lat_min=lat_min, lon_max=lon_max, lon_min=lon_min): + self.lat_min = float(lat_min) + self.lat_max = float(lat_max) + self.lon_min = float(lon_min) + self.lon_max = float(lon_max) + @property def start(self): """ Getter for start attribute. """
