fix templates

Author: vincentsarago

titiler/stacapi/factory.py

@@ -119,6 +119,7 @@ def get_base_url(self, request: Request) -> str:
                     path_format, param_convertors, request.path_params.copy()
                 )
             base_url += prefix
+
         return base_url
 
     def register_routes(self) -> None:
@@ -416,7 +417,7 @@ def map_viewer(
                     "tms": tms,
                     "resolutions": [matrix.cellSize for matrix in tms],
                     "template": {
-                        "api_root": self.get_base_url(request),
+                        "api_root": str(request.base_url).rstrip("/"),
                         "params": request.query_params,
                         "title": "Map",
                     },

titiler/stacapi/main.py

@@ -93,6 +93,7 @@
     optional_headers=optional_headers,
     router_prefix="/collections/{collection_id}",
     add_viewer=True,
+    templates=templates,
 )
 app.include_router(
     collection.router, tags=["STAC Collection"], prefix="/collections/{collection_id}"
@@ -205,7 +206,7 @@ def landing(
     if output_type == MediaType.html:
         return create_html_response(
             request,
-            data.model_dump_json(exclude_none=True),
+            data.model_dump(exclude_none=True, mode="json"),
             templates=templates,
             template_name="landing",
         )

titiler/stacapi/utils.py

@@ -8,7 +8,6 @@
 import time
 from typing import Any, Optional, Sequence, Type, Union
 
-import orjson
 from starlette.requests import Request
 from starlette.templating import Jinja2Templates, _TemplateResponse
 
@@ -42,48 +41,53 @@ def _newfn(*args: Any, **kwargs: Any):
 
 def create_html_response(
     request: Request,
-    data: str,
+    data: Any,
     templates: Jinja2Templates,
     template_name: str,
+    title: Optional[str] = None,
     router_prefix: Optional[str] = None,
+    **kwargs: Any,
 ) -> _TemplateResponse:
     """Create Template response."""
     urlpath = request.url.path
     if root_path := request.app.root_path:
         urlpath = re.sub(r"^" + root_path, "", urlpath)
 
+    if router_prefix:
+        urlpath = re.sub(r"^" + router_prefix, "", urlpath)
+
     crumbs = []
     baseurl = str(request.base_url).rstrip("/")
 
+    if router_prefix:
+        baseurl += router_prefix
+
     crumbpath = str(baseurl)
+    if urlpath == "/":
+        urlpath = ""
+
     for crumb in urlpath.split("/"):
         crumbpath = crumbpath.rstrip("/")
-
         part = crumb
         if part is None or part == "":
             part = "Home"
-
         crumbpath += f"/{crumb}"
         crumbs.append({"url": crumbpath.rstrip("/"), "part": part.capitalize()})
 
-    if router_prefix:
-        baseurl += router_prefix
-
     return templates.TemplateResponse(
-        f"{template_name}.html",
-        {
-            "request": request,
-            "response": orjson.loads(data),
+        request,
+        name=f"{template_name}.html",
+        context={
+            "response": data,
             "template": {
                 "api_root": baseurl,
                 "params": request.query_params,
-                "title": "",
+                "title": title or template_name,
             },
             "crumbs": crumbs,
-            "url": str(request.url),
-            "baseurl": baseurl,
-            "urlpath": str(request.url.path),
-            "urlparams": str(request.url.query),
+            "url": baseurl + urlpath,
+            "params": str(request.url.query),
+            **kwargs,
         },
     )