cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch from geom to geometry

Browse Source
This commit is contained in:
stirringhalo
2016-12-20 22:32:34 -05:00
parent 6f6cb74ce5
commit bab5c3d4b6
12 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
layers/water/water.sql
View File

@@ -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;