Updated points

Author: davenquinn

macrostrat_tileserver/single_map/queries/lines.sql

@@ -1,26 +1,11 @@
-WITH mvt_features AS (
-  SELECT
-    line_id,
-    source_id,
-    geom
-  FROM
-    :compilation
-  WHERE
-    scale::text = :mapsize
-    AND ST_Intersects(geom, ST_Transform(:envelope, 4326))
-)
 SELECT
-  z.line_id,
-  z.source_id,
+  l.line_id,
+  l.source_id,
   coalesce(l.descrip, '') AS descrip,
   coalesce(l.name, '') AS name,
   coalesce(l.direction, '') AS direction,
   coalesce(l.type, '') AS "type",
-  tile_layers.tile_geom(z.geom, :envelope) AS geom
-FROM mvt_features z
-LEFT JOIN maps.lines l
-  ON z.line_id = l.line_id
-  AND l.scale::text = ANY(:linesize)
-LEFT JOIN maps.sources
-  ON z.source_id = sources.source_id
-WHERE sources.status_code = 'active'
+  tile_layers.tile_geom(l.geom, :envelope) AS geom
+FROM maps.lines l
+WHERE l.source_id = :source_id
+  AND ST_Intersects(geom, ST_Transform(:envelope, 4326))

macrostrat_tileserver/single_map/queries/points.sql

@@ -0,0 +1,12 @@
+
+  SELECT
+    strike,
+    dip,
+    dip_dir,
+    point_type,
+    certainty,
+    comments,
+    tile_layers.tile_geom(geom, :envelope) AS geom
+  FROM maps.points
+  WHERE source_id = :source_id
+    AND ST_Intersects(geom, ST_Transform(:envelope, 4326))