From 1cb2a24d8f476a1545fa22dfb37cb2b8569ca3cc Mon Sep 17 00:00:00 2001 From: vincentsarago Date: Fri, 12 Jan 2024 10:14:46 +0100 Subject: [PATCH] update to titiler 0.16 --- CHANGES.md | 2 +- pyproject.toml | 2 +- rio_viz/app.py | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5f66a4d..942a3f1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,7 @@ # 0.12.0 (TBD) * add Algorithm support and update basemap source -* update titiler requirement to `>=0.14,<0.15` +* update titiler requirement to `>=0.16,<0.17` - renamed `/crop` endpoints to `/bbox/...` or `/feature/...` - `/crop/{minx},{miny},{maxx},{maxy}.{format}` -> `/bbox/{minx},{miny},{maxx},{maxy}.{format}` diff --git a/pyproject.toml b/pyproject.toml index cf9e449..0439af7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dynamic = ["version"] dependencies = [ "braceexpand", "rio-cogeo>=5.0", - "titiler.core>=0.15.0,<0.16", + "titiler.core>=0.16.0,<0.17", "starlette-cramjam>=0.3,<0.4", "uvicorn", "server-thread>=0.2.0", diff --git a/rio_viz/app.py b/rio_viz/app.py index 13ea520..83043aa 100644 --- a/rio_viz/app.py +++ b/rio_viz/app.py @@ -5,6 +5,7 @@ from typing import Any, Dict, List, Literal, Optional, Tuple, Type, Union import attr +import jinja2 import rasterio import uvicorn from fastapi import APIRouter, Depends, FastAPI, HTTPException, Path, Query @@ -54,8 +55,10 @@ has_mvt = False pixels_encoder = None -template_dir = str(pathlib.Path(__file__).parent.joinpath("templates")) -templates = Jinja2Templates(directory=template_dir) +jinja2_env = jinja2.Environment( + loader=jinja2.ChoiceLoader([jinja2.PackageLoader(__package__, "templates")]) +) +templates = Jinja2Templates(env=jinja2_env) TileFormat = Union[RasterFormat, VectorTileFormat]