Fix two WCS bugs

Author: Cadair

asdf_astropy/converters/wcs/wcs.py

@@ -2,7 +2,7 @@
 
 # These attributes don't end up in the hdulist and
 # instead will be stored in "attrs"
-_WCS_ATTRS = ("naxis", "colsel", "keysel", "key", "pixel_bounds")
+_WCS_ATTRS = ("naxis", "_naxis", "colsel", "keysel", "key", "pixel_bounds")
 
 
 class WCSConverter(Converter):
@@ -18,6 +18,8 @@ def from_yaml_tree(self, node, tag, ctx):
         if naxis := attrs.pop("naxis"):
             hdulist[0].header["naxis"] = naxis
 
+        _naxis = attrs.pop("_naxis")
+
         pixel_bounds = attrs.pop("pixel_bounds")
 
         wcs = WCS(hdulist[0].header, fobj=hdulist, **attrs)
@@ -29,6 +31,9 @@ def from_yaml_tree(self, node, tag, ctx):
             wcs.wcs.set()
 
         wcs.pixel_bounds = pixel_bounds
+
+        if _naxis:
+            wcs._naxis = _naxis
         return wcs
 
     def to_yaml_tree(self, wcs, tag, ctx):

asdf_astropy/resources/schemas/wcs/slicedwcs-1.0.0.yaml

@@ -16,7 +16,10 @@ allOf:
   - type: object
     properties:
       wcs:
-        tag: "tag:astropy.org:astropy/wcs/wcs-1*"
+        anyOf:
+          - tag: "tag:astropy.org:astropy/wcs/wcs-1*"
+          - tag: "tag:stsci.edu:gwcs/wcs-*"
+
       slices_array:
         type: array
         items: