add default tms (#556)

Author: vincentsarago

CHANGES.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+## 0.9.0 (2022-12-05)
+
+### titiler.core
+
+* add `default_tms` in `BaseTilerFactory` to set the default TMS identifier supported by the tiler (e.g `WebMercatorQuad`)
+
 ## 0.8.1 (2022-12-01)
 
 ### titiler.core

docs/src/advanced/dependencies.md

@@ -197,7 +197,6 @@ Additional reader options. Defaults to `DefaultDependency` (empty).
 
 ##### Supported TMS
 
-
 The TMS dependency sets the available TMS for a tile endpoint.
 
 ```python
@@ -216,6 +215,15 @@ default_tms = TileMatrixSets({"WebMercatorQuad": tms.get("WebMercatorQuad")})
 tiler = TilerFactory(supported_tms=default_tms)
 ```
 
+##### Default TMS
+
+Set the default's TMS Identifier (default to `WebMercatorQuad`).
+
+```python
+# Create a Tile with it's default TMS being `WGS1984Quad`
+tiler = TilerFactory(default_tms="WGS1984Quad")
+```
+
 ### TilerFactory
 
 The `TilerFactory` inherits dependency from `BaseTilerFactory`.

docs/src/tile_matrix_sets.md

@@ -12,19 +12,18 @@ As one of the first requirements, we built `TiTiler` with support for serving ti
 
 ```python
 $ curl http://127.0.0.1:8000/tileMatrixSets | jq '.tileMatrixSets[] | .id'
-"CanadianNAD83_LCC"
-"EPSG3413"
-"EPSG6933"
-"EuropeanETRS89_LAEAQuad"
 "LINZAntarticaMapTilegrid"
+"EuropeanETRS89_LAEAQuad"
+"CanadianNAD83_LCC"
+"UPSArcticWGS84Quad"
 "NZTM2000"
 "NZTM2000Quad"
-"UPSAntarcticWGS84Quad"
-"UPSArcticWGS84Quad"
 "UTM31WGS84Quad"
-"WebMercatorQuad"
-"WorldCRS84Quad"
+"UPSAntarcticWGS84Quad"
 "WorldMercatorWGS84Quad"
+"WGS1984Quad"
+"WorldCRS84Quad"
+"WebMercatorQuad"
 ```
 
 You can easily add more TileMatrixSet support, see [custom tms](advanced/customization.md#custom-tms).

setup.cfg

@@ -3,10 +3,10 @@ current_version = 0.8.1
 commit = True
 tag = True
 tag_name = {new_version}
-parse = 
+parse =
 	(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 	((?P<pre>a|b|rc)(?P<prenum>\d+))?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}{pre}{prenum}
 	{major}.{minor}.{patch}
 

setup.py

@@ -5,7 +5,7 @@
 with open("README.md") as f:
     long_description = f.read()
 
-__version__ = "0.8.1"
+__version__ = "0.9.0"
 
 inst_reqs = [
     f"titiler.core=={__version__}",

src/titiler/application/setup.py

@@ -7,8 +7,8 @@
 
 inst_reqs = [
     "rio-cogeo>=3.1,<4.0",
-    "titiler.core>=0.8,<0.9",
-    "titiler.mosaic>=0.8,<0.9",
+    "titiler.core>=0.9,<0.10",
+    "titiler.mosaic>=0.9,<0.10",
     "starlette-cramjam>=0.3,<0.4",
     "python-dotenv",
 ]

src/titiler/application/titiler/application/__init__.py

@@ -1,3 +1,3 @@
 """titiler.application"""
 
-__version__ = "0.8.1"
+__version__ = "0.9.0"

src/titiler/core/titiler/core/__init__.py

@@ -1,6 +1,6 @@
 """titiler.core"""
 
-__version__ = "0.8.1"
+__version__ = "0.9.0"
 
 from . import dependencies, errors, factory, routing  # noqa
 from .factory import (  # noqa

src/titiler/core/titiler/core/factory.py

@@ -8,7 +8,7 @@
 from geojson_pydantic.features import Feature, FeatureCollection
 from geojson_pydantic.geometries import Polygon
 from morecantile import TileMatrixSet
-from morecantile import tms as default_tms
+from morecantile import tms as morecantile_tms
 from morecantile.defaults import TileMatrixSets
 from rio_tiler.io import BaseReader, MultiBandReader, MultiBaseReader, Reader
 from rio_tiler.models import BandStatistics, Bounds, Info
@@ -143,7 +143,8 @@ class BaseTilerFactory(metaclass=abc.ABCMeta):
     environment_dependency: Callable[..., Dict] = lambda: dict()
 
     # TileMatrixSet dependency
-    supported_tms: TileMatrixSets = default_tms
+    supported_tms: TileMatrixSets = morecantile_tms
+    default_tms: str = "WebMercatorQuad"
 
     # Router Prefix is needed to find the path for /tile if the TilerFactory.router is mounted
     # with other router (multiple `.../tile` routes).
@@ -465,8 +466,8 @@ def tile(
             x: int = Path(..., description="TMS tiles's column"),
             y: int = Path(..., description="TMS tiles's row"),
             TileMatrixSetId: Literal[tuple(self.supported_tms.list())] = Query(
-                "WebMercatorQuad",
-                description="TileMatrixSet Name (default: 'WebMercatorQuad')",
+                self.default_tms,
+                description=f"TileMatrixSet Name (default: '{self.default_tms}')",
             ),
             scale: int = Query(
                 1, gt=0, lt=4, description="Tile size scale. 1=256x256, 2=512x512..."
@@ -549,8 +550,8 @@ def tilejson(self):  # noqa: C901
         def tilejson(
             request: Request,
             TileMatrixSetId: Literal[tuple(self.supported_tms.list())] = Query(
-                "WebMercatorQuad",
-                description="TileMatrixSet Name (default: 'WebMercatorQuad')",
+                self.default_tms,
+                description=f"TileMatrixSet Name (default: '{self.default_tms}')",
             ),
             src_path=Depends(self.path_dependency),
             tile_format: Optional[ImageType] = Query(
@@ -694,8 +695,8 @@ def wmts(self):  # noqa: C901
         def wmts(
             request: Request,
             TileMatrixSetId: Literal[tuple(self.supported_tms.list())] = Query(
-                "WebMercatorQuad",
-                description="TileMatrixSet Name (default: 'WebMercatorQuad')",
+                self.default_tms,
+                description=f"TileMatrixSet Name (default: '{self.default_tms}')",
             ),
             src_path=Depends(self.path_dependency),
             tile_format: ImageType = Query(
@@ -1457,7 +1458,7 @@ def geojson_statistics(
 class TMSFactory:
     """TileMatrixSet endpoints Factory."""
 
-    supported_tms: TileMatrixSets = default_tms
+    supported_tms: TileMatrixSets = morecantile_tms
 
     # FastAPI router
     router: APIRouter = field(default_factory=APIRouter)

src/titiler/mosaic/setup.py

@@ -5,7 +5,7 @@
 with open("README.md") as f:
     long_description = f.read()
 
-inst_reqs = ["titiler.core>=0.8,<0.9", "cogeo-mosaic>=5.0,<5.1"]
+inst_reqs = ["titiler.core>=0.9,<0.10", "cogeo-mosaic>=5.0,<5.1"]
 extra_reqs = {
     "test": ["pytest", "pytest-cov", "pytest-asyncio", "httpx"],
 }