Switch from geom to geometry

README.md

@@ -58,7 +58,7 @@ layer:
   description: Buildings from OpenStreetMap
   buffer_size: 4
   datasource:
-    query: (SELECT geom FROM layer_building(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry FROM layer_building(!bbox!, z(!scale_denominator!))) AS t
   fields:
     render_height: An approximated height from levels and height of building.
 schema:

layers/boundary/boundary.sql

@@ -3,7 +3,7 @@
 -- etldoc: ne_110m_admin_0_boundary_lines_land  -> boundary_z0
 
 CREATE OR REPLACE VIEW boundary_z0 AS (
-    SELECT geom, 2 AS admin_level
+    SELECT geometry, 2 AS admin_level
     FROM ne_110m_admin_0_boundary_lines_land
 );
 
@@ -11,10 +11,10 @@ CREATE OR REPLACE VIEW boundary_z0 AS (
 -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z1
 
 CREATE OR REPLACE VIEW boundary_z1 AS (
-    SELECT geom, 2 AS admin_level
+    SELECT geometry, 2 AS admin_level
     FROM ne_50m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level
+    SELECT geometry, 4 AS admin_level
     FROM ne_50m_admin_1_states_provinces_lines
     WHERE scalerank <= 2
 );
@@ -24,10 +24,10 @@ CREATE OR REPLACE VIEW boundary_z1 AS (
 -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z3
 
 CREATE OR REPLACE VIEW boundary_z3 AS (
-    SELECT geom, 2 AS admin_level
+    SELECT geometry, 2 AS admin_level
     FROM ne_50m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level
+    SELECT geometry, 4 AS admin_level
     FROM ne_50m_admin_1_states_provinces_lines
 );
 
@@ -36,10 +36,10 @@ CREATE OR REPLACE VIEW boundary_z3 AS (
 -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z4
 
 CREATE OR REPLACE VIEW boundary_z4 AS (
-    SELECT geom, 2 AS admin_level
+    SELECT geometry, 2 AS admin_level
     FROM ne_10m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level
+    SELECT geometry, 4 AS admin_level
     FROM ne_10m_admin_1_states_provinces_lines_shp
     WHERE scalerank <= 3 AND featurecla = 'Adm-1 boundary'
 );
@@ -48,10 +48,10 @@ CREATE OR REPLACE VIEW boundary_z4 AS (
 -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z5
 
 CREATE OR REPLACE VIEW boundary_z5 AS (
-    SELECT geom, 2 AS admin_level
+    SELECT geometry, 2 AS admin_level
     FROM ne_10m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level
+    SELECT geometry, 4 AS admin_level
     FROM ne_10m_admin_1_states_provinces_lines_shp
     WHERE scalerank <= 7 AND featurecla = 'Adm-1 boundary'
 );
@@ -60,10 +60,10 @@ CREATE OR REPLACE VIEW boundary_z5 AS (
 -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z6
 
 CREATE OR REPLACE VIEW boundary_z6 AS (
-    SELECT geom, 2 AS admin_level
+    SELECT geometry, 2 AS admin_level
     FROM ne_10m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level
+    SELECT geometry, 4 AS admin_level
     FROM ne_10m_admin_1_states_provinces_lines_shp
     WHERE scalerank <= 9 AND featurecla = 'Adm-1 boundary'
 );
@@ -71,10 +71,10 @@ CREATE OR REPLACE VIEW boundary_z6 AS (
 -- etldoc: ne_10m_admin_0_boundary_lines_land -> boundary_z7
 -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z7
 CREATE OR REPLACE VIEW boundary_z7 AS (
-    SELECT geom, 2 AS admin_level
+    SELECT geometry, 2 AS admin_level
     FROM ne_10m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level
+    SELECT geometry, 4 AS admin_level
     FROM ne_10m_admin_1_states_provinces_lines_shp
     WHERE featurecla = 'Adm-1 boundary'
 
@@ -82,35 +82,35 @@ CREATE OR REPLACE VIEW boundary_z7 AS (
 
 -- etldoc: osm_boundary_linestring_gen5 -> boundary_z8
 CREATE OR REPLACE VIEW boundary_z8 AS (
-    SELECT geometry AS geom, admin_level
+    SELECT geometry, admin_level
     FROM osm_boundary_linestring_gen5
     WHERE admin_level <= 4 AND ST_Length(geometry) > 1000
 );
 
 -- etldoc: osm_boundary_linestring_gen4 -> boundary_z9
 CREATE OR REPLACE VIEW boundary_z9 AS (
-    SELECT geometry AS geom, admin_level
+    SELECT geometry, admin_level
     FROM osm_boundary_linestring_gen4
     WHERE admin_level <= 6
 );
 
 -- etldoc: osm_boundary_linestring_gen3 -> boundary_z10
 CREATE OR REPLACE VIEW boundary_z10 AS (
-    SELECT geometry AS geom, admin_level
+    SELECT geometry, admin_level
     FROM osm_boundary_linestring_gen3
     WHERE admin_level <= 6
 );
 
 -- etldoc: osm_boundary_linestring_gen2 -> boundary_z11
 CREATE OR REPLACE VIEW boundary_z11 AS (
-    SELECT geometry AS geom, admin_level
+    SELECT geometry, admin_level
     FROM osm_boundary_linestring_gen2
     WHERE admin_level <= 8
 );
 
 -- etldoc: osm_boundary_linestring_gen1 -> boundary_z12
 CREATE OR REPLACE VIEW boundary_z12 AS (
-    SELECT geometry AS geom, admin_level
+    SELECT geometry, admin_level
     FROM osm_boundary_linestring_gen1
 );
 
@@ -119,44 +119,44 @@ CREATE OR REPLACE VIEW boundary_z12 AS (
 
 CREATE OR REPLACE FUNCTION layer_boundary (bbox geometry, zoom_level int)
 RETURNS TABLE(geometry geometry, admin_level int) AS $$
-    SELECT geom, admin_level FROM (
+    SELECT geometry, admin_level FROM (
         -- etldoc: boundary_z0 ->  layer_boundary:z0
-        SELECT * FROM boundary_z0 WHERE geom && bbox AND zoom_level = 0
+        SELECT * FROM boundary_z0 WHERE geometry && bbox AND zoom_level = 0
         UNION ALL
         -- etldoc: boundary_z1 ->  layer_boundary:z1_2
-        SELECT * FROM boundary_z1 WHERE geom && bbox AND zoom_level BETWEEN 1 AND 2
+        SELECT * FROM boundary_z1 WHERE geometry && bbox AND zoom_level BETWEEN 1 AND 2
         UNION ALL
         -- etldoc: boundary_z3 ->  layer_boundary:z3
-        SELECT * FROM boundary_z3 WHERE geom && bbox AND zoom_level = 3
+        SELECT * FROM boundary_z3 WHERE geometry && bbox AND zoom_level = 3
         UNION ALL
         -- etldoc: boundary_z4 ->  layer_boundary:z4
-        SELECT * FROM boundary_z4 WHERE geom && bbox AND zoom_level = 4
+        SELECT * FROM boundary_z4 WHERE geometry && bbox AND zoom_level = 4
         UNION ALL
         -- etldoc: boundary_z5 ->  layer_boundary:z5
-        SELECT * FROM boundary_z5 WHERE geom && bbox AND zoom_level = 5
+        SELECT * FROM boundary_z5 WHERE geometry && bbox AND zoom_level = 5
         UNION ALL
         -- etldoc: boundary_z6 ->  layer_boundary:z6
-        SELECT * FROM boundary_z6 WHERE geom && bbox AND zoom_level = 6
+        SELECT * FROM boundary_z6 WHERE geometry && bbox AND zoom_level = 6
         UNION ALL
         -- etldoc: boundary_z7 ->  layer_boundary:z7
-        SELECT * FROM boundary_z7 WHERE geom && bbox AND zoom_level = 7
+        SELECT * FROM boundary_z7 WHERE geometry && bbox AND zoom_level = 7
         UNION ALL
         -- etldoc: boundary_z8 ->  layer_boundary:z8
-        SELECT * FROM boundary_z8 WHERE geom && bbox AND zoom_level = 8
+        SELECT * FROM boundary_z8 WHERE geometry && bbox AND zoom_level = 8
         UNION ALL
         -- etldoc: boundary_z9 ->  layer_boundary:z9
-        SELECT * FROM boundary_z9 WHERE geom && bbox AND zoom_level = 9
+        SELECT * FROM boundary_z9 WHERE geometry && bbox AND zoom_level = 9
         UNION ALL
         -- etldoc: boundary_z10 ->  layer_boundary:z10
-        SELECT * FROM boundary_z10 WHERE geom && bbox AND zoom_level = 10
+        SELECT * FROM boundary_z10 WHERE geometry && bbox AND zoom_level = 10
         UNION ALL
         -- etldoc: boundary_z11 ->  layer_boundary:z11
-        SELECT * FROM boundary_z11 WHERE geom && bbox AND zoom_level = 11
+        SELECT * FROM boundary_z11 WHERE geometry && bbox AND zoom_level = 11
         UNION ALL
         -- etldoc: boundary_z12 ->  layer_boundary:z12
-        SELECT * FROM boundary_z12 WHERE geom && bbox AND zoom_level = 12
+        SELECT * FROM boundary_z12 WHERE geometry && bbox AND zoom_level = 12
         UNION ALL
         -- etldoc: boundary_z12 -> layer_boundary:z13
-        SELECT * FROM boundary_z12 WHERE geom && bbox AND zoom_level >= 13
+        SELECT * FROM boundary_z12 WHERE geometry && bbox AND zoom_level >= 13
     ) AS zoom_levels;
 $$ LANGUAGE SQL IMMUTABLE;

layers/building/building.yaml

@@ -5,7 +5,7 @@ layer:
       this is welcomed.
   buffer_size: 4
   datasource:
-    query: (SELECT geom, render_height, render_min_height FROM layer_building(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, render_height, render_min_height FROM layer_building(!bbox!, z(!scale_denominator!))) AS t
   fields:
     render_height: |
         An approximated height from levels and height of the building or building:part after the method of Paul Norman in [OSM Clear](https://github.com/ClearTables/osm-clear). For future 3D rendering of buildings.

layers/landcover/landcover.sql

@@ -22,23 +22,23 @@ $$ LANGUAGE SQL IMMUTABLE;
 
 -- etldoc: ne_110m_glaciated_areas ->  landcover_z0 
 CREATE OR REPLACE VIEW landcover_z0 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_110m_glaciated_areas
+    SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_110m_glaciated_areas
 );
 
 CREATE OR REPLACE VIEW landcover_z2 AS (
     -- etldoc: ne_50m_glaciated_areas ->  landcover_z2 
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_glaciated_areas
+    SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_glaciated_areas
     UNION ALL
     -- etldoc: ne_50m_antarctic_ice_shelves_polys ->  landcover_z2     
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_antarctic_ice_shelves_polys
+    SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_antarctic_ice_shelves_polys
 );
 
 CREATE OR REPLACE VIEW landcover_z5 AS (
     -- etldoc: ne_10m_glaciated_areas ->  landcover_z5
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_glaciated_areas
+    SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_glaciated_areas
     UNION ALL
     -- etldoc: ne_10m_antarctic_ice_shelves_polys ->  landcover_z5 
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys
+    SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys
 );
 
 CREATE OR REPLACE VIEW landcover_z8 AS (

layers/landuse/landuse.sql

@@ -1,19 +1,19 @@
 -- etldoc: ne_50m_urban_areas -> landuse_z4
 CREATE OR REPLACE VIEW landuse_z4 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
+    SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
     FROM ne_50m_urban_areas
     WHERE scalerank <= 2
 );
 
 -- etldoc: ne_50m_urban_areas -> landuse_z5
 CREATE OR REPLACE VIEW landuse_z5 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
+    SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
     FROM ne_50m_urban_areas
 );
 
 -- etldoc: ne_10m_urban_areas -> landuse_z6
 CREATE OR REPLACE VIEW landuse_z6 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
+    SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
     FROM ne_10m_urban_areas
 );
 

layers/place/merge_city_rank.sql

@@ -19,7 +19,7 @@ WITH important_city_point AS (
         ne.nameascii ILIKE osm.name_en
     )
     AND osm.place IN ('city', 'town', 'village')
-    AND ST_DWithin(ne.geom, osm.geometry, 50000)
+    AND ST_DWithin(ne.geometry, osm.geometry, 50000)
 )
 UPDATE osm_city_point AS osm
 -- Move scalerank to range 1 to 10 and merge scalerank 5 with 6 since not enough cities

layers/place/merge_country_rank.sql

@@ -10,7 +10,7 @@ WITH important_country_point AS (
     -- We only match whether the point is within the Natural Earth polygon
     -- because name matching is to difficult since OSM does not contain good
     -- enough coverage of ISO codesy
-    ST_Within(osm.geometry, ne.geom)
+    ST_Within(osm.geometry, ne.geometry)
     -- We leave out tiny countries
     AND ne.scalerank <= 1
 )

layers/place/merge_state_rank.sql

@@ -9,7 +9,7 @@ WITH important_state_point AS (
     WHERE
     -- We only match whether the point is within the Natural Earth polygon
     -- because name matching is difficult
-    ST_Within(osm.geometry, ne.geom)
+    ST_Within(osm.geometry, ne.geometry)
     -- We leave out leess important states
     AND ne.scalerank <= 3 AND ne.labelrank <= 2
 )

layers/transportation/layer.sql

@@ -22,7 +22,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
     FROM (
         -- etldoc: ne_10m_roads -> layer_transportation:z4z6
         SELECT
-            NULL::bigint AS osm_id, geom AS geometry,
+            NULL::bigint AS osm_id, geometry,
             ne_highway(type) AS highway, NULL AS railway, NULL AS service,
             NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
             NULL::boolean AS is_ford,

layers/water/water.sql

@@ -6,122 +6,122 @@ $$ LANGUAGE SQL IMMUTABLE;
 
 CREATE OR REPLACE VIEW water_z0 AS (
     -- etldoc:  ne_110m_ocean ->  water_z0 
-    SELECT geom, 'ocean'::text AS class FROM ne_110m_ocean
+    SELECT geometry, 'ocean'::text AS class FROM ne_110m_ocean
     UNION ALL
     -- etldoc:  ne_110m_lakes ->  water_z0     
-    SELECT geom, 'lake'::text AS class FROM ne_110m_lakes
+    SELECT geometry, 'lake'::text AS class FROM ne_110m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z1 AS (
     -- etldoc:  ne_110m_ocean ->  water_z1    
-    SELECT geom, 'ocean'::text AS class FROM ne_110m_ocean
-    UNION ALL   
+    SELECT geometry, 'ocean'::text AS class FROM ne_110m_ocean
+    UNION ALL
     -- etldoc:  ne_110m_lakes ->  water_z1    
-    SELECT geom, 'lake'::text AS class FROM ne_110m_lakes
+    SELECT geometry, 'lake'::text AS class FROM ne_110m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z2 AS (
     -- etldoc:  ne_50m_ocean ->  water_z2    
-    SELECT geom, 'ocean'::text AS class FROM ne_50m_ocean
+    SELECT geometry, 'ocean'::text AS class FROM ne_50m_ocean
     UNION ALL
     -- etldoc:  ne_50m_lakes ->  water_z2     
-    SELECT geom, 'lake'::text AS class FROM ne_50m_lakes
+    SELECT geometry, 'lake'::text AS class FROM ne_50m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z4 AS (
     -- etldoc:  ne_50m_ocean ->  water_z4       
-    SELECT geom, 'ocean'::text AS class FROM ne_50m_ocean
+    SELECT geometry, 'ocean'::text AS class FROM ne_50m_ocean
     UNION ALL
     -- etldoc:  ne_50m_lakes ->  water_z4     
-    SELECT geom, 'lake'::text AS class FROM ne_50m_lakes
+    SELECT geometry, 'lake'::text AS class FROM ne_50m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z5 AS (
     -- etldoc:  ne_10m_ocean ->  water_z5    
-    SELECT geom, 'ocean'::text AS class FROM ne_10m_ocean
+    SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
     -- etldoc:  ne_10m_lakes ->  water_z5    
-    SELECT geom, 'lake'::text AS class FROM ne_10m_lakes
+    SELECT geometry, 'lake'::text AS class FROM ne_10m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z6 AS (
     -- etldoc:  ne_10m_ocean ->  water_z6     
-    SELECT geom, 'ocean'::text AS class FROM ne_10m_ocean
+    SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
    -- etldoc:  ne_10m_lakes ->  water_z6    
-    SELECT geom, 'lake'::text AS class FROM ne_10m_lakes
+    SELECT geometry, 'lake'::text AS class FROM ne_10m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z7 AS (
     -- etldoc:  ne_10m_ocean ->  water_z7     
-    SELECT geom, 'ocean'::text AS class FROM ne_10m_ocean
+    SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
     -- etldoc:  osm_water_polygon_gen3 ->  water_z7
-    SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen5
+    SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen5
 );
 
 CREATE OR REPLACE VIEW water_z8 AS (
     -- etldoc:  ne_10m_ocean ->  water_z8     
-    SELECT geom, 'ocean'::text AS class FROM ne_10m_ocean
+    SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
     -- etldoc:  osm_water_polygon_gen2 ->  water_z8         
-    SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen4
+    SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen4
 );
 
 CREATE OR REPLACE VIEW water_z9 AS (
     -- etldoc:  osm_ocean_polygon_gen3 ->  water_z9
-    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen3
+    SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen3
     UNION ALL
     -- etldoc:  osm_water_polygon_gen1 ->  water_z9    
-    SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen3
+    SELECT geometry, 'lake'::text AS class FROM osm_water_polygon_gen3
 );
 
 CREATE OR REPLACE VIEW water_z10 AS (
     -- etldoc:  osm_ocean_polygon_gen2 ->  water_z10
-    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen2
+    SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen2
     UNION ALL
     -- etldoc:  osm_water_polygon_gen2 ->  water_z10
-    SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen2
+    SELECT geometry, 'lake'::text AS class FROM osm_water_polygon_gen2
 );
 
 CREATE OR REPLACE VIEW water_z11 AS (
     -- etldoc:  osm_ocean_polygon_gen1 ->  water_z11
-    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen1
+    SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen1
     UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z11
-    SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon_gen1 WHERE area > 40000
+    SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen1 WHERE area > 40000
 );
 
 CREATE OR REPLACE VIEW water_z12 AS (
     -- etldoc:  osm_ocean_polygon_gen1 ->  water_z12
-    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon
+    SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon
     UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z12     
-    SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 10000
+    SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 10000
 );
 
 CREATE OR REPLACE VIEW water_z13 AS (
     -- etldoc:  osm_ocean_polygon ->  water_z13
-    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon
+    SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon
     UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z13    
-    SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 5000
+    SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 5000
 );
 
 CREATE OR REPLACE VIEW water_z14 AS (
     -- etldoc:  osm_ocean_polygon ->  water_z14
-    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon
+    SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon
     UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z14    
-    SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon
+    SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon
 );
 
 -- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled",  
 -- etldoc:     label="layer_water |<z0> z0|<z1>z1|<z2>z2|<z3>z3 |<z4> z4|<z5>z5|<z6>z6|<z7>z7| <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
 
 CREATE OR REPLACE FUNCTION layer_water (bbox geometry, zoom_level int)
-RETURNS TABLE(geom geometry, class text) AS $$
-    SELECT geom, class::text FROM (
+RETURNS TABLE(geometry geometry, class text) AS $$
+    SELECT geometry, class::text FROM (
         -- etldoc: water_z0 ->  layer_water:z0
         SELECT * FROM water_z0 WHERE zoom_level = 0
         UNION ALL
@@ -165,5 +165,5 @@ RETURNS TABLE(geom geometry, class text) AS $$
         -- etldoc: water_z14 ->  layer_water:z14_        
         SELECT * FROM water_z14 WHERE zoom_level >= 14
     ) AS zoom_levels
-    WHERE geom && bbox;
+    WHERE geometry && bbox;
 $$ LANGUAGE SQL IMMUTABLE;

layers/water/water.yaml

@@ -12,7 +12,7 @@ layer:
         Either `ocean`, `lake` or `river`.
   buffer_size: 4
   datasource:
-    query: (SELECT geom, class FROM layer_water(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class FROM layer_water(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./water.sql
 datasources:

layers/waterway/waterway.sql

@@ -1,19 +1,19 @@
 
 -- etldoc: ne_110m_rivers_lake_centerlines ->  waterway_z3
 CREATE OR REPLACE VIEW waterway_z3 AS (
-    SELECT geom AS geometry, 'river'::text AS class, NULL::text AS name FROM ne_110m_rivers_lake_centerlines
+    SELECT geometry, 'river'::text AS class, NULL::text AS name FROM ne_110m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 -- etldoc: ne_50m_rivers_lake_centerlines ->  waterway_z4
 CREATE OR REPLACE VIEW waterway_z4 AS (
-    SELECT geom AS geometry, 'river'::text AS class, NULL::text AS name FROM ne_50m_rivers_lake_centerlines
+    SELECT geometry, 'river'::text AS class, NULL::text AS name FROM ne_50m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 -- etldoc: ne_10m_rivers_lake_centerlines ->  waterway_z6
 CREATE OR REPLACE VIEW waterway_z6 AS (
-    SELECT geom AS geometry, 'river'::text AS class, NULL::text AS name FROM ne_10m_rivers_lake_centerlines
+    SELECT geometry, 'river'::text AS class, NULL::text AS name FROM ne_10m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );