Merge pull request #181 from UW-Macrostrat/fossil-tileserver

Fossil tile route

Author: davidsklar99

services/tileserver/Makefile

@@ -11,8 +11,11 @@ test:
 	poetry run pytest -s -x
 
 docker-build:
-	docker build -t macrostrat-tileserver .
+	docker build -t tileserver .
 
 styles:
 	npm install -g carto
 	poetry run tileserver create-mapnik-xml mapnik-xml-test
+
+docker-run: 
+	docker run -p 8000:8000 --env-file .env tileserver

services/tileserver/deps/macrostrat_tileserver_utils-0.1.0-py3-none-any.whl

@@ -196,6 +196,10 @@ async def shutdown_event():
 
 app.include_router(checkins_router, tags=["Checkins"], prefix="/checkins/tiles")
 
+from .fossils import router as fossils_router
+
+app.include_router(fossils_router, tags=["PBDB"], prefix="/pbdb")
+
 from .integrations import router as integrations_router
 
 app.include_router(integrations_router, tags=["Integrations"], prefix="/integrations")

services/tileserver/macrostrat/tileserver/__init__.py

@@ -0,0 +1,51 @@
+from pathlib import Path
+
+from buildpg import render
+from fastapi import APIRouter, Request, Response
+from timvt.resources.enums import MimeTypes
+
+router = APIRouter()
+
+__here__ = Path(__file__).parent
+
+
+@router.get("/fossils/{z}/{x}/{y}")
+async def rgeom(
+    request: Request,
+    z: int,
+    x: int,
+    y: int,
+):
+    """Get a tile from the tileserver."""
+    pool = request.app.state.pool
+
+    if "cluster" in request.query_params:
+        cluster_val = request.query_params["cluster"]
+        cluster = cluster_val.lower() not in ("false", "0", "no")
+
+    else:
+        cluster = True
+
+    if cluster:
+        query = __here__ / "queries" / "clustered.sql"
+    else:
+        query = __here__ / "queries" / "unclustered.sql"
+
+    query = query.read_text()
+    query = query.strip()
+    if query.endswith(";"):
+        query = query[:-1]
+
+    params = {
+        "z": z,
+        "x": x,
+        "y": y,
+    }
+
+    q, p = render(query, **params)
+    q = q.replace("textarray", "text[]")
+
+    async with pool.acquire() as con:
+        data = await con.fetchval(q, *p)
+
+    return Response(data, media_type=MimeTypes.pbf.value)

services/tileserver/macrostrat/tileserver/fossils/__init__.py

@@ -0,0 +1,38 @@
+WITH
+tile AS (
+  SELECT ST_TileEnvelope(:z, :x, :y) AS envelope,
+         tile_layers.geographic_envelope(:x, :y, :z, 0.01) AS envelope_4326
+),
+collections AS (
+  SELECT
+    collection_no,
+    name,
+    tile_layers.tile_geom(
+      ST_Intersection(geom, envelope_4326),
+      envelope
+    ) AS geom
+  FROM macrostrat.pbdb_collections, tile
+  WHERE
+    geom IS NOT NULL
+    AND ST_Intersects(geom, envelope_4326)
+),
+mvt_features AS (
+  SELECT collection_no,
+         ST_SnapToGrid(geom, 256, 256) AS cluster_geom,
+         geom
+  FROM collections
+),
+grouped_features AS (
+  SELECT
+    tile_utils.cluster_expansion_zoom(ST_Collect(geom), :z) AS expansion_zoom,
+    count(*) AS n,
+    st_centroid(ST_Collect(geom)) AS geom,
+    CASE
+      WHEN count(*) < 2 THEN string_agg(f.collection_no::text, ',')
+      ELSE null
+    END AS collection_no
+  FROM mvt_features f
+  GROUP BY cluster_geom
+)
+SELECT ST_AsMVT(row) AS mvt
+FROM (SELECT * FROM grouped_features) AS row;

services/tileserver/macrostrat/tileserver/fossils/queries/clustered.sql

@@ -0,0 +1,26 @@
+WITH
+tile AS (
+  SELECT ST_TileEnvelope(:z, :x, :y) AS envelope,
+         tile_layers.geographic_envelope(:x, :y, :z, 0.01) AS envelope_4326
+),
+collections AS (
+  SELECT
+    collection_no,
+    name,
+    tile_layers.tile_geom(
+      ST_Intersection(geom, envelope_4326),
+      envelope
+    ) AS geom
+  FROM macrostrat.pbdb_collections, tile
+  WHERE
+    geom IS NOT NULL
+    AND ST_Intersects(geom, envelope_4326)
+)
+
+SELECT ST_AsMVT(
+  collections.*,
+  'default',
+  4096,
+  'geom'
+) AS mvt
+FROM collections;