DAS-2331: refactors test_is_projection_x_or_y (#54)

Author: flamingbear

CHANGELOG.md

@@ -1,3 +1,15 @@
+## v3.1.0
+### 2025-03-25
+
+### Added:
+
+* `VariableBase::is_projection_x` and `VariableBase::is_projection_y` added to
+  determine a variable's exact projected coordinate.
+
+### Changed:
+
+* earthdata-varinfo's numpy requirements relaxed to allow numpy v2.
+
 ## v3.0.3
 ### 2025-03-21
 

VERSION

@@ -1 +1 @@
-3.0.3
+3.1.0

requirements.txt

@@ -1,4 +1,4 @@
-netCDF4 ~= 1.7.2
-numpy >= 1.24.2,< 2.0
+netCDF4 >= 1.7.2
+numpy >= 1.24.2,<2.3
 python-cmr ~= 0.12.0
 requests ~= 2.31.0

tests/unit/test_variable.py

@@ -562,7 +562,7 @@ def test_is_geographic(self):
                 self.assertFalse(variable.is_geographic())
 
     def test_is_latitude(self):
-        """Ensure that a varaible is correctly identified a latitudinal based
+        """Ensure that a variable is correctly identified a latitudinal based
         on its `units` metadata attribute.
 
         """
@@ -678,6 +678,41 @@ def test_is_projection_x_or_y(self):
 
                 self.assertFalse(variable.is_projection_x_or_y())
 
+    def test_is_projection_x(self):
+        """Ensure that a variable is correctly identified as a projected
+        spatial dimension based on its `standard_name` metadata
+        attribute.
+
+        """
+        test_args = [
+            [
+                'Projected x variable',
+                self.projection_x_variable_string,
+                self.assertTrue,
+                self.assertFalse,
+            ],
+            [
+                'Projected y variable',
+                self.projection_y_variable_string,
+                self.assertFalse,
+                self.assertTrue,
+            ],
+        ]
+
+        for description, variable_string, x_assertion, y_assertion in test_args:
+            with self.subTest(description):
+                variable_tree = ET.fromstring(variable_string)
+                variable = VariableFromDmr(
+                    variable_tree,
+                    self.fakesat_config,
+                    self.namespace,
+                    '/variable',
+                    self.fake_all_dimensions_sizes,
+                )
+
+                x_assertion(variable.is_projection_x())
+                y_assertion(variable.is_projection_y())
+
     def test_get_range(self):
         """Ensure the correct valid range is returned based either on the
         `valid_range` metadata attribute or both the `valid_min` and

varinfo/variable.py

@@ -189,10 +189,33 @@ def is_projection_x_or_y(self) -> bool:
         `projection_x_angular_coordinate` and
         `projection_y_angular_coordinate`.
 
+        """
+        return self.is_projection_x() or self.is_projection_y()
+
+    def is_projection_x(self) -> bool:
+        """Determine if the variable is a projected x spatial coordinate based
+        on the `standard_name` metadata attribute being
+        `projection_x_coordinate`, as defined by the CF Conventions
+        (v1.9). Note, geostationary projections have coordinate with
+        `standard_name` metadata attribute value of
+        `projection_x_angular_coordinate`.
+
         """
         return self.attributes.get('standard_name') in [
             'projection_x_coordinate',
             'projection_x_angular_coordinate',
+        ]
+
+    def is_projection_y(self) -> bool:
+        """Determine if the variable is a projected y spatial coordinate based
+        on the `standard_name` metadata attribute being
+        `projection_y_coordinate`, as defined by the CF Conventions
+        (v1.9). Note, geostationary projections have coordinate with
+        `standard_name` metadata attribute value of
+        `projection_y_angular_coordinate`.
+
+        """
+        return self.attributes.get('standard_name') in [
             'projection_y_coordinate',
             'projection_y_angular_coordinate',
         ]
@@ -218,7 +241,7 @@ def _get_all_cf_references(self) -> dict[str, set[str]]:
         }
 
     def _get_cf_references(self, attribute_name: str) -> set[str]:
-        """Retrieve an attribute from the parsed varaible metadata, correcting
+        """Retrieve an attribute from the parsed variable metadata, correcting
         for any known artefacts (missing or incorrect references). Then
         split this string and qualify the individual references.