Merge pull request #784 from Cadair/gwcs_dev_fixes

Author: Cadair

Diff for: ndcube/extra_coords/table_coord.py

@@ -1,6 +1,7 @@
 import abc
 import copy
 from numbers import Integral
+from functools import partial
 from collections import defaultdict
 
 import gwcs
@@ -13,6 +14,7 @@
 from astropy.modeling.models import tabular_model
 from astropy.modeling.tabular import _Tabular
 from astropy.time import Time
+from astropy.utils import isiterable
 from astropy.wcs.wcsapi.wrappers.sliced_wcs import combine_slices, sanitize_slices
 
 try:
@@ -901,6 +903,17 @@ def frame(self):
 
         return cf.CompositeFrame(frames)
 
+    @staticmethod
+    def _from_high_level_coordinates(dropped_frame, *highlevel_coords):
+        """
+        This is a backwards compatibility wrapper for the new
+        from_high_level_coordinates method in gwcs.
+        """
+        quantities = dropped_frame.coordinate_to_quantity(*highlevel_coords)
+        if isiterable(quantities):
+            quantities = tuple(q.value for q in quantities)
+        return quantities
+
     @property
     def dropped_world_dimensions(self):
         dropped_world_dimensions = defaultdict(list)
@@ -919,22 +932,31 @@ def dropped_world_dimensions(self):
         dropped_world_dimensions["world_axis_names"] += [name or None for name in dropped_multi_table.frame.axes_names]
         dropped_world_dimensions["world_axis_physical_types"] += list(dropped_multi_table.frame.axis_physical_types)
         dropped_world_dimensions["world_axis_units"] += [u.to_string() for u in dropped_multi_table.frame.unit]
-        dropped_world_dimensions["world_axis_object_components"] += dropped_multi_table.frame._world_axis_object_components
-        dropped_world_dimensions["world_axis_object_classes"].update(dropped_multi_table.frame._world_axis_object_classes)
+        # In gwcs https://github.com/spacetelescope/gwcs/pull/457 the underscore was dropped
+        waocomp = getattr(dropped_multi_table.frame, "world_axis_object_components", getattr(dropped_multi_table.frame, "_world_axis_object_components", []))
+        dropped_world_dimensions["world_axis_object_components"] += waocomp
+        waocls = getattr(dropped_multi_table.frame, "world_axis_object_classes", getattr(dropped_multi_table.frame, "_world_axis_object_classes", {}))
+        dropped_world_dimensions["world_axis_object_classes"].update(waocls)
 
         for dropped in self._dropped_coords:
             # If the table is a tuple (QuantityTableCoordinate) then we need to
             # squish the input
+            # In gwcs https://github.com/spacetelescope/gwcs/pull/457 coordinate_to_quantity was removed
+            coord_meth = getattr(
+                dropped.frame,
+                "from_high_level_coordinates",
+                partial(self._from_high_level_coordinates, dropped.frame)
+            )
             if isinstance(dropped.table, tuple):
-                coord = dropped.frame.coordinate_to_quantity(*dropped.table)
+                coord = coord_meth(*dropped.table)
             else:
-                coord = dropped.frame.coordinate_to_quantity(dropped.table)
+                coord = coord_meth(dropped.table)
 
             # We want the value in the output dict to be a flat list of values
             # in the order of world_axis_object_components, so if we get a
             # tuple of coordinates out of gWCS then append them to the list, if
             # we only get one quantity out then append to the list.
-            if isinstance(coord, tuple):
+            if isinstance(coord, (tuple, list)):
                 dropped_world_dimensions["value"] += list(coord)
             else:
                 dropped_world_dimensions["value"].append(coord)

Diff for: ndcube/extra_coords/tests/test_lookup_table_coord.py

@@ -520,15 +520,14 @@ def test_mtc_dropped_table_skycoord_join(lut_1d_time, lut_2d_skycoord_mesh):
     assert isinstance(dwd, dict)
     wao_classes = dwd.pop("world_axis_object_classes")
     assert all(isinstance(value, list) for value in dwd.values())
-    assert all(len(value) == 2 for value in dwd.values())
 
     assert dwd["world_axis_names"] == ["lon", "lat"]
     assert all(isinstance(u, str) for u in dwd["world_axis_units"])
     assert dwd["world_axis_units"] == ["deg", "deg"]
     assert dwd["world_axis_physical_types"] == ["pos.eq.ra", "pos.eq.dec"]
     assert [c[:2] for c in dwd["world_axis_object_components"]] == [("celestial", 0), ("celestial", 1)]
     assert wao_classes["celestial"][0] is SkyCoord
-    assert dwd["value"] == [0*u.deg, 0*u.deg]
+    assert dwd["value"] == [0, 0]
 
 
 @pytest.mark.xfail(reason=">1D Tables not supported")