Skip to content

Commit

Permalink
Add requires.tables to <layer>.yaml (#1236)
Browse files Browse the repository at this point in the history
**NOTE** this can only be merged after the next tools version is released.

Added required Postgres tables to the `<layer>.yaml` definition.
Close: #1220

PR of tools: openmaptiles/openmaptiles-tools#370
  • Loading branch information
Falke-Design committed Nov 5, 2021
1 parent 5b2e434 commit ebeafc6
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 3 deletions.
8 changes: 8 additions & 0 deletions layers/boundary/boundary.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
layer:
id: "boundary"
requires:
tables:
- osm_border_linestring
- ne_10m_admin_0_countries
- ne_10m_admin_0_boundary_lines_land
- ne_10m_admin_1_states_provinces_lines
- ne_50m_admin_0_boundary_lines_land
- ne_110m_admin_0_boundary_lines_land
description: |
Contains administrative boundaries as linestrings.
Until z4 [Natural Earth data](http://www.naturalearthdata.com/downloads/) is used after which
Expand Down
3 changes: 3 additions & 0 deletions layers/landcover/landcover.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
layer:
id: "landcover"
requires:
tables:
- ne_50m_antarctic_ice_shelves_polys
description: |
Landcover is used to describe the physical material at the surface of the earth. At lower zoom levels this is
from Natural Earth data for glaciers and ice shelves and at higher zoom levels the landcover is [implied by OSM tags](http://wiki.openstreetmap.org/wiki/Landcover). The most common use case for this layer
Expand Down
3 changes: 3 additions & 0 deletions layers/landuse/landuse.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
layer:
id: "landuse"
requires:
tables:
- ne_50m_urban_areas
description: |
Landuse is used to describe use of land by humans. At lower zoom levels this is
from Natural Earth data for residential (urban) areas and at higher zoom levels mostly OSM `landuse` tags.
Expand Down
5 changes: 5 additions & 0 deletions layers/place/place.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
layer:
id: "place"
requires:
tables:
- ne_10m_admin_1_states_provinces
- ne_10m_admin_0_countries
- ne_10m_admin_1_states_provinces
description: |
The place layer consists out of [countries](http://wiki.openstreetmap.org/wiki/Tag:place%3Dcountry),
[states](http://wiki.openstreetmap.org/wiki/Tag:place%3Dstate) and [cities](http://wiki.openstreetmap.org/wiki/Key:place).
Expand Down
3 changes: 3 additions & 0 deletions layers/transportation/transportation.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
layer:
id: "transportation"
requires:
tables:
- ne_10m_admin_0_countries
description: |
**transportation** contains roads, railways, aerial ways, and shipping
lines.
Expand Down
4 changes: 3 additions & 1 deletion layers/transportation_name/transportation_name.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
layer:
id: "transportation_name"
# transportation_name relies on the function highway_class() defined in transportation layer
requires: "transportation"
requires:
layers:
- transportation
description: |
This is the layer for labelling the highways. Only highways that are named `name=*` and are long enough
to place text upon appear. The OSM roads are stitched together if they contain the same name
Expand Down
5 changes: 4 additions & 1 deletion layers/water/water.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
layer:
id: "water"
requires:
tables:
- osm_ocean_polygon
description: |
Water polygons representing oceans and lakes. Covered watered areas are excluded (`covered=yes`).
On low zoom levels all water originates from Natural Earth. To get a more correct display of the south pole you should also
Expand All @@ -12,7 +15,7 @@ layer:
class:
description: |
All water polygons from [OpenStreetMapData](http://osmdata.openstreetmap.de/) have the class `ocean`.
Water bodies with the [`waterway=riverbank`](http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank)
Water bodies with the [`waterway=riverbank`](http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank)
or [`water=river`](http://wiki.openstreetmap.org/wiki/Tag:water=river) tag are classified as river. Wet and dry docks
tagged [`waterway=dock`](http://wiki.openstreetmap.org/wiki/Tag:waterway=dock) are classified as a `dock`.
All other water bodies are classified as `lake`.
Expand Down
4 changes: 4 additions & 0 deletions layers/water_name/water_name.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
layer:
id: "water_name"
requires:
tables:
- ne_10m_geography_marine_polys
- lake_centerline
description: |
Lake center lines for labelling lake bodies.
This is based of the [osm-lakelines](https://github.com/lukasmartinelli/osm-lakelines) project
Expand Down
4 changes: 3 additions & 1 deletion layers/waterway/waterway.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
layer:
id: "waterway"
# waterway relies on the function waterway_brunnel() defined in water layer
requires: "water"
requires:
layers:
- water
description: |
OpenStreetMap [waterways](https://wiki.openstreetmap.org/wiki/Waterways) for higher zoom levels (z9 and more)
and Natural Earth rivers and lake centerlines for low zoom levels (z3 - z8).
Expand Down

0 comments on commit ebeafc6

Please sign in to comment.