rename Enums for their singular forms (#261)

Author: vincentsarago

CHANGES.md

@@ -9,7 +9,8 @@
 
 **breaking change**
 
-* renamed `OptionalHeaders`, `MimeTypes` and `ImageDrivers` enums to the singular form. (https://github.com/developmentseed/titiler/pull/258)
+* renamed `OptionalHeaders`, `MimeTypes` and `ImageDrivers` enums to the singular form (https://github.com/developmentseed/titiler/pull/258)
+* renamed titiler.dependencies's Enums (`ColorMapName`, `ResamplingName` and `TileMatrixSetName`) to the singular form (https://github.com/developmentseed/titiler/pull/260)
 * renamed `MimeType` to `MediaType` (https://github.com/developmentseed/titiler/pull/258)
 * add `ColorMapParams` dependency to ease the creation of custom colormap dependency (https://github.com/developmentseed/titiler/pull/252)
 * renamed `PathParams` to `DatasetPathParams` and also made it a simple callable (https://github.com/developmentseed/titiler/pull/260)

titiler/dependencies.py

@@ -29,17 +29,17 @@
 ################################################################################
 # DO NOT UPDATE
 # Create ENUMS with all CMAP and TMS for documentation and validation.
-ColorMapNames = Enum(  # type: ignore
-    "ColorMapNames", [(a, a) for a in sorted(cmap.list())]
+ColorMapName = Enum(  # type: ignore
+    "ColorMapName", [(a, a) for a in sorted(cmap.list())]
 )
-ResamplingNames = Enum(  # type: ignore
-    "ResamplingNames", [(r.name, r.name) for r in Resampling]
+ResamplingName = Enum(  # type: ignore
+    "ResamplingName", [(r.name, r.name) for r in Resampling]
 )
 WebMercatorTileMatrixSetName = Enum(  # type: ignore
     "WebMercatorTileMatrixSetName", [("WebMercatorQuad", "WebMercatorQuad")]
 )
-TileMatrixSetNames = Enum(  # type: ignore
-    "TileMatrixSetNames", [(a, a) for a in sorted(tms.list())]
+TileMatrixSetName = Enum(  # type: ignore
+    "TileMatrixSetName", [(a, a) for a in sorted(tms.list())]
 )
 
 
@@ -59,8 +59,8 @@ def WebMercatorTMSParams(
 
 
 def TMSParams(
-    TileMatrixSetId: TileMatrixSetNames = Query(
-        TileMatrixSetNames.WebMercatorQuad,  # type: ignore
+    TileMatrixSetId: TileMatrixSetName = Query(
+        TileMatrixSetName.WebMercatorQuad,  # type: ignore
         description="TileMatrixSet Name (default: 'WebMercatorQuad')",
     )
 ) -> TileMatrixSet:
@@ -69,7 +69,7 @@ def TMSParams(
 
 
 def ColorMapParams(
-    color_map: ColorMapNames = Query(None, description="Colormap name",)
+    color_map: ColorMapName = Query(None, description="Colormap name",)
 ) -> Optional[Dict]:
     """Colormap Dependency."""
     if color_map:
@@ -302,8 +302,8 @@ class DatasetParams(DefaultDependency):
         title="Apply internal Scale/Offset",
         description="Apply internal Scale/Offset",
     )
-    resampling_method: ResamplingNames = Query(
-        ResamplingNames.nearest, description="Resampling method."  # type: ignore
+    resampling_method: ResamplingName = Query(
+        ResamplingName.nearest, description="Resampling method."  # type: ignore
     )
 
     def __post_init__(self):

titiler/endpoints/factory.py

@@ -31,7 +31,7 @@
     ImageParams,
     MetadataParams,
     RenderParams,
-    TileMatrixSetNames,
+    TileMatrixSetName,
     TMSParams,
     WebMercatorTMSParams,
 )
@@ -1376,7 +1376,7 @@ class TMSFactory:
     """TileMatrixSet endpoints Factory."""
 
     # Enum of supported TMS
-    supported_tms: Type[TileMatrixSetNames] = TileMatrixSetNames
+    supported_tms: Type[TileMatrixSetName] = TileMatrixSetName
 
     # TileMatrixSet dependency
     tms_dependency: Callable[..., TileMatrixSet] = TMSParams

titiler/endpoints/tms.py

@@ -1,7 +1,7 @@
 """TMS Api."""
 
-from ..dependencies import TileMatrixSetNames, TMSParams
+from ..dependencies import TileMatrixSetName, TMSParams
 from .factory import TMSFactory
 
-tms = TMSFactory(supported_tms=TileMatrixSetNames, tms_dependency=TMSParams)
+tms = TMSFactory(supported_tms=TileMatrixSetName, tms_dependency=TMSParams)
 router = tms.router  # noqa