Map bounds

macrostrat_tileserver/filterable/__init__.py

@@ -102,8 +102,6 @@ async def run_layer_query(con, layer_name, **params):
     # https://github.com/samuelcolvin/buildpg/blob/e2a16abea5c7607b53c501dbae74a5765ba66e15/buildpg/components.py#L21
     q = q.replace("textarray", "text[]")
 
-    print(q,p)
-
     return await con.fetchval(q, *p)
 
 

macrostrat_tileserver/main.py

@@ -5,6 +5,7 @@
 from fastapi import FastAPI, Request
 from macrostrat.utils import get_logger, setup_stderr_logs
 from starlette.middleware.cors import CORSMiddleware
+from starlette.middleware import Middleware
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 from starlette_cramjam.middleware import CompressionMiddleware
@@ -27,7 +28,10 @@
 
 log = get_logger(__name__)
 
-app = FastAPI(prefix="/")
+app = FastAPI(prefix="/", middleware=[
+    Middleware(CORSMiddleware, allow_origins=["*"])
+])
+
 
 app.state.timvt_function_catalog = FunctionRegistry()
 app.state.function_catalog = FunctionRegistry()
@@ -118,7 +122,7 @@ async def shutdown_event():
 app.include_router(filterable_router, tags=["Filterable"], prefix="/v2")
 
 from .map_bounds import router as map_bounds_router
-app.include_router(map_bounds_router, tags=["Map Bounds"], prefix="/v2")
+app.include_router(map_bounds_router, tags=["Maps"], prefix="/maps")
 
 
 @app.get("/carto/rotation-models")
@@ -142,10 +146,3 @@ async def refresh(request: Request):
     """Refresh the table catalog."""
     await register_table_catalog(app, schemas=["sources"])
     return JSONResponse({"message": "Table catalog refreshed."})
-
-
-# Open CORS policy
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=["*"],
-)

macrostrat_tileserver/map_bounds/__init__.py

@@ -9,10 +9,9 @@
 __here__ = Path(__file__).parent
 
 
-@router.get("/rgeom/{z}/{x}/{y}")
+@router.get("/bounds/{z}/{x}/{y}")
 async def rgeom(
     request: Request,
-    compilation: Compilation,
     z: int,
     x: int,
     y: int,
@@ -23,12 +22,11 @@ async def rgeom(
     async with pool.acquire() as con:
         data = await run_layer_query(
             con,
-            "rgeom",
+            "bounds",
             z=z,
             x=x,
             y=y,
         )
-    data = join_layers([units_, lines_])
     kwargs = {}
     kwargs.setdefault("media_type", MimeTypes.pbf.value)
     return Response(data, **kwargs)
@@ -42,8 +40,6 @@ async def run_layer_query(con, layer_name, **params):
     # https://github.com/samuelcolvin/buildpg/blob/e2a16abea5c7607b53c501dbae74a5765ba66e15/buildpg/components.py#L21
     q = q.replace("textarray", "text[]")
 
-    print(q,p)
-
     return await con.fetchval(q, *p)
 
 

macrostrat_tileserver/map_bounds/queries/bounds.sql

@@ -0,0 +1,32 @@
+WITH tile AS (
+  SELECT ST_TileEnvelope(:z, :x, :y) AS envelope,
+         ST_Transform(ST_TileEnvelope(:z, :x, :y, margin => 0.01), 4326) AS envelope_4326
+), sources AS (
+  SELECT
+    source_id,
+    name,
+    slug,
+    scale,
+    rgeom AS geom
+  FROM maps.sources
+  WHERE
+    rgeom is NOT NULL
+    AND status_code = 'active'
+), features AS (
+  SELECT
+    source_id,
+    name,
+    slug,
+    scale,
+    ST_Intersection(geom, envelope_4326) AS geom
+  FROM sources, tile
+  WHERE ST_Intersects(geom, ST_Transform(envelope, 4326))
+)
+SELECT
+  source_id,
+  name,
+  slug,
+  scale,
+  tile_layers.tile_geom(z.geom, envelope) AS geom
+FROM features z, tile
+WHERE z.geom IS NOT NULL;

pyproject.toml

@@ -6,16 +6,16 @@ packages = [{ include = "macrostrat_tileserver" }]
 version = "2.1.0"
 
 [tool.poetry.dependencies]
-fastapi = "^0.100.0"
+fastapi = "^0.111.0"
 "macrostrat.database" = "^3.0"
 "macrostrat.utils" = "^1.2.0"
 pytest = "^7.2.1"
 python = "^3.8"
 python-dotenv = "^1.0.0"
 timvt = { path = "./deps/timvt", develop = true }
-typer = "^0.9"
+typer = "^0.12.3"
 uvicorn = "0.16.0"
-titiler = "^0.15.0"
+titiler = "^0.18.5"
 
 [tool.poetry.extras]
 # Extra dependencies to compile raster tiles