Add newest layers

Makefile

@@ -1,5 +1,5 @@
 .PHONY: docs
-docs: railway.md boundary.md water.md building.md highway.md highway_name.md poi.md place.md waterway.md water_name.md landcover.md landuse.md housenumber.md
+docs: park.md boundary.md water.md building.md transportation.md transportation_name.md poi.md place.md waterway.md water_name.md landcover.md landuse.md housenumber.md
 
 openmaptiles:
 	git clone https://github.com/openmaptiles/openmaptiles.git
@@ -7,14 +7,14 @@ openmaptiles:
 poi.md: openmaptiles
 	generate-doc openmaptiles/layers/poi/poi.yaml --diagram poi > poi.md
 
-highway.md: openmaptiles
-	generate-doc openmaptiles/layers/highway/highway.yaml --diagram highway > highway.md && generate-etlgraph openmaptiles/layers/highway/highway.yaml && dot -Tpng openmaptiles/layers/highway/etl_highway.dot -o etl_highway.png
+transportation.md: openmaptiles
+	generate-doc openmaptiles/layers/transportation/transportation.yaml --diagram transportation > transportation.md && generate-etlgraph openmaptiles/layers/transportation/transportation.yaml && dot -Tpng openmaptiles/layers/transportation/etl_transportation.dot -o etl_transportation.png
 
-highway_name.md: openmaptiles
-	generate-doc openmaptiles/layers/highway_name/highway_name.yaml  > highway_name.md
+transportation_name.md: openmaptiles
+	generate-doc openmaptiles/layers/transportation_name/transportation_name.yaml  > transportation_name.md
 
-railway.md: openmaptiles
-	generate-doc openmaptiles/layers/railway/railway.yaml --diagram railway > railway.md && generate-etlgraph openmaptiles/layers/railway/railway.yaml && dot -Tpng openmaptiles/layers/railway/etl_railway.dot -o etl_railway.png
+park.md: openmaptiles
+	generate-doc openmaptiles/layers/park/park.yaml --diagram park > park.md && generate-etlgraph openmaptiles/layers/park/park.yaml && dot -Tpng openmaptiles/layers/park/etl_park.dot -o etl_park.png
 
 boundary.md: openmaptiles
 	generate-doc openmaptiles/layers/boundary/boundary.yaml --diagram boundary > boundary.md && generate-etlgraph openmaptiles/layers/boundary/boundary.yaml && dot -Tpng openmaptiles/layers/boundary/etl_boundary.dot -o etl_boundary.png

boundary.md

@@ -8,10 +8,13 @@ but for most styles it makes sense to just style `admin_level=2` and `admin_leve
 
 ## Fields
 
-- **admin_level**: OSM [admin_level](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative#admin_level)
+### admin_level
+
+OSM [admin_level](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative#admin_level)
 indicating the level of importance of this boundary.
 At low zoom levels the Natural Earth boundaries are mapped to the equivalent admin levels.
 
+
 ## Mapping
 
 ![](boundary.png)

building.md

@@ -5,8 +5,14 @@ this is welcomed.
 
 ## Fields
 
-- **render_min_height**: An approximated height from levels and height of the bottom 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.
-- **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.
+### render_min_height
+
+An approximated height from levels and height of the bottom 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.
+
+### 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.
+
 
 ## Mapping
 

highway_name.md

@@ -1,19 +0,0 @@
-# highway_name
-
-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
-to have better label placement than having many small linestrings.
-For motorways you should use the `ref` field to label them while for other roads you should use `name`.
-
-## Fields
-
-- **ref**: The OSM [`ref`](http://wiki.openstreetmap.org/wiki/Key:ref) tag of the motorway or road.
-- **ref_length**: Length of the `ref` field. Useful for having a shield icon as background for labeling motorways.
-- **name**: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Highways#Names_and_references) value of the highway.
-- **subclass**: Original value of the [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) tag. Use this to do more
-precise styling.
-- **class**: Either `motorway`, `major_road` (containing `trunk`, `primary`, `secondary` and `tertiary` roads) and `minor_road` (less important roads in the hierarchy like `residential` or `service`) or `path` for
-non vehicle paths (such as `cycleway` or `footpath`).
-
-
-

housenumber.md

@@ -5,7 +5,10 @@ This adds significant size to *z14*. For buildings the centroid of the building
 
 ## Fields
 
-- **housenumber**: Value of the [`addr:housenumber`](http://wiki.openstreetmap.org/wiki/Key:addr) tag.
+### housenumber
+
+Value of the [`addr:housenumber`](http://wiki.openstreetmap.org/wiki/Key:addr) tag.
+
 
 
 

landcover.md

@@ -1,15 +1,59 @@
 # landcover
 
 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 (like `landuse` or `natural`).
+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
+  is to style wood (`class=wood`) and grass (`class=`grass`) areas.
 
 ## Fields
 
-- **class**: More generalized groups of either `farmland`, `ice`, `wood`, `grass` or `wetland`.
-Use this to assign general colors to the landcover.
-- **subclass**: Original value of either the `landuse`, `natural` or `wetland` tag.
-Use this to do more precise styling.
+### class
+
+Use the **class** to assign natural colors for **landcover**.
+
+Possible values:
+
+- `farmland`
+- `ice`
+- `wood`
+- `grass`
+- `wetland`
+
+### subclass
+
+Use **subclass** to do more precise styling.
+Original value of either the
+[`natural`](http://wiki.openstreetmap.org/wiki/Key:natural),
+[`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
+,[`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure),
+or [`wetland`](http://wiki.openstreetmap.org/wiki/Key:wetland) tag.
+
+Possible values:
+
+- `allotments`
+- `farm`
+- `farmland`
+- `orchard`
+- `plant_nursery`
+- `vineyard`
+- `grass`
+- `grassland`
+- `meadow`
+- `forest`
+- `village_green`
+- `recreation_ground`
+- `park`
+- `wetland`
+- `grassland`
+- `bog`
+- `swamp`
+- `wet_meadow`
+- `marsh`
+- `reedbed`
+- `saltern`
+- `tidalflat`
+- `saltmarsh`
+- `mangrove`
+
 
 ## Mapping
 

landuse.md

@@ -5,10 +5,31 @@ from Natural Earth data for residential (urban) areas and at higher zoom levels
 
 ## Fields
 
-- **class**: More generalized groups of either `park`, `school`, `hospital`, `railway`,
-`cemetery`, `military`, `residential`. Use this to assign general for landuse.
-- **subclass**: Original value of either the `amenity`, `landuse`, `leisure` or `boundary` tag.
-Use this to do more precise styling.
+### class
+
+Use the **class** to assign special colors to areas.
+Original value of either the
+[`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity),
+[`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
+or [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure) tag.
+
+Possible values:
+
+- `school`
+- `university`
+- `kindergarten`
+- `college`
+- `library`
+- `hospital`
+- `railway`
+- `cemetery`
+- `military`
+- `residential`
+- `commercial`
+- `industrial`
+- `retail`
+- `stadium`
+
 
 ## Mapping
 

park.md

@@ -0,0 +1,21 @@
+# park
+
+The park layer contains parks from OpenStreetMap tagged with either [`boundary=national_park`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dnational_park) or [`leisure=nature_reserve`](http://wiki.openstreetmap.org/wiki/Tag:leisure%3Dnature_reserve).
+
+## Fields
+
+### class
+
+Use the **class** to differentiate between different parks.
+
+Possible values:
+
+- `national_park`
+- `nature_reserve`
+
+
+## Mapping
+
+![](park.png)
+
+

place.md

@@ -7,9 +7,17 @@ We suggest you use different font styles and sizes to create a text hierarchy.
 
 ## Fields
 
-- **name_en**: The english `name:en` value if available.
-- **name**: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI.
-- **rank**: Countries, states and the most important cities all have a `rank` to boost their importance on the map.
+### name_en
+
+The english `name:en` value if available.
+
+### name
+
+The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI.
+
+### rank
+
+Countries, states and the most important cities all have a `rank` to boost their importance on the map.
 The `rank` field for counries and states ranges from `1` to `6` while the `rank` field for
 cities ranges from `1` to `10` for the most important cities and continues from `10` serially based
 on the local importance of the city (derived from population and city class).
@@ -17,11 +25,15 @@ Use the `rank` field to build a text hierarchy.
 The rank value is a combination of the Natural Earth `scalerank`, `labelrank` and `datarank` values for countries
 and states and for cities consists out of a shifted Natural Earth `scalerank` combined with a local rank
 within a grid for cities that do not have a Natural Earth `scalerank`.
-- **class**: Distinguish between `country`, `state` and other city classes like
+
+### class
+
+Distinguish between `country`, `state` and other city classes like
 `city`, `town`, `village`, `hamlet`, `suburb`, `neighbourhood` or `isolated_dwelling`.
 Use this to separately style the different places according to their importance (usually country and state different
 than cities).
 
+
 ## Mapping
 
 ![](place.png)

poi.md

@@ -5,17 +5,31 @@ a of a variety of OpenStreetMap tags. Mostly contains amenities, sport, shop and
 
 ## Fields
 
-- **class**: More general classes of POIs. If there is no more general `class` for the `subclass`
+### class
+
+More general classes of POIs. If there is no more general `class` for the `subclass`
 this field will contain the same value as `subclass`.
 But for example for schools you only need to style the class `school` to filter the subclasses `school`
 and `kindergarten`. Or use the class `shop` to style all shops.
-- **name_en**: The english `name:en` value if available.
-- **name**: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI.
-- **rank**: The POIs are ranked ascending according to their importance within a grid. The `rank` value shows the
+
+### name_en
+
+The english `name:en` value if available.
+
+### name
+
+The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI.
+
+### rank
+
+The POIs are ranked ascending according to their importance within a grid. The `rank` value shows the
 local relative importance of a POI within it's cell in the grid. This can be used to reduce label density at z14.
 Since all POIs already need to be contained at `z14` you can use `less than rank=10` epxression to limit
 POIs. At some point like z17 you can show all POIs.
-- **subclass**: Original value of either the
+
+### subclass
+
+Original value of either the
 [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity),
 [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure),
 [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
@@ -24,6 +38,7 @@ POIs. At some point like z17 you can show all POIs.
 or [`shop`](http://wiki.openstreetmap.org/wiki/Key:shop)
 tag.  Use this to do more precise styling.
 
+
 ## Mapping
 
 ![](poi.png)

railway.md

@@ -1,19 +0,0 @@
-# railway
-
-The `railway` layer contains linestrings marking tracks from [OSM Railways](http://wiki.openstreetmap.org/wiki/Railways).
-It contains tracks for [passenger and freight trains]() and smaller tracks for [Trams](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dtram) or [similar](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dlight_rail) vehicles. But also tracks for [subways](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dsubway), [narrow-gauge trains](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dnarrow_gauge) or [historic trains](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dpreserved).
-Non mainline tracks (marked with class `minor_rail`) used for [storage of trains](http://wiki.openstreetmap.org/wiki/Tag:service%3Dyard) and [maintenance](http://wiki.openstreetmap.org/wiki/Tag:service%3Dsiding) are contained in the highest zoom levels and should be styled more subtle than the mainline tracks with class `rail`.
-
-## Fields
-
-- **class**: Divides the track into mainline tracks (class `rail`) and less important tracks
-used for maintenance (class `minor_rail`).
-- **subclass**: Original value of the [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) can be one of
-`rail`, `light_rail`, `subway`, `narrow_gauge`, `preserved`, `tram`.
-- **properties**: Additional properties describing the nature of tracks. Can be either `bridge` or `tunnel`.
-
-## Mapping
-
-![](railway.png)
-
-

transportation.md

@@ -1,4 +1,4 @@
-# highway
+# transportation
 
 Roads or [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) in OpenStreetMap lingo.
 This layer is directly derived from the OSM road hierarchy which is why it is called `highway`. Only
@@ -14,17 +14,26 @@ The `highway` layer also contains polygons for things like plazas.
 
 ## Fields
 
-- **class**: Either `motorway`, `major_road` (containing `trunk`, `primary`, `secondary` and `tertiary` roads) and `minor_road` (less important roads in the hierarchy like `residential` or `service`) or `path` for
+### class
+
+Either `motorway`, `major_road` (containing `trunk`, `primary`, `secondary` and `tertiary` roads) and `minor_road` (less important roads in the hierarchy like `residential` or `service`) or `path` for
 non vehicle paths (such as `cycleway` or `footpath`).
-- **subclass**: Original value of the [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) tag. Use this to do more
+
+### subclass
+
+Original value of the [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) tag. Use this to do more
 precise styling.
-- **properties**: Additional properties describing the nature of road.
+
+### properties
+
+Additional properties describing the nature of road.
 The properties `bridge` and `tunnel` can be combined with `oneway` as well. So to style all bridges the same you
 should style both the properties `bridge` and `bridge:oneway`.
 Properties can be one of `bridge:oneway`, `tunnel:oneway`, `ramp`, `ford`, `bridge`, `tunnel` or`oneway`.
 
+
 ## Mapping
 
-![](highway.png)
+![](transportation.png)
 
 

transportation_name.md

@@ -0,0 +1,34 @@
+# transportation_name
+
+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
+to have better label placement than having many small linestrings.
+For motorways you should use the `ref` field to label them while for other roads you should use `name`.
+
+## Fields
+
+### ref
+
+The OSM [`ref`](http://wiki.openstreetmap.org/wiki/Key:ref) tag of the motorway or road.
+
+### ref_length
+
+Length of the `ref` field. Useful for having a shield icon as background for labeling motorways.
+
+### name
+
+The OSM [`name`](http://wiki.openstreetmap.org/wiki/Highways#Names_and_references) value of the highway.
+
+### subclass
+
+Original value of the [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) tag. Use this to do more
+precise styling.
+
+### class
+
+Either `motorway`, `major_road` (containing `trunk`, `primary`, `secondary` and `tertiary` roads) and `minor_road` (less important roads in the hierarchy like `residential` or `service`) or `path` for
+non vehicle paths (such as `cycleway` or `footpath`).
+
+
+
+

water.md

@@ -9,7 +9,10 @@ able to use border styling for ocean water features.
 
 ## Fields
 
-- **class**: Either `ocean`, `lake` or `river`.
+### class
+
+Either `ocean`, `lake` or `river`.
+
 
 ## Mapping
 

water_name.md

@@ -6,9 +6,18 @@ which derives nice centerlines from OSM water bodies. Only the most important la
 
 ## Fields
 
-- **name_en**: The english `name:en` value if available.
-- **name**: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the water body.
-- **class**: At the moment only `lake` since no ocean parts are labelled. *Reserved for future use*.
+### name_en
+
+The english `name:en` value if available.
+
+### name
+
+The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the water body.
+
+### class
+
+At the moment only `lake` since no ocean parts are labelled. *Reserved for future use*.
+
 
 ## Mapping
 

waterway.md

@@ -1,18 +1,27 @@
 # waterway
 
-Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z8* to *z14*
-and Natural Earth rivers and lake centerlines from *z3* to *z7*.
-Too short linestrings are filtered out for some zoom levels. Waterways do no not have a `subclass`.
+Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z9* to *z14*
+and Natural Earth rivers and lake centerlines from *z3* to *z8*.
+Linestrings without a name or which are too short are filtered
+out at low zoom levels. Waterways do no not have a `subclass` field.
 
 ## Fields
 
-- **class**: The original value of the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag.
+### name
+
+The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway.
+The `name` field is empty for NaturalEarth data until **z9** when OSM data is used.
+
+### class
+
+The original value of the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag.
 Can be one of [`stream`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dstream),
 [`river`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Driver),
 [`canal`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dcanal),
 [`drain`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Ddrain),
 [`ditch`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dditch)`.
 
+
 ## Mapping
 
 ![](waterway.png)