Temporary work on single map endpoint

Author: davenquinn

.idea/sqldialects.xml

@@ -14,28 +14,22 @@
 __here__ = Path(__file__).parent
 
 
-@router.get("/{compilation}/{z}/{x}/{y}")
+@router.get("/{slug}/{z}/{x}/{y}")
 async def get_tile(
-        request: Request,
-        compilation: MapCompilation,
-        z: int,
-        x: int,
-        y: int,
-        lithology: List[str] = Query(None)
+    request: Request,
+    slug: str,
+    z: int,
+    x: int,
+    y: int,
 ):
     """Get a tile from the tileserver."""
     pool = request.app.state.pool
 
-    mapsize, linesize = scales_for_zoom(z)
-
-    compilation_name = compilation.value
-
     params = dict(
         z=z,
         x=x,
         y=y,
-        mapsize=mapsize,
-        linesize=linesize,
+        slug=slug,
     )
 
     async with pool.acquire() as con:
@@ -44,16 +38,14 @@ async def get_tile(
             "units",
             compilation=V(compilation_name + ".polygons"),
             lithology=lithology,
-            **params
+            **params,
         )
         lines_ = await run_layer_query(
-            con,
-            "lines",
-            compilation=V(compilation_name + ".lines"),
-            **params
+            con, "lines", compilation=V(compilation_name + ".lines"), **params
         )
     return VectorTileResponse(units_, lines_)
 
+
 def build_lithology_clause(lithology: List[str]):
     """Build a WHERE clause to filter by lithology."""
     if lithology is None or len(lithology) == 0:
@@ -72,7 +64,7 @@ def build_lithology_clause(lithology: List[str]):
 
 
 async def run_layer_query(con, layer_name, **params):
-    query = get_layer_sql( __here__ / "queries",  layer_name)
+    query = get_layer_sql(__here__ / "queries", layer_name)
     if ":where_lithology" in query:
         lith_clause = build_lithology_clause(params.get("lithology"))
         query = query.replace(":where_lithology", lith_clause)

macrostrat_tileserver/single_map/__init__.py

@@ -7,5 +7,6 @@ SELECT
   coalesce(l.type, '') AS "type",
   tile_layers.tile_geom(l.geom, :envelope) AS geom
 FROM maps.lines l
-WHERE l.source_id = :source_id
+JOIN maps.sources s ON l.source_id = s.source_id
+WHERE s.slug = :slug
   AND ST_Intersects(geom, ST_Transform(:envelope, 4326))

macrostrat_tileserver/single_map/queries/lines.sql

@@ -7,6 +7,7 @@
     certainty,
     comments,
     tile_layers.tile_geom(geom, :envelope) AS geom
-  FROM maps.points
-  WHERE source_id = :source_id
+  FROM maps.points p
+  JOIN maps.sources s
+  WHERE p.source_id = s.source_id
     AND ST_Intersects(geom, ST_Transform(:envelope, 4326))

macrostrat_tileserver/single_map/queries/points.sql

@@ -1,18 +1,14 @@
-WITH mvt_features AS (
-  SELECT
-    map_id,
-    source_id,
-    geom
-  FROM maps.polygons
-  WHERE source_id = :source_id
-    AND ST_Intersects(geom, ST_Transform(:envelope, 4326))
-)
 SELECT
-  z.map_id,
-  z.source_id,
+  p.map_id,
+  p.source_id,
   l.*, --  map legend info
   tile_layers.tile_geom(z.geom, :envelope) AS geom
-FROM mvt_features z
-LEFT JOIN maps.map_legend ON z.map_id = map_legend.map_id
+FROM maps.polygons p
+JOIN maps.sources s
+  ON p.source_id = s.source_id
+LEFT JOIN maps.map_legend ml
+  ON p.map_id = ml.map_id
 LEFT JOIN tile_layers.map_legend_info AS l
-  ON l.legend_id = map_legend.legend_id;
+  ON l.legend_id = ml.legend_id
+WHERE s.slug = :slug
+  AND ST_Intersects(geom, ST_Transform(:envelope, 4326))