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

Fix openmaptiles/openmaptiles#78, Switch to OSM water bodies in z6

Browse Source
This commit is contained in:
jirik 2017-03-15 17:29:06 +01:00
parent 9c2b6e2a93
commit 0b3177de00
4 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layers/water/README.md
View File

@ -7,5 +7,4 @@ Read the layer documentation at **http://openmaptiles.org/schema#water**
![Mapping diagram for water](http://openmaptiles.org/media/mapping_water.png) ![Mapping diagram for water](http://openmaptiles.org/media/mapping_water.png)
### ETL diagram ### ETL diagram
![ETL diagram for water](http://openmaptiles.org/media/etl_water.png) ![ETL diagram for water](etl_diagram.png?raw=true)

BIN
layers/water/etl_diagram.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 KiB

6
layers/water/mapping.yaml
View File

@ -1,5 +1,11 @@
generalized_tables: generalized_tables:
# etldoc: imposm3 -> osm_water_polygon_gen6
water_polygon_gen6:
source: water_polygon_gen5
sql_filter: area>20000000.0
tolerance: 640.0
# etldoc: imposm3 -> osm_water_polygon_gen5 # etldoc: imposm3 -> osm_water_polygon_gen5
water_polygon_gen5: water_polygon_gen5:
source: water_polygon_gen4 source: water_polygon_gen4

12
layers/water/water.sql
View File

@ -48,15 +48,15 @@ CREATE OR REPLACE VIEW water_z6 AS (
-- etldoc: ne_10m_ocean -> water_z6 -- etldoc: ne_10m_ocean -> water_z6
SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
UNION ALL UNION ALL
-- etldoc: ne_10m_lakes -> water_z6 -- etldoc: osm_water_polygon_gen6 -> water_z6
SELECT geometry, 'lake'::text AS class FROM ne_10m_lakes SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen6
); );
CREATE OR REPLACE VIEW water_z7 AS ( CREATE OR REPLACE VIEW water_z7 AS (
-- etldoc: ne_10m_ocean -> water_z7 -- etldoc: ne_10m_ocean -> water_z7
SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
UNION ALL UNION ALL
-- etldoc: osm_water_polygon_gen3 -> water_z7 -- etldoc: osm_water_polygon_gen5 -> water_z7
SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen5 SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen5
); );
@ -64,7 +64,7 @@ CREATE OR REPLACE VIEW water_z8 AS (
-- etldoc: ne_10m_ocean -> water_z8 -- etldoc: ne_10m_ocean -> water_z8
SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
UNION ALL UNION ALL
-- etldoc: osm_water_polygon_gen2 -> water_z8 -- etldoc: osm_water_polygon_gen4 -> water_z8
SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen4 SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen4
); );
@ -72,7 +72,7 @@ CREATE OR REPLACE VIEW water_z9 AS (
-- etldoc: osm_ocean_polygon_gen3 -> water_z9 -- etldoc: osm_ocean_polygon_gen3 -> water_z9
SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen3 SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen3
UNION ALL UNION ALL
-- etldoc: osm_water_polygon_gen1 -> water_z9 -- etldoc: osm_water_polygon_gen3 -> water_z9
SELECT geometry, 'lake'::text AS class FROM osm_water_polygon_gen3 SELECT geometry, 'lake'::text AS class FROM osm_water_polygon_gen3
); );
@ -88,7 +88,7 @@ CREATE OR REPLACE VIEW water_z11 AS (
-- etldoc: osm_ocean_polygon_gen1 -> water_z11 -- etldoc: osm_ocean_polygon_gen1 -> water_z11
SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen1 SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen1
UNION ALL UNION ALL
-- etldoc: osm_water_polygon -> water_z11 -- etldoc: osm_water_polygon_gen1 -> water_z11
SELECT geometry, 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
); );