Move all map metadata properties onto a Mixin class

sunpy · Apr 3, 2024 · e902500 · e902500
1 parent 0886efa
commit e902500
Show file tree

Hide file tree

Showing 9 changed files with 838 additions and 764 deletions.
diff --git a/sunpy/map/mapbase.py b/sunpy/map/mapbase.py
diff --git a/sunpy/map/mixins/__init__.py b/sunpy/map/mixins/__init__.py
diff --git a/sunpy/map/mixins/mapmeta.py b/sunpy/map/mixins/mapmeta.py
diff --git a/sunpy/map/sources/gong.py b/sunpy/map/sources/gong.py
@@ -12,7 +12,7 @@
 
 __all__ = ['GONGSynopticMap', 'GONGHalphaMap']
 
-from sunpy.map.mapbase import SpatialPair
+from sunpy.map.mixins.mapmeta import SpatialPair
 
 _SITE_NAMES = {
     'LE': 'Learmonth',

diff --git a/sunpy/map/sources/iris.py b/sunpy/map/sources/iris.py
@@ -1,7 +1,8 @@
 
 import astropy.units as u
 
-from sunpy.map.mapbase import GenericMap, SpatialPair
+from sunpy.map.mapbase import GenericMap
+from sunpy.map.mixins.mapmeta import SpatialPair
 
 __all__ = ['SJIMap']
 

diff --git a/sunpy/map/sources/rhessi.py b/sunpy/map/sources/rhessi.py
@@ -1,6 +1,7 @@
 import astropy.units as u
 
-from sunpy.map.mapbase import GenericMap, SpatialPair
+from sunpy.map.mapbase import GenericMap
+from sunpy.map.mixins.mapmeta import SpatialPair
 
 __all__ = ['RHESSIMap']
 

diff --git a/sunpy/map/sources/sdo.py b/sunpy/map/sources/sdo.py
@@ -7,7 +7,8 @@
 from astropy.visualization import AsinhStretch
 from astropy.visualization.mpl_normalize import ImageNormalize
 
-from sunpy.map.mapbase import GenericMap, SpatialPair
+from sunpy.map.mapbase import GenericMap
+from sunpy.map.mixins.mapmeta import SpatialPair
 from sunpy.map.sources.source_type import source_stretch
 
 __all__ = ['AIAMap', 'HMIMap', 'HMISynopticMap']

diff --git a/sunpy/map/sources/soho.py b/sunpy/map/sources/soho.py
@@ -8,7 +8,8 @@
 from astropy.visualization.mpl_normalize import ImageNormalize
 
 from sunpy import log
-from sunpy.map.mapbase import GenericMap, SpatialPair
+from sunpy.map.mapbase import GenericMap
+from sunpy.map.mixins.mapmeta import SpatialPair
 from sunpy.map.sources.source_type import source_stretch
 from sunpy.time import parse_time
 

diff --git a/sunpy/map/sources/trace.py b/sunpy/map/sources/trace.py
@@ -7,7 +7,8 @@
 from astropy.visualization import LogStretch
 from astropy.visualization.mpl_normalize import ImageNormalize
 
-from sunpy.map.mapbase import GenericMap, SpatialPair
+from sunpy.map.mapbase import GenericMap
+from sunpy.map.mixins.mapmeta import SpatialPair
 from sunpy.map.sources.source_type import source_stretch
 
 __all__ = ['TRACEMap']