Merge pull request #76 from podaac/release/0.13.1

Release 0.13.1

Author: jamesfwood

CHANGELOG.md

@@ -14,6 +14,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 
 
+## [0.13.1]
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- ** Fix lon and lat check **
+  Fix the checking of longitude and latitude data for empty granules
+### Security
+
+
 ## [0.13.0]
 
 ### Added

podaac/lambda_handler/lambda_handler.py

@@ -46,8 +46,6 @@ def generate_images(local_file, path, config_file, palette_dir, granule_id, vari
     """Function to call in multiprocess to generate images"""
     try:
         image_gen = tig.TIG(local_file, path, config_file, palette_dir, variables=variables, logger=logger)
-        if image_gen.are_all_lon_lat_invalid():
-            raise Exception("Can't generate images for empty granule")
         images = image_gen.generate_images(granule_id=granule_id)
         conn.send(({'status': 'success', 'data': images}, None))
     except Exception as e:

podaac/tig/tig.py

@@ -457,6 +457,9 @@ def generate_images_group(self, image_format='png', world_file=False, granule_id
         width_deg = region[3] - region[2]
         self.region = Region(region)
 
+        if self.are_all_lon_lat_invalid(lon_array, lat_array):
+            raise Exception("Can't generate images for empty granule")
+
         output_dimensions = (int(height_deg * self.ppd), int(width_deg * self.ppd))
         (self.rows, self.cols) = output_dimensions
 
@@ -573,42 +576,26 @@ def non_nan_neighbors(arr, x, y):
 
         return img_with_neighbor_filled
 
-    def are_all_lon_lat_invalid(self):
+    def are_all_lon_lat_invalid(self, lon, lat):
         """
-        Checks if all longitude and latitude values in a NetCDF file are invalid.
+        Checks if all coordinate pairs contain at least one invalid value.
 
         Parameters:
-            file_path (str): Path to the NetCDF file.
-            lon_var (str): Name of the longitude variable in the file.
-            lat_var (str): Name of the latitude variable in the file.
-
+            lon (array-like): Array of longitude values.
+            lat (array-like): Array of latitude values.
         Returns:
-            bool: True if all longitude and latitude values are invalid, False otherwise.
+            bool: True if all coordinate pairs have at least one invalid value,
+                  False if there exists at least one valid coordinate pair.
         """
         try:
-            with xr.open_dataset(self.input_file) as ds:
-
-                lon_var = self.config.get('lonVar')
-                lat_var = self.config.get('latVar')
-
-                if lon_var not in ds.variables or lat_var not in ds.variables:
-                    raise ValueError(f"Missing required variables: '{lon_var}' or '{lat_var}' in the file.")
-
-                lon = ds[lon_var]
-                lat = ds[lat_var]
-
-                # Define valid ranges
-                valid_lon = (lon >= -180) & (lon <= 180)
-                valid_lat = (lat >= -90) & (lat <= 90)
-
-                # Check if all values are invalid
-                all_invalid_lon = (~valid_lon).all().item()
-                all_invalid_lat = (~valid_lat).all().item()
-
-                return all_invalid_lon and all_invalid_lat
+            # Define valid ranges
+            valid_lon_mask = (lon >= -180) & (lon <= 180)
+            valid_lat_mask = (lat >= -90) & (lat <= 90)
+            # Check if any pair is completely valid
+            valid_pairs = valid_lon_mask & valid_lat_mask
+            return not valid_pairs.any()
         except Exception as e:
-            self.logger.error(f"Error: {e}")
-            raise e
+            raise RuntimeError(f"Error checking longitude/latitude validity: {e}") from e
 
     def process_variable(self,
                          var,