exclude subsets from WCS-only layer filter

jdaviz/utils.py

@@ -241,7 +241,7 @@ def layer_is_table_data(layer):
 
 
 def is_wcs_only(layer):
-    # exclude WCS-only layers from the layer choices:
+    # identify WCS-only layers, exclude subsets:
     if hasattr(layer, 'layer'):
         state = layer.layer
     elif hasattr(layer, 'data'):
@@ -250,7 +250,17 @@ def is_wcs_only(layer):
         state = layer
     else:
         raise NotImplementedError
-    return getattr(state, 'meta', {}).get(_wcs_only_label, False)
+
+    is_subset = hasattr(layer, 'subset_state') or hasattr(state, 'subset_state')
+
+    return (
+        # WCS-only layers have a metadata label:
+        getattr(state, 'meta', {}).get(_wcs_only_label, False) and
+
+        # the above logic doesn't exclude 100% of subsets, so here we
+        # ensure that no subsets make it through the filter:
+        not is_subset
+    )
 
 
 def is_not_wcs_only(layer):