Remove unneeded default marker names

Author: mwcraig

src/astro_image_display_api/dummy_viewer.py

@@ -36,12 +36,6 @@ class ImageViewer:
     # Allowed locations for cursor display
     ALLOWED_CURSOR_LOCATIONS: tuple = ImageViewerInterface.ALLOWED_CURSOR_LOCATIONS
 
-    # List of marker names that are for internal use only
-    RESERVED_MARKER_SET_NAMES: tuple = ImageViewerInterface.RESERVED_MARKER_SET_NAMES
-
-    # Default marker name for marking via API
-    DEFAULT_MARKER_NAME: str = ImageViewerInterface.DEFAULT_MARKER_NAME
-
     # some internal variable for keeping track of viewer state
     _interactive_marker_name: str = ""
     _previous_marker: Any = ""
@@ -206,11 +200,6 @@ def add_markers(self, table: Table, x_colname: str = 'x', y_colname: str = 'y',
             if not coords and self._wcs is not None:
                 coords = self._wcs.pixel_to_world(x, y)
 
-        if marker_name in self.RESERVED_MARKER_SET_NAMES:
-            raise ValueError(f"Marker name {marker_name} not allowed.")
-
-        marker_name = marker_name if marker_name else self.DEFAULT_MARKER_NAME
-
         to_add = Table(
             dict(
                 x=x,
@@ -289,7 +278,7 @@ def get_markers(self, x_colname: str = 'x', y_colname: str = 'y',
             else:
                 marker_name = [marker_name]
         elif marker_name is None:
-            marker_name = [self.DEFAULT_MARKER_NAME]
+            marker_name = ["_default_marker"]
 
         to_stack = [self._markers[name] for name in marker_name if name in self._markers]
 

src/astro_image_display_api/interface_definition.py

@@ -12,10 +12,6 @@
 # Allowed locations for cursor display
 ALLOWED_CURSOR_LOCATIONS = ('top', 'bottom', None)
 
-DEFAULT_MARKER_NAME = 'default-marker-name'
-
-# List of marker names that are for internal use only
-RESERVED_MARKER_SET_NAMES = ('all',)
 
 __all__ = [
     'ImageViewerInterface',
@@ -33,20 +29,13 @@ class ImageViewerInterface(Protocol):
     stretch_options: tuple
     autocut_options: tuple
     cursor: str
-    marker: Any
     cuts: Any
     stretch: str
     # viewer: Any
 
     # Allowed locations for cursor display
     ALLOWED_CURSOR_LOCATIONS: tuple = ALLOWED_CURSOR_LOCATIONS
 
-    # List of marker names that are for internal use only
-    RESERVED_MARKER_SET_NAMES: tuple = RESERVED_MARKER_SET_NAMES
-
-    # Default marker name for marking via API
-    DEFAULT_MARKER_NAME: str = DEFAULT_MARKER_NAME
-
     # The methods, grouped loosely by purpose
 
     # Methods for loading data

src/astro_image_display_api/widget_api_test.py

@@ -61,10 +61,6 @@ def _get_marker_names_as_set(self):
             marker_names = set(marks)
         return marker_names
 
-    def test_default_marker_names(self):
-        # Check only that default names are set to a non-empty string
-        assert self.image.DEFAULT_MARKER_NAME
-
     def test_width_height(self):
         assert self.image.image_width == 250
         assert self.image.image_height == 100
@@ -134,15 +130,12 @@ def test_marker_properties(self):
     # TODO: add test that checks that retrieving markers with an unknown name issues no error
 
     def test_add_markers(self):
-        original_marker_name = self.image.DEFAULT_MARKER_NAME
         data = np.arange(10).reshape(5, 2)
         orig_tab = Table(data=data, names=['x', 'y'], dtype=('float', 'float'))
         tab = Table(data=data, names=['x', 'y'], dtype=('float', 'float'))
         self.image.add_markers(tab, x_colname='x', y_colname='y',
                                skycoord_colname='coord', marker_name='test1')
 
-        # Make sure setting didn't change the default name
-        assert self.image.DEFAULT_MARKER_NAME == original_marker_name
 
         # Regression test for GitHub Issue 45:
         # Adding markers should not modify the input data table.
@@ -176,12 +169,6 @@ def test_add_markers(self):
         self.image.remove_markers(marker_name='test1')
         marknames = self._get_marker_names_as_set()
         assert marknames == set(['test2'])
-        # assert self.image.get_marker_names() == ['test2']
-
-        # Ensure unable to mark with reserved name
-        for name in self.image.RESERVED_MARKER_SET_NAMES:
-            with pytest.raises(ValueError, match='not allowed'):
-                self.image.add_markers(tab, marker_name=name)
 
         # Add markers with no marker name and check we can retrieve them
         # using the default marker name
@@ -190,15 +177,15 @@ def test_add_markers(self):
         # Don't care about the order of the marker names so use set instead of
         # list.
         marknames = self._get_marker_names_as_set()
-        assert (set(marknames) == set(['test2', self.image.DEFAULT_MARKER_NAME]))
+        assert (set(marknames) == set(['test2']))
 
         # Clear markers to not pollute other tests.
         self.image.reset_markers()
         marknames = self._get_marker_names_as_set()
         assert len(marknames) == 0
         self._assert_empty_marker_table(self.image.get_markers(marker_name="all"))
         # Check that no markers remain after clearing
-        tab = self.image.get_markers(marker_name=self.image.DEFAULT_MARKER_NAME)
+        tab = self.image.get_markers()
         self._assert_empty_marker_table(tab)
 
         # Check that retrieving a marker set that doesn't exist returns